From 14ffaf5d2c66491ef0f5f1aef4430621e375a804 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 11 Jun 2016 22:22:27 -0500 Subject: [PATCH] Update upstream B/CB --- Spigot-API-Patches/0003-Timings-v2.patch | 8 ++--- .../0004-Player-affects-spawning-API.patch | 8 ++--- .../0010-Add-player-view-distance-API.patch | 8 ++--- ...cord-chat-API-from-spigot-subclasses.patch | 8 ++--- .../0018-Player-Tab-List-and-Title-APIs.patch | 10 +++---- ...t-sendMessage-methods-to-CommandSend.patch | 10 +++---- .../0023-Complete-resource-pack-API.patch | 10 +++---- Spigot-Server-Patches/0005-Timings-v2.patch | 10 +++---- .../0019-Player-affects-spawning-API.patch | 6 ++-- ...024-Only-refresh-abilities-if-needed.patch | 6 ++-- .../0031-Lighting-Queue.patch | 6 ++-- .../0040-Add-player-view-distance-API.patch | 6 ++-- ...x-inter-world-teleportation-glitches.patch | 6 ++-- .../0071-Add-exception-reporting-event.patch | 10 +++---- .../0075-Complete-resource-pack-API.patch | 8 ++--- ...th-absorb-values-and-repair-bad-data.patch | 8 ++--- ...nd-for-setting-passengers-on-players.patch | 6 ++-- ...36-Implement-PlayerLocaleChangeEvent.patch | 6 ++-- ...hunks-as-active-for-neighbor-updates.patch | 10 +++---- .../0150-Fix-Chunk-Unload-Queue-Issues.patch | 8 ++--- ...an-ISE-in-MagmaBlock-damage-handling.patch | 29 ------------------- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 23 files changed, 81 insertions(+), 110 deletions(-) delete mode 100644 Spigot-Server-Patches/0164-Resolve-an-ISE-in-MagmaBlock-damage-handling.patch diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch index 70c86cfe5..606397fbd 100644 --- a/Spigot-API-Patches/0003-Timings-v2.patch +++ b/Spigot-API-Patches/0003-Timings-v2.patch @@ -1,4 +1,4 @@ -From fac59bea72f76e7b47c2ba85690115c3bcf72d86 Mon Sep 17 00:00:00 2001 +From 73206dd905b3bf4d1d007221e57fefba6d8e0e13 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 @@ -3220,10 +3220,10 @@ index fc59aa3..0000000 - // Spigot end -} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 2a51646..90248d8 100644 +index 9b20d5c..54e8a5c 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1380,6 +1380,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1394,6 +1394,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); } @@ -3598,5 +3598,5 @@ index 8d98297..7e89b97 100644 - } } -- -2.8.2 +2.8.3 diff --git a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch index babadf82c..4a98a02b3 100644 --- a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch +++ b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch @@ -1,14 +1,14 @@ -From e5bf28b61af878aee9b97ab52d6ed6930487362f Mon Sep 17 00:00:00 2001 +From 00efa3c0c22089c8778084375d22a5ace948cd04 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Mon, 29 Feb 2016 17:22:34 -0600 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 19f7ae7..145bb15 100644 +index 54e8a5c..c86a65c 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1270,6 +1270,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1284,6 +1284,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data); @@ -30,5 +30,5 @@ index 19f7ae7..145bb15 100644 public class Spigot extends Entity.Spigot { -- -2.8.0 +2.8.3 diff --git a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch index 8fa2ba809..a264aa62d 100644 --- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch +++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch @@ -1,14 +1,14 @@ -From ddf27421558eedfa849d43c38652e43e6b785145 Mon Sep 17 00:00:00 2001 +From e01015e7ba37c00ad49a8c3ba3e70835cd3ef913 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:05:37 -0600 Subject: [PATCH] Add player view distance API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 145bb15..66527ce 100644 +index c86a65c..0945c59 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1284,6 +1284,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1298,6 +1298,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void setAffectsSpawning(boolean affects); @@ -30,5 +30,5 @@ index 145bb15..66527ce 100644 public class Spigot extends Entity.Spigot { -- -2.8.0 +2.8.3 diff --git a/Spigot-API-Patches/0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index 10a81129a..5d3027ae0 100644 --- a/Spigot-API-Patches/0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/Spigot-API-Patches/0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -1,4 +1,4 @@ -From e25bb60f64574f5ad5a47207b373e9aa4689bf9a Mon Sep 17 00:00:00 2001 +From 544918f08d26a3d51fd444976d273fcd5b0609cb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 19:54:32 -0600 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses @@ -64,10 +64,10 @@ index a1ce356..309fa3f 100644 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index e13ca66..c19bb76 100644 +index 0945c59..4c880b8 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -331,6 +331,30 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -345,6 +345,30 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void sendMap(MapView map); @@ -99,5 +99,5 @@ index e13ca66..c19bb76 100644 * Forces an update of the player's entire inventory. * -- -2.8.0 +2.8.3 diff --git a/Spigot-API-Patches/0018-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0018-Player-Tab-List-and-Title-APIs.patch index 5299ea99c..4eff174f5 100644 --- a/Spigot-API-Patches/0018-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-API-Patches/0018-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From 63efc00ce7fa0aea2762f201750d1aa1d88ddb34 Mon Sep 17 00:00:00 2001 +From 65e92020e42f6989a280c30ef0d5572d3e6dff92 Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 29 Feb 2016 20:02:40 -0600 Subject: [PATCH] Player Tab List and Title APIs @@ -369,7 +369,7 @@ index 0000000..e1ecd44 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index c19bb76..eb357e8 100644 +index 4c880b8..bb31477 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -2,6 +2,7 @@ package org.bukkit.entity; @@ -380,7 +380,7 @@ index c19bb76..eb357e8 100644 import org.bukkit.Achievement; import org.bukkit.ChatColor; import org.bukkit.Effect; -@@ -353,6 +354,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -367,6 +368,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * @param components the components to send */ public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components); @@ -497,7 +497,7 @@ index c19bb76..eb357e8 100644 // Paper end /** -@@ -1097,7 +1208,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1111,7 +1222,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * Resets the title displayed to the player. * @deprecated API subject to change. */ @@ -507,5 +507,5 @@ index c19bb76..eb357e8 100644 -- -2.8.0 +2.8.3 diff --git a/Spigot-API-Patches/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch index b5903635e..26a4bf34b 100644 --- a/Spigot-API-Patches/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch +++ b/Spigot-API-Patches/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch @@ -1,4 +1,4 @@ -From 2f744e6d6116fd4debbba556368e44db6d1b9090 Mon Sep 17 00:00:00 2001 +From 20f7cf3795004ee2e49b58c2bdcaae78f60dcd8f Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 13:05:59 -0800 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender @@ -40,10 +40,10 @@ index 148756b..4ad0028 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 5326ea6..2951b98 100644 +index bb31477..99f148c 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -338,6 +338,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -352,6 +352,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * * @param component the components to send */ @@ -51,7 +51,7 @@ index 5326ea6..2951b98 100644 public void sendMessage(net.md_5.bungee.api.chat.BaseComponent component); /** -@@ -345,6 +346,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -359,6 +360,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * * @param components the components to send */ @@ -60,5 +60,5 @@ index 5326ea6..2951b98 100644 /** -- -2.8.0 +2.8.3 diff --git a/Spigot-API-Patches/0023-Complete-resource-pack-API.patch b/Spigot-API-Patches/0023-Complete-resource-pack-API.patch index 356ed1df0..966102caf 100644 --- a/Spigot-API-Patches/0023-Complete-resource-pack-API.patch +++ b/Spigot-API-Patches/0023-Complete-resource-pack-API.patch @@ -1,14 +1,14 @@ -From c5ee29107fa2ca951596709eb6c5ff26a341f024 Mon Sep 17 00:00:00 2001 +From 915e61ece5914582a738ee9a9e43f37e910307c7 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 22:59:54 -0400 Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 07d8c77..d636c63 100644 +index 99f148c..1498349 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1107,7 +1107,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1121,7 +1121,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * @throws IllegalArgumentException Thrown if the URL is null. * @throws IllegalArgumentException Thrown if the URL is too long. The * length restriction is an implementation specific arbitrary value. @@ -18,7 +18,7 @@ index 07d8c77..d636c63 100644 public void setResourcePack(String url); /** -@@ -1435,6 +1437,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1449,6 +1451,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void setViewDistance(int viewDistance); @@ -110,5 +110,5 @@ index 4c49801..4c83851 100644 * Gets the status of this pack. * -- -2.8.0 +2.8.3 diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch index f0f54d75e..ff3a6ac43 100644 --- a/Spigot-Server-Patches/0005-Timings-v2.patch +++ b/Spigot-Server-Patches/0005-Timings-v2.patch @@ -1,4 +1,4 @@ -From f2803e9a894738ba64197ddde9ea5fca9e539ff7 Mon Sep 17 00:00:00 2001 +From 9034cdd7c79fadd996c42af76984a42082af1e9f Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -363,7 +363,7 @@ index 064b7a9..c0e6dc8 100644 public void recalcPosition() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 3af0765..b5db35f 100644 +index a32e453..022745e 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -26,7 +26,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -710,7 +710,7 @@ index b0249ff..797a84f 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 19be56f..155030d 100644 +index ed97c65..888a7c5 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -57,6 +57,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -1181,7 +1181,7 @@ index 41d2d87..0000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5941fab..ce85bc2 100644 +index 003fd2f..6b3bbfe 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -37,15 +37,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; @@ -1201,7 +1201,7 @@ index 5941fab..ce85bc2 100644 import org.bukkit.craftbukkit.map.CraftMapView; import org.bukkit.craftbukkit.map.RenderData; import org.bukkit.craftbukkit.scoreboard.CraftScoreboard; -@@ -1545,6 +1539,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1560,6 +1554,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { packet.components = components; getHandle().playerConnection.sendPacket(packet); } diff --git a/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch index 46e8d80ad..69150f11d 100644 --- a/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From b10b62e4704a0f5fc2c4500c6a7de5fcafe7b683 Mon Sep 17 00:00:00 2001 +From ba8fc1510d97add8edc358ee242c8227ac70afd7 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 14:47:52 -0600 Subject: [PATCH] Player affects spawning API @@ -184,10 +184,10 @@ index c110c74..da6b78b 100644 double d4 = entityhuman.e(d0, d1, d2); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ce85bc2..eb6d41b 100644 +index 6b3bbfe..11e3028 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1408,6 +1408,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1423,6 +1423,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } diff --git a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch index 07f57e1e0..8b85c1c1e 100644 --- a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch @@ -1,14 +1,14 @@ -From c6d62c52c9a7172e145447bf0854c856ca8bc01b Mon Sep 17 00:00:00 2001 +From 3329d9605d312326a35d19f576307a30694bff8f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:12:03 -0600 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 -index eb6d41b..1fe6af5 100644 +index 11e3028..eac8062 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1136,12 +1136,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1151,12 +1151,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void setFlying(boolean value) { diff --git a/Spigot-Server-Patches/0031-Lighting-Queue.patch b/Spigot-Server-Patches/0031-Lighting-Queue.patch index 0026a56b9..c88fb7c63 100644 --- a/Spigot-Server-Patches/0031-Lighting-Queue.patch +++ b/Spigot-Server-Patches/0031-Lighting-Queue.patch @@ -1,4 +1,4 @@ -From a9bed340a412f9d38ba5c842931de0a0f778f417 Mon Sep 17 00:00:00 2001 +From c02d72520a696880f5fa2f686bb2c8565ee82270 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 00:52:31 -0600 Subject: [PATCH] Lighting Queue @@ -85,10 +85,10 @@ index c051c77..770da2b 100644 TileEntity tileentity; diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index dc6ec1e..e5ee5c6 100644 +index fe50511..51d95c6 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -281,6 +281,7 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -290,6 +290,7 @@ public class ChunkProviderServer implements IChunkProvider { if (event.isCancelled()) { continue; } diff --git a/Spigot-Server-Patches/0040-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0040-Add-player-view-distance-API.patch index cfc96671b..1dd2f22de 100644 --- a/Spigot-Server-Patches/0040-Add-player-view-distance-API.patch +++ b/Spigot-Server-Patches/0040-Add-player-view-distance-API.patch @@ -1,4 +1,4 @@ -From 753d11d1fab7a122c7da09d6e4242f9357fffaf1 Mon Sep 17 00:00:00 2001 +From 46f5d6421b1810d3697ca89d3fb027608a9a74a2 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 14:35:27 -0600 Subject: [PATCH] Add player view distance API @@ -93,10 +93,10 @@ index 797a84f..d554d7d 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1fe6af5..c3ba701 100644 +index eac8062..9955de3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1419,6 +1419,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1434,6 +1434,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.getHandle().affectsSpawning; } diff --git a/Spigot-Server-Patches/0070-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0070-Fix-inter-world-teleportation-glitches.patch index a37130511..20b8de127 100644 --- a/Spigot-Server-Patches/0070-Fix-inter-world-teleportation-glitches.patch +++ b/Spigot-Server-Patches/0070-Fix-inter-world-teleportation-glitches.patch @@ -1,4 +1,4 @@ -From f8f6dac0d1a072992d643f62c80b4f4ae724b5a6 Mon Sep 17 00:00:00 2001 +From e9fa4f45cd495078a5fb89817ec675277ede71ae Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Thu, 3 Mar 2016 02:50:31 -0600 Subject: [PATCH] Fix inter-world teleportation glitches @@ -25,10 +25,10 @@ index 5807609..034369a 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 74fdd3c..32d69df 100644 +index d9dd3eb..101dc2b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -557,7 +557,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -572,7 +572,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { if (fromWorld == toWorld) { entity.playerConnection.teleport(to); } else { diff --git a/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch index 726de162a..38658805b 100644 --- a/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From 9dbe91492774e8e2feb3995f84867d961bf2cfb1 Mon Sep 17 00:00:00 2001 +From d6e73e258479bda08f27d3362756a543610458f0 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 03:15:41 -0600 Subject: [PATCH] Add exception reporting event @@ -89,7 +89,7 @@ index 51a1d85..bc6e190 100644 } } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index e5ee5c6..990e3f0 100644 +index 51d95c6..c1dc4fa 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -11,6 +11,7 @@ import java.util.Iterator; @@ -100,7 +100,7 @@ index e5ee5c6..990e3f0 100644 import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@@ -209,7 +210,11 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -218,7 +219,11 @@ public class ChunkProviderServer implements IChunkProvider { return chunk; } catch (Exception exception) { @@ -113,7 +113,7 @@ index e5ee5c6..990e3f0 100644 return null; } } -@@ -218,7 +223,11 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -227,7 +232,11 @@ public class ChunkProviderServer implements IChunkProvider { try { this.chunkLoader.b(this.world, chunk); } catch (Exception exception) { @@ -126,7 +126,7 @@ index e5ee5c6..990e3f0 100644 } } -@@ -228,9 +237,14 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -237,9 +246,14 @@ public class ChunkProviderServer implements IChunkProvider { chunk.setLastSaved(this.world.getTime()); this.chunkLoader.a(this.world, chunk); } catch (IOException ioexception) { diff --git a/Spigot-Server-Patches/0075-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0075-Complete-resource-pack-API.patch index 51e15ce6c..8bedbf579 100644 --- a/Spigot-Server-Patches/0075-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0075-Complete-resource-pack-API.patch @@ -1,11 +1,11 @@ -From 9b0b7c9f2eaf3432259e3124e87c3616aad9a6fb Mon Sep 17 00:00:00 2001 +From e7aaa78fba39628af819e63138d45f15f9055342 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 23:17:52 -0400 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 -index efca444..9e75986 100644 +index 120e52a..8cd02b3 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1024,7 +1024,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -24,7 +24,7 @@ index efca444..9e75986 100644 // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 32d69df..4860701 100644 +index 101dc2b..9299695 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -72,6 +72,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -38,7 +38,7 @@ index 32d69df..4860701 100644 public CraftPlayer(CraftServer server, EntityPlayer entity) { super(server, entity); -@@ -1525,6 +1529,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1540,6 +1544,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { ((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance); } diff --git a/Spigot-Server-Patches/0091-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0091-handle-NaN-health-absorb-values-and-repair-bad-data.patch index 6b0760d7c..82588c881 100644 --- a/Spigot-Server-Patches/0091-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0091-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,11 +1,11 @@ -From 2708cdeef5f8caa3e8619dcb1abd5cd2cac89675 Mon Sep 17 00:00:00 2001 +From 07d037f8f1b8cdc0725819415b68c33e3b521707 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 27 Sep 2015 01:18:02 -0400 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 -index eec5dd5..01f779c 100644 +index c6d5986..ff9096f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -468,7 +468,13 @@ public abstract class EntityLiving extends Entity { @@ -44,10 +44,10 @@ index eec5dd5..01f779c 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7edc2e2..087d788 100644 +index 9299695..e941f5f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1375,6 +1375,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1390,6 +1390,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } public void setRealHealth(double health) { diff --git a/Spigot-Server-Patches/0125-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0125-Workaround-for-setting-passengers-on-players.patch index 68c27b3a8..3867e97ac 100644 --- a/Spigot-Server-Patches/0125-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0125-Workaround-for-setting-passengers-on-players.patch @@ -1,4 +1,4 @@ -From 536459472445711d5073a0ffc33e077c9ef3fbf8 Mon Sep 17 00:00:00 2001 +From 887884dd866c1ec1c9f9c2e6de0099ee9ef1163b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 10 Apr 2016 03:23:32 -0500 Subject: [PATCH] Workaround for setting passengers on players @@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players 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 -index 087d788..36bebb2 100644 +index e941f5f..e20c4ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -567,6 +567,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -582,6 +582,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return true; } diff --git a/Spigot-Server-Patches/0136-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0136-Implement-PlayerLocaleChangeEvent.patch index d02728071..55157bcd2 100644 --- a/Spigot-Server-Patches/0136-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0136-Implement-PlayerLocaleChangeEvent.patch @@ -1,4 +1,4 @@ -From 14c640771aee1360601efd5bfa9c92e3c634a903 Mon Sep 17 00:00:00 2001 +From 9f4ad2b7defdfba2a0e64ed9f04182c8f6918996 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent @@ -34,10 +34,10 @@ index e9baaa2..d084fc2 100644 this.ci = packetplayinsettings.d(); 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 -index f50216f..783dfbd 100644 +index e20c4ef..3f871a7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1656,7 +1656,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1671,7 +1671,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public String getLocale() { diff --git a/Spigot-Server-Patches/0149-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0149-Do-not-mark-chunks-as-active-for-neighbor-updates.patch index 26ec48492..f3184639c 100644 --- a/Spigot-Server-Patches/0149-Do-not-mark-chunks-as-active-for-neighbor-updates.patch +++ b/Spigot-Server-Patches/0149-Do-not-mark-chunks-as-active-for-neighbor-updates.patch @@ -1,4 +1,4 @@ -From fe26adfec4886a22df18f29de7fa1928c065e272 Mon Sep 17 00:00:00 2001 +From 5cbbd2df9293bded0d27bb098766478e27edb75a Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 12 May 2016 01:55:17 -0400 Subject: [PATCH] Do not mark chunks as active for neighbor updates @@ -44,10 +44,10 @@ index ffd2a26..bb8fe9c 100644 if (chunk4 != null) { chunk4.a(chunkgenerator); diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index f8905b4..6d1b98b 100644 +index 3dabfdb..8f29358 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -203,7 +203,7 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -212,7 +212,7 @@ public class ChunkProviderServer implements IChunkProvider { continue; } @@ -56,7 +56,7 @@ index f8905b4..6d1b98b 100644 if (neighbor != null) { neighbor.setNeighborLoaded(-x, -z); chunk.setNeighborLoaded(x, z); -@@ -324,7 +324,7 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -333,7 +333,7 @@ public class ChunkProviderServer implements IChunkProvider { continue; } @@ -66,7 +66,7 @@ index f8905b4..6d1b98b 100644 neighbor.setNeighborUnloaded(-x, -z); chunk.setNeighborUnloaded(x, z); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d822cb1..9335cef 100644 +index 4315653..4459e33 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -241,7 +241,7 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0150-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0150-Fix-Chunk-Unload-Queue-Issues.patch index 5b8db7bee..05c8767fc 100644 --- a/Spigot-Server-Patches/0150-Fix-Chunk-Unload-Queue-Issues.patch +++ b/Spigot-Server-Patches/0150-Fix-Chunk-Unload-Queue-Issues.patch @@ -1,4 +1,4 @@ -From 2e031f803a8039b4c3ba62f85988853f7bd60a85 Mon Sep 17 00:00:00 2001 +From c899237b9f819e1f2c85ee79cbc06548f049c69b Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 12 May 2016 02:03:56 -0400 Subject: [PATCH] Fix Chunk Unload Queue Issues @@ -22,10 +22,10 @@ index bb8fe9c..774077e 100644 // Paper start diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 6d1b98b..4a2cad6 100644 +index 8f29358..33b3db7 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -309,6 +309,7 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -318,6 +318,7 @@ public class ChunkProviderServer implements IChunkProvider { Chunk chunk = (Chunk) this.chunks.get(olong); if (chunk != null && chunk.d) { @@ -34,7 +34,7 @@ index 6d1b98b..4a2cad6 100644 ChunkUnloadEvent event = new ChunkUnloadEvent(chunk.bukkitChunk); this.world.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 9335cef..6517e5a 100644 +index 4459e33..22d142a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -303,6 +303,9 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0164-Resolve-an-ISE-in-MagmaBlock-damage-handling.patch b/Spigot-Server-Patches/0164-Resolve-an-ISE-in-MagmaBlock-damage-handling.patch deleted file mode 100644 index e8cf51eb1..000000000 --- a/Spigot-Server-Patches/0164-Resolve-an-ISE-in-MagmaBlock-damage-handling.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ec3b207d21db5d5671b1c2b49e1bcd616c4cd339 Mon Sep 17 00:00:00 2001 -From: Jedediah Smith -Date: Sat, 11 Jun 2016 19:09:16 -0500 -Subject: [PATCH] Resolve an ISE in MagmaBlock damage handling - - -diff --git a/src/main/java/net/minecraft/server/BlockMagma.java b/src/main/java/net/minecraft/server/BlockMagma.java -index 82c7436..418823a 100644 ---- a/src/main/java/net/minecraft/server/BlockMagma.java -+++ b/src/main/java/net/minecraft/server/BlockMagma.java -@@ -17,8 +17,15 @@ public class BlockMagma extends Block { - - public void stepOn(World world, BlockPosition blockposition, Entity entity) { - if (!entity.isFireProof() && entity instanceof EntityLiving && !EnchantmentManager.j((EntityLiving) entity)) { -+ final org.bukkit.block.Block oldBlockDamage = org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage; // Paper - org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); // CraftBukkit -+ // Paper start -+ try { - entity.damageEntity(DamageSource.HOT_FLOOR, 1.0F); -+ } finally { -+ org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = oldBlockDamage; -+ } -+ // Paper end - } - - super.stepOn(world, blockposition, entity); --- -2.8.3 - diff --git a/work/Bukkit b/work/Bukkit index a4fe2264e..82821325a 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit a4fe2264e678cdc646098df61398ea8a10b0731a +Subproject commit 82821325a6b1645d5607057e9656ef3689f5ae1a diff --git a/work/CraftBukkit b/work/CraftBukkit index d5ecbd0e9..ac58f3840 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit d5ecbd0e93a7a22d3631541c258635fdcc42a489 +Subproject commit ac58f3840ebe6060511c56ca8c4440916ea46425