diff --git a/Bukkit b/Bukkit index cd53bd989..db1761e3c 160000 --- a/Bukkit +++ b/Bukkit @@ -1 +1 @@ -Subproject commit cd53bd98952d61f137c9e4320bb69b79b3424644 +Subproject commit db1761e3c9dd2a74cda188145a5d3dc9da57f712 diff --git a/CraftBukkit b/CraftBukkit index c5d27c5f6..0ff499cf0 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit c5d27c5f6fcaf184d7d9c913bb3ac463e354991e +Subproject commit 0ff499cf03a013e8999042d6e758ecab6ddf41b6 diff --git a/Spigot-Server-Patches/0099-Only-mark-player-as-invulnerable-if-they-re-changing.patch b/Spigot-Server-Patches/0099-Only-mark-player-as-invulnerable-if-they-re-changing.patch deleted file mode 100644 index 41d33ac0c..000000000 --- a/Spigot-Server-Patches/0099-Only-mark-player-as-invulnerable-if-they-re-changing.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a1e0945bc90bf87dbad2b500ea020adf90da906e Mon Sep 17 00:00:00 2001 -From: Zach Brown -Date: Sun, 20 Mar 2016 19:40:51 -0500 -Subject: [PATCH] Only mark player as invulnerable if they're changing worlds - - -diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 3902d4f..efb88ef 100644 ---- a/src/main/java/net/minecraft/server/EntityPlayer.java -+++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -48,7 +48,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { - private boolean cg = true; - private long ch = System.currentTimeMillis(); - private Entity ci = null; -- private boolean cj; -+ protected boolean cj; // Paper - private -> protected - private int containerCounter; - public boolean f; - public int ping; -@@ -541,8 +541,9 @@ public class EntityPlayer extends EntityHuman implements ICrafting { - } - - public Entity c(int i) { -- this.cj = true; -+ //this.cj = true; // Moved down and into PlayerList#changeDimension - if (this.dimension == 1 && i == 1) { -+ this.cj = true; // Paper - Moved down - this.world.kill(this); - if (!this.viewingCredits) { - this.viewingCredits = true; -diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 344abbb..c6bad9e 100644 ---- a/src/main/java/net/minecraft/server/PlayerList.java -+++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -724,6 +724,7 @@ public abstract class PlayerList { - Location exit = null; - boolean useTravelAgent = false; // don't use agent for custom worlds or return from THE_END - if (exitWorld != null) { -+ entityplayer.cj = true; // Paper - Set teleport invulnerability only if they're actually changing worlds - if ((cause == TeleportCause.END_PORTAL) && (i == 0)) { - // THE_END -> NORMAL; use bed if available, otherwise default spawn - exit = ((org.bukkit.craftbukkit.entity.CraftPlayer) entityplayer.getBukkitEntity()).getBedSpawnLocation(); --- -2.7.4 - diff --git a/Spigot-Server-Patches/0100-Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/0099-Support-offline-mode-in-whitelist-command-as-well.patch similarity index 98% rename from Spigot-Server-Patches/0100-Support-offline-mode-in-whitelist-command-as-well.patch rename to Spigot-Server-Patches/0099-Support-offline-mode-in-whitelist-command-as-well.patch index 2ed2dab7d..0af8bb8e5 100644 --- a/Spigot-Server-Patches/0100-Support-offline-mode-in-whitelist-command-as-well.patch +++ b/Spigot-Server-Patches/0099-Support-offline-mode-in-whitelist-command-as-well.patch @@ -1,4 +1,4 @@ -From 0bc8b2e1cf0e3ecdd81fba1bf77530081bd40abc Mon Sep 17 00:00:00 2001 +From c754d5f8ddbf381e0ec90ed54852ea9dee491c52 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 21 Mar 2016 00:19:18 -0500 Subject: [PATCH] Support offline mode in whitelist command as well @@ -94,5 +94,5 @@ index b52bf74..2d08a36 100644 + // Paper end } -- -2.7.4 +2.7.4.windows.1 diff --git a/Spigot-Server-Patches/0101-Optimize-Chunk-Unload-Queue.patch b/Spigot-Server-Patches/0100-Optimize-Chunk-Unload-Queue.patch similarity index 99% rename from Spigot-Server-Patches/0101-Optimize-Chunk-Unload-Queue.patch rename to Spigot-Server-Patches/0100-Optimize-Chunk-Unload-Queue.patch index 0b25225e7..87602013e 100644 --- a/Spigot-Server-Patches/0101-Optimize-Chunk-Unload-Queue.patch +++ b/Spigot-Server-Patches/0100-Optimize-Chunk-Unload-Queue.patch @@ -1,4 +1,4 @@ -From e6b943c7e0b18b2ce33fa12fe27c298e1a836c2e Mon Sep 17 00:00:00 2001 +From b16e2e2a056abedb2e964e6e386fbb7cb57f3b6a Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 17:57:25 -0400 Subject: [PATCH] Optimize Chunk Unload Queue diff --git a/Spigot-Server-Patches/0103-Fix-SkullCache-case-bug.patch b/Spigot-Server-Patches/0101-Fix-SkullCache-case-bug.patch similarity index 92% rename from Spigot-Server-Patches/0103-Fix-SkullCache-case-bug.patch rename to Spigot-Server-Patches/0101-Fix-SkullCache-case-bug.patch index 64fe23305..c062224a0 100644 --- a/Spigot-Server-Patches/0103-Fix-SkullCache-case-bug.patch +++ b/Spigot-Server-Patches/0101-Fix-SkullCache-case-bug.patch @@ -1,4 +1,4 @@ -From d678f15b16b80141937b2890fa1fd0bac5e54fb7 Mon Sep 17 00:00:00 2001 +From 0c3a223e87348233b7c64ae18fddc88e169a95cd Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jan 2016 21:48:24 -0500 Subject: [PATCH] Fix SkullCache case bug @@ -18,5 +18,5 @@ index 7eecc6c..3c20ef3 100644 callback.apply(profile); } else { -- -2.7.4 +2.7.4.windows.1 diff --git a/Spigot-Server-Patches/0104-Waving-banner-workaround.patch b/Spigot-Server-Patches/0102-Waving-banner-workaround.patch similarity index 94% rename from Spigot-Server-Patches/0104-Waving-banner-workaround.patch rename to Spigot-Server-Patches/0102-Waving-banner-workaround.patch index dd8c1d777..b5912d316 100644 --- a/Spigot-Server-Patches/0104-Waving-banner-workaround.patch +++ b/Spigot-Server-Patches/0102-Waving-banner-workaround.patch @@ -1,4 +1,4 @@ -From 2b2d1075dc7870416e90329e352e5fa2aff32998 Mon Sep 17 00:00:00 2001 +From abf35a0090814b09cebed274fc5b6ac6f964847c Mon Sep 17 00:00:00 2001 From: Gabscap Date: Sat, 19 Mar 2016 22:25:11 +0100 Subject: [PATCH] Waving banner workaround @@ -33,5 +33,5 @@ index c5c3f40..3ed2356 100644 public void a(PacketDataSerializer packetdataserializer) throws IOException { -- -2.7.4 +2.7.4.windows.1 diff --git a/Spigot-Server-Patches/0105-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0103-Use-a-Shared-Random-for-Entities.patch similarity index 93% rename from Spigot-Server-Patches/0105-Use-a-Shared-Random-for-Entities.patch rename to Spigot-Server-Patches/0103-Use-a-Shared-Random-for-Entities.patch index 09c4b02f9..96832bfa0 100644 --- a/Spigot-Server-Patches/0105-Use-a-Shared-Random-for-Entities.patch +++ b/Spigot-Server-Patches/0103-Use-a-Shared-Random-for-Entities.patch @@ -1,4 +1,4 @@ -From 68e6101f346d1c1ffc3053535cd96bede6296790 Mon Sep 17 00:00:00 2001 +From 8f9680573688c86f293c0d15568d7b04a0fac502 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:33:47 -0400 Subject: [PATCH] Use a Shared Random for Entities @@ -27,5 +27,5 @@ index c28cf58..0f66b39 100644 this.justCreated = true; this.uniqueID = MathHelper.a(this.random); -- -2.7.4 +2.7.4.windows.1 diff --git a/Spigot-Server-Patches/0106-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0104-Don-t-teleport-dead-entities.patch similarity index 92% rename from Spigot-Server-Patches/0106-Don-t-teleport-dead-entities.patch rename to Spigot-Server-Patches/0104-Don-t-teleport-dead-entities.patch index 63098149b..4083ea903 100644 --- a/Spigot-Server-Patches/0106-Don-t-teleport-dead-entities.patch +++ b/Spigot-Server-Patches/0104-Don-t-teleport-dead-entities.patch @@ -1,4 +1,4 @@ -From 6b8db7e618c20302d579434a7750410a9ef2aef4 Mon Sep 17 00:00:00 2001 +From e94649fa55d3b711ec126ba5ead2bce8e51cd403 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:55:23 -0400 Subject: [PATCH] Don't teleport dead entities @@ -20,5 +20,5 @@ index 0f66b39..e57195c 100644 WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle(); int i = worldserver1.dimension; -- -2.7.4 +2.7.4.windows.1 diff --git a/Spigot-Server-Patches/0107-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0105-Optimize-Chunk-Access.patch similarity index 97% rename from Spigot-Server-Patches/0107-Optimize-Chunk-Access.patch rename to Spigot-Server-Patches/0105-Optimize-Chunk-Access.patch index fdd77185d..a3a8da9ad 100644 --- a/Spigot-Server-Patches/0107-Optimize-Chunk-Access.patch +++ b/Spigot-Server-Patches/0105-Optimize-Chunk-Access.patch @@ -1,4 +1,4 @@ -From 8c50e5009f1cb259ff523b25166d23696d0b9b08 Mon Sep 17 00:00:00 2001 +From 1f1ba7ebcc4d5a51914decb47c0537ff3a5ae1da Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 27 Aug 2015 01:15:02 -0400 Subject: [PATCH] Optimize Chunk Access @@ -98,7 +98,7 @@ index 0e1cbfe..7e06fa9 100644 if (this.getWorldData().isHardcore() && this.getDifficulty() != EnumDifficulty.HARD) { this.getWorldData().setDifficulty(EnumDifficulty.HARD); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 6307c19..0b3a882 100644 +index caa5e62..c69e070 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -224,6 +224,7 @@ public class CraftWorld implements World { @@ -110,5 +110,5 @@ index 6307c19..0b3a882 100644 // Update neighbor counts for (int xx = -2; xx < 3; xx++) { -- -2.7.4 +2.7.4.windows.1 diff --git a/Spigot-Server-Patches/0108-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0106-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 96% rename from Spigot-Server-Patches/0108-Configurable-spawn-chances-for-skeleton-horses.patch rename to Spigot-Server-Patches/0106-Configurable-spawn-chances-for-skeleton-horses.patch index 9a25cb851..78a7a151f 100644 --- a/Spigot-Server-Patches/0108-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0106-Configurable-spawn-chances-for-skeleton-horses.patch @@ -1,4 +1,4 @@ -From 9cbdef5acf7159e719a26670fc325656fd02a718 Mon Sep 17 00:00:00 2001 +From 9c996a87dceb9a913a5dafccc759d09bdb3d37ed Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 22 Mar 2016 12:04:28 -0500 Subject: [PATCH] Configurable spawn chances for skeleton horses @@ -35,5 +35,5 @@ index 7e06fa9..f7bb918 100644 entityhorse.setType(EnumHorseType.SKELETON); -- -2.7.4 +2.7.4.windows.1 diff --git a/Spigot-Server-Patches/0109-Optimize-isValidLocation-for-inlining.patch b/Spigot-Server-Patches/0107-Optimize-isValidLocation-for-inlining.patch similarity index 98% rename from Spigot-Server-Patches/0109-Optimize-isValidLocation-for-inlining.patch rename to Spigot-Server-Patches/0107-Optimize-isValidLocation-for-inlining.patch index 50f389f65..c99ee0144 100644 --- a/Spigot-Server-Patches/0109-Optimize-isValidLocation-for-inlining.patch +++ b/Spigot-Server-Patches/0107-Optimize-isValidLocation-for-inlining.patch @@ -1,4 +1,4 @@ -From dc62f96b9c16fe77efbb7bbaf2ac512f8f8477d3 Mon Sep 17 00:00:00 2001 +From c2e203f56a23c172c92e2aca5fdfae93da809297 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 23:41:34 -0400 Subject: [PATCH] Optimize isValidLocation for inlining @@ -118,5 +118,5 @@ index d21076b..6f45d2a 100644 } else { Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4); -- -2.7.4 +2.7.4.windows.1