core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update B/CB

This commit is contained in:
Shane Freeder 2018-02-12 18:04:05 +00:00
parent 19b309f63f
commit c66212c3ce
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
16 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0006-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From 49063a185f72b716177dbb8a855753253d3150b5 Mon Sep 17 00:00:00 2001 From 5764072103b0e1eb4f455bdc1ee93490281abfa6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600 Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2 Subject: [PATCH] Timings v2
@ -635,7 +635,7 @@ index 40f06c5bc..4c794a098 100644
public void recalcPosition() { public void recalcPosition() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ee2d1f9a9..e8401bba7 100644 index ecff5fce3..756590ac0 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -1648,7 +1648,7 @@ index 3a95b4465..b5efb9c3f 100644
public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException { public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e12e45e01..dfb5731c3 100644 index 2d5dc2179..916781403 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -41,7 +41,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; @@ -41,7 +41,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@ -1660,7 +1660,7 @@ index e12e45e01..dfb5731c3 100644
import org.bukkit.craftbukkit.block.CraftSign; import org.bukkit.craftbukkit.block.CraftSign;
import org.bukkit.craftbukkit.conversations.ConversationTracker; import org.bukkit.craftbukkit.conversations.ConversationTracker;
import org.bukkit.craftbukkit.CraftEffect; import org.bukkit.craftbukkit.CraftEffect;
@@ -1679,6 +1679,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1673,6 +1673,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
packet.components = components; packet.components = components;
getHandle().playerConnection.sendPacket(packet); getHandle().playerConnection.sendPacket(packet);
} }

18
Spigot-Server-Patches/0016-Player-affects-spawning-API.patch
View File

@ -1,11 +1,11 @@
From 5ca9db8b97b3c8ed1997ede12c32121bf26b5175 Mon Sep 17 00:00:00 2001 From 736024006caeba1547c2f390349fe5ffd05b6253 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 14:47:52 -0600 Date: Tue, 1 Mar 2016 14:47:52 -0600
Subject: [PATCH] Player affects spawning API Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index c374efd7..467c5bf1 100644 index c374efd79..467c5bf1a 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java --- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -64,6 +64,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -64,6 +64,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -17,7 +17,7 @@ index c374efd7..467c5bf1 100644
// CraftBukkit start // CraftBukkit start
public boolean fauxSleeping; public boolean fauxSleeping;
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 94967e6b..5ea9f309 100644 index 94967e6b6..5ea9f3097 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java --- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -624,7 +624,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -624,7 +624,7 @@ public abstract class EntityInsentient extends EntityLiving {
@ -30,7 +30,7 @@ index 94967e6b..5ea9f309 100644
double d1 = entityhuman.locY - this.locY; double d1 = entityhuman.locY - this.locY;
double d2 = entityhuman.locZ - this.locZ; double d2 = entityhuman.locZ - this.locZ;
diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
index 50bca48b..57552c52 100644 index 50bca48bf..57552c522 100644
--- a/src/main/java/net/minecraft/server/EntitySilverfish.java --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
+++ b/src/main/java/net/minecraft/server/EntitySilverfish.java +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
@@ -99,8 +99,7 @@ public class EntitySilverfish extends EntityMonster { @@ -99,8 +99,7 @@ public class EntitySilverfish extends EntityMonster {
@ -44,7 +44,7 @@ index 50bca48b..57552c52 100644
return false; return false;
} }
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index a599a043..1c7c187c 100644 index a599a043d..1c7c187c7 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -52,7 +52,7 @@ public final class SpawnerCreature { @@ -52,7 +52,7 @@ public final class SpawnerCreature {
@ -57,7 +57,7 @@ index a599a043..1c7c187c 100644
j = MathHelper.floor(entityhuman.locZ / 16.0D); j = MathHelper.floor(entityhuman.locZ / 16.0D);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 759964b0..26d4bd69 100644 index 759964b0f..26d4bd690 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -2727,7 +2727,7 @@ public abstract class World implements IBlockAccess { @@ -2727,7 +2727,7 @@ public abstract class World implements IBlockAccess {
@ -70,10 +70,10 @@ index 759964b0..26d4bd69 100644
if (d3 < 0.0D || d4 < d3 * d3) { if (d3 < 0.0D || d4 < d3 * d3) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index dfb5731c..aec4f8aa 100644 index 916781403..9e8ca0fbd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1542,6 +1542,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1536,6 +1536,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override @Override
public String getLocale() { public String getLocale() {
return getHandle().locale; return getHandle().locale;
@ -91,5 +91,5 @@ index dfb5731c..aec4f8aa 100644
// Spigot start // Spigot start
-- --
2.14.3 2.16.1

8
Spigot-Server-Patches/0020-Only-refresh-abilities-if-needed.patch
View File

@ -1,14 +1,14 @@
From bd2bf58607934dcb2249509a5c85337d570067b7 Mon Sep 17 00:00:00 2001 From 6e552824da89ae526f34323546181e662acf6e3a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 23:12:03 -0600 Date: Tue, 1 Mar 2016 23:12:03 -0600
Subject: [PATCH] Only refresh abilities if needed Subject: [PATCH] Only refresh abilities if needed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index aec4f8aa..cc0e7b0c 100644 index 9e8ca0fbd..44d0db180 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1245,12 +1245,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1236,12 +1236,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override @Override
public void setFlying(boolean value) { public void setFlying(boolean value) {
@ -24,5 +24,5 @@ index aec4f8aa..cc0e7b0c 100644
@Override @Override
-- --
2.14.3 2.16.1

12
Spigot-Server-Patches/0035-Add-player-view-distance-API.patch
View File

@ -1,11 +1,11 @@
From 7fc0df5e4ebc2e181f11411824fb7631ebef35a8 Mon Sep 17 00:00:00 2001 From 3a5c6b152a7a804921e9ff7f2057eb5c6f79a9e4 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 14:35:27 -0600 Date: Wed, 2 Mar 2016 14:35:27 -0600
Subject: [PATCH] Add player view distance API Subject: [PATCH] Add player view distance API
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 9829cdd8..5b067571 100644 index 9829cdd89..5b0675718 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -66,6 +66,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -66,6 +66,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -25,7 +25,7 @@ index 9829cdd8..5b067571 100644
// CraftBukkit start // CraftBukkit start
public String displayName; public String displayName;
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index e4ed2e99..9627a9be 100644 index e4ed2e991..9627a9be0 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -47,7 +47,7 @@ public class PlayerChunkMap { @@ -47,7 +47,7 @@ public class PlayerChunkMap {
@ -203,10 +203,10 @@ index e4ed2e99..9627a9be 100644
+ // Paper end + // Paper end
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index cc0e7b0c..7ee4965a 100644 index 44d0db180..b2b707305 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1555,6 +1555,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1549,6 +1549,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().affectsSpawning; return this.getHandle().affectsSpawning;
} }
@ -224,5 +224,5 @@ index cc0e7b0c..7ee4965a 100644
private final Player.Spigot spigot = new Player.Spigot() private final Player.Spigot spigot = new Player.Spigot()
{ {
-- --
2.14.3 2.16.1

12
Spigot-Server-Patches/0054-Player-Tab-List-and-Title-APIs.patch
View File

@ -1,11 +1,11 @@
From 43f8c8c8c507b42c37fb0619d2800d0c310cd5c7 Mon Sep 17 00:00:00 2001 From c20bec68afa5809d1f05b6bd56a97da0b5511fa4 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Thu, 3 Mar 2016 02:32:10 -0600 Date: Thu, 3 Mar 2016 02:32:10 -0600
Subject: [PATCH] Player Tab List and Title APIs Subject: [PATCH] Player Tab List and Title APIs
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java diff --git a/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
index 0663b07c..f5ef1ba3 100644 index 0663b07ca..f5ef1ba31 100644
--- a/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java --- a/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
+++ b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
@@ -4,6 +4,8 @@ import java.io.IOException; @@ -4,6 +4,8 @@ import java.io.IOException;
@ -40,7 +40,7 @@ index 0663b07c..f5ef1ba3 100644
public void a(PacketListenerPlayOut packetlistenerplayout) { public void a(PacketListenerPlayOut packetlistenerplayout) {
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java diff --git a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
index 7bcafa8b..4f6c1c2e 100644 index 7bcafa8bb..4f6c1c2e7 100644
--- a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java --- a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
+++ b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
@@ -12,6 +12,18 @@ public class PacketPlayOutTitle implements Packet<PacketListenerPlayOut> { @@ -12,6 +12,18 @@ public class PacketPlayOutTitle implements Packet<PacketListenerPlayOut> {
@ -78,7 +78,7 @@ index 7bcafa8b..4f6c1c2e 100644
if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) { if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 7ee4965a..58d53b32 100644 index b2b707305..c14100ac6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
@ -88,7 +88,7 @@ index 7ee4965a..58d53b32 100644
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.io.BaseEncoding; import com.google.common.io.BaseEncoding;
@@ -172,6 +173,85 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -163,6 +164,85 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} }
} }
@ -175,5 +175,5 @@ index 7ee4965a..58d53b32 100644
public String getDisplayName() { public String getDisplayName() {
return getHandle().displayName; return getHandle().displayName;
-- --
2.14.3 2.16.1

10
Spigot-Server-Patches/0059-Fix-inter-world-teleportation-glitches.patch
View File

@ -1,4 +1,4 @@
From 7195f547ff310de38bd29f53a4103864d43ec67b Mon Sep 17 00:00:00 2001 From d8e52ce9b80cbf35b0c67abf63011597ac02227f Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com> From: Sudzzy <originmc@outlook.com>
Date: Thu, 3 Mar 2016 02:50:31 -0600 Date: Thu, 3 Mar 2016 02:50:31 -0600
Subject: [PATCH] Fix inter-world teleportation glitches Subject: [PATCH] Fix inter-world teleportation glitches
@ -11,7 +11,7 @@ Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png
The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds. The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 27fac9ef..1fb9cff9 100644 index 27fac9efb..1fb9cff93 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -231,4 +231,9 @@ public class PaperWorldConfig { @@ -231,4 +231,9 @@ public class PaperWorldConfig {
@ -25,10 +25,10 @@ index 27fac9ef..1fb9cff9 100644
+ } + }
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 58d53b32..e9044f38 100644 index c14100ac6..6a43f5674 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -623,7 +623,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -614,7 +614,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (fromWorld == toWorld) { if (fromWorld == toWorld) {
entity.playerConnection.teleport(to); entity.playerConnection.teleport(to);
} else { } else {
@ -39,5 +39,5 @@ index 58d53b32..e9044f38 100644
return true; return true;
} }
-- --
2.14.3 2.16.1

10
Spigot-Server-Patches/0064-Complete-resource-pack-API.patch
View File

@ -1,11 +1,11 @@
From ec57432cc4fd42a05473c74a587ae694dc6418f8 Mon Sep 17 00:00:00 2001 From d883cb3dd2a94346d63fa82bbacba5e83c39a208 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 23:17:52 -0400 Date: Sat, 4 Apr 2015 23:17:52 -0400
Subject: [PATCH] Complete resource pack API Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5348c0cb..5cc5dbcd 100644 index 5348c0cbc..5cc5dbcd7 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1067,7 +1067,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -1067,7 +1067,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -23,7 +23,7 @@ index 5348c0cb..5cc5dbcd 100644
// CraftBukkit end // CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e9044f38..f62fa8c7 100644 index 6a43f5674..45b11d87c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -88,6 +88,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -88,6 +88,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -37,7 +37,7 @@ index e9044f38..f62fa8c7 100644
public CraftPlayer(CraftServer server, EntityPlayer entity) { public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity); super(server, entity);
@@ -1646,6 +1650,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1640,6 +1644,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance); ((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
} }
@ -71,5 +71,5 @@ index e9044f38..f62fa8c7 100644
private final Player.Spigot spigot = new Player.Spigot() private final Player.Spigot spigot = new Player.Spigot()
{ {
-- --
2.14.3 2.16.1

10
Spigot-Server-Patches/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch
View File

@ -1,11 +1,11 @@
From 7fa0e0a09851cee926ea6ee93744b88bf157259f Mon Sep 17 00:00:00 2001 From 7b345395ba95323d922c1f191b27272d7ed0fef7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 27 Sep 2015 01:18:02 -0400 Date: Sun, 27 Sep 2015 01:18:02 -0400
Subject: [PATCH] handle NaN health/absorb values and repair bad data Subject: [PATCH] handle NaN health/absorb values and repair bad data
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 4c632bb6..296c0548 100644 index 9f1fb04b7..36a1348bd 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -488,7 +488,13 @@ public abstract class EntityLiving extends Entity { @@ -488,7 +488,13 @@ public abstract class EntityLiving extends Entity {
@ -44,10 +44,10 @@ index 4c632bb6..296c0548 100644
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f62fa8c7..9fe7a18a 100644 index 45b11d87c..aa7751059 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1469,6 +1469,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1460,6 +1460,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} }
public void setRealHealth(double health) { public void setRealHealth(double health) {
@ -56,5 +56,5 @@ index f62fa8c7..9fe7a18a 100644
} }
-- --
2.14.3 2.16.1

8
Spigot-Server-Patches/0107-Workaround-for-setting-passengers-on-players.patch
View File

@ -1,4 +1,4 @@
From a79ebbc5500aebc11efea2a8aee03c745c21fc43 Mon Sep 17 00:00:00 2001 From 4703e81cf7aa0dd2c059bcc093803bcf1ed2941f Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 10 Apr 2016 03:23:32 -0500 Date: Sun, 10 Apr 2016 03:23:32 -0500
Subject: [PATCH] Workaround for setting passengers on players Subject: [PATCH] Workaround for setting passengers on players
@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players
SPIGOT-1915 & GH-114 SPIGOT-1915 & GH-114
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9fe7a18a..f55c4366 100644 index aa7751059..0eee46edd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -633,6 +633,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -624,6 +624,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return true; return true;
} }
@ -28,5 +28,5 @@ index 9fe7a18a..f55c4366 100644
public void setSneaking(boolean sneak) { public void setSneaking(boolean sneak) {
getHandle().setSneaking(sneak); getHandle().setSneaking(sneak);
-- --
2.14.3 2.16.1

12
Spigot-Server-Patches/0116-Implement-PlayerLocaleChangeEvent.patch
View File

@ -1,11 +1,11 @@
From d6d6309f4a0f4aac6b9c1ff38037be0337c86967 Mon Sep 17 00:00:00 2001 From 3034ff4282f30c45b816c24e5764671fca4ab37a Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com> From: Isaac Moore <rmsy@me.com>
Date: Tue, 19 Apr 2016 14:09:31 -0500 Date: Tue, 19 Apr 2016 14:09:31 -0500
Subject: [PATCH] Implement PlayerLocaleChangeEvent Subject: [PATCH] Implement PlayerLocaleChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index e48121b4..24d3b29a 100644 index e48121b4a..24d3b29a5 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -31,7 +31,7 @@ import org.bukkit.inventory.MainHand; @@ -31,7 +31,7 @@ import org.bukkit.inventory.MainHand;
@ -45,10 +45,10 @@ index e48121b4..24d3b29a 100644
this.cm = packetplayinsettings.d(); this.cm = packetplayinsettings.d();
this.getDataWatcher().set(EntityPlayer.br, Byte.valueOf((byte) packetplayinsettings.e())); this.getDataWatcher().set(EntityPlayer.br, Byte.valueOf((byte) packetplayinsettings.e()));
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f55c4366..ef873c17 100644 index 0eee46edd..98e9da59a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1639,8 +1639,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1633,8 +1633,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override @Override
public String getLocale() { public String getLocale() {
@ -61,7 +61,7 @@ index f55c4366..ef873c17 100644
} }
public void setAffectsSpawning(boolean affects) { public void setAffectsSpawning(boolean affects) {
@@ -1777,7 +1779,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1771,7 +1773,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override @Override
public String getLocale() public String getLocale()
{ {
@ -71,5 +71,5 @@ index f55c4366..ef873c17 100644
@Override @Override
-- --
2.14.3 2.16.1

8
Spigot-Server-Patches/0185-String-based-Action-Bar-API.patch
View File

@ -1,4 +1,4 @@
From d30873880e717097e6a7661b180f377b26818f23 Mon Sep 17 00:00:00 2001 From d6be99ef58fb86a6d86ccbba15fb897a94fc92ea Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 27 Dec 2016 15:02:42 -0500 Date: Tue, 27 Dec 2016 15:02:42 -0500
Subject: [PATCH] String based Action Bar API Subject: [PATCH] String based Action Bar API
@ -62,10 +62,10 @@ index a4b0901cf..02940d697 100644
+ } + }
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ef873c17d..b17f2c067 100644 index 98e9da59a..a9186b77a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -178,6 +178,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -169,6 +169,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} }
// Paper start // Paper start
@ -85,5 +85,5 @@ index ef873c17d..b17f2c067 100644
public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) { public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter(); PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
-- --
2.15.1 2.16.1

8
Spigot-Server-Patches/0220-Fix-Anvil-Level-sync-to-client.patch
View File

@ -1,4 +1,4 @@
From 773807f01bfe47808176689487b33bdee794514c Mon Sep 17 00:00:00 2001 From 446060228e3bb43ea6455909af7464a97850bad4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 11 Jul 2017 23:17:57 -0400 Date: Tue, 11 Jul 2017 23:17:57 -0400
Subject: [PATCH] Fix Anvil Level sync to client Subject: [PATCH] Fix Anvil Level sync to client
@ -26,10 +26,10 @@ index 175753c5a..16ec67569 100644
this.lastLevelCost = this.levelCost; this.lastLevelCost = this.levelCost;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b17f2c067..5c2bacc7f 100644 index a9186b77a..1269a02aa 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1337,6 +1337,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1328,6 +1328,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (container.getBukkitView().getType() != prop.getType()) { if (container.getBukkitView().getType() != prop.getType()) {
return false; return false;
} }
@ -42,5 +42,5 @@ index b17f2c067..5c2bacc7f 100644
return true; return true;
} }
-- --
2.15.1 2.16.1

10
Spigot-Server-Patches/0243-Expose-client-protocol-version-and-virtual-host.patch
View File

@ -1,4 +1,4 @@
From b9052d98e21b73582ca84ba47978fd70ab42a3e7 Mon Sep 17 00:00:00 2001 From fefcfe0e575d6bd04ac9467445a027e783198e6c Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net> From: Minecrell <minecrell@minecrell.net>
Date: Tue, 10 Oct 2017 18:45:20 +0200 Date: Tue, 10 Oct 2017 18:45:20 +0200
Subject: [PATCH] Expose client protocol version and virtual host Subject: [PATCH] Expose client protocol version and virtual host
@ -111,7 +111,7 @@ index aececa39d..1d4ba3b3d 100644
return this.a; return this.a;
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5c2bacc7f..e5e3f7e80 100644 index 1269a02aa..428b208ae 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -136,6 +136,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -136,6 +136,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -133,8 +133,8 @@ index 5c2bacc7f..e5e3f7e80 100644
+ // Paper end + // Paper end
+ +
@Override @Override
public double getEyeHeight() { public double getEyeHeight(boolean ignorePose) {
return getEyeHeight(false); if (ignorePose) {
-- --
2.15.1 2.16.1

8
Spigot-Server-Patches/0259-Ability-to-apply-mending-to-XP-API.patch
View File

@ -1,4 +1,4 @@
From b5ab4d8f7a7123c7e2aa36fbbc8404bb05987465 Mon Sep 17 00:00:00 2001 From cefeedf5877de310c73e5fae20025fabc90fd526 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 20 Dec 2017 17:36:49 -0500 Date: Wed, 20 Dec 2017 17:36:49 -0500
Subject: [PATCH] Ability to apply mending to XP API Subject: [PATCH] Ability to apply mending to XP API
@ -78,10 +78,10 @@ index 52cb34abd..45c8e4b1e 100644
return this.damage; return this.damage;
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e5e3f7e80..2c65bb484 100644 index 428b208ae..21631c588 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -932,8 +932,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -923,8 +923,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return GameMode.getByValue(getHandle().playerInteractManager.getGameMode().getId()); return GameMode.getByValue(getHandle().playerInteractManager.getGameMode().getId());
} }
@ -123,5 +123,5 @@ index e5e3f7e80..2c65bb484 100644
} }
-- --
2.15.1 2.16.1

2
work/Bukkit

@ -1 +1 @@
Subproject commit d9006fb04c37444226a867b64c14cb4cfe830610 Subproject commit c03d8909d9822d1e8fe62a2e1550ae765f940893

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit e3b4cf5c282c04edb644a9cf499d021bd76edc9a Subproject commit f4ca1805d6e826d779a9593b882a1aec398dd7e4