From 46d4568f312b87cf2f571dd09f3a58b318d15fd3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 22 Apr 2018 10:40:36 -0400 Subject: [PATCH] Update upstream --- .../Add-EntityZapEvent.patch | 2 +- ...property-to-disable-book-size-limits.patch | 2 +- .../Chunk-registration-fixes.patch | 2 +- ...figurable-Cartographer-Treasure-Maps.patch | 2 +- ...le-Keep-Spawn-Loaded-range-per-world.patch | 2 +- ...am-reload-spawn-chunks-in-nether-end.patch | 2 +- ...PI-for-Reason-Source-Triggering-play.patch | 2 +- ...Location-getType-and-getBlockData-fo.patch | 2 +- .../Player-affects-spawning-API.patch | 2 +- ...Remove-unused-World-Tile-Entity-List.patch | 2 +- ...GOT-3894-to-restore-vanilla-behavior.patch | 26 ------------------- Spigot-Server-Patches/Timings-v2.patch | 7 +++-- .../Vanished-players-don-t-have-rights.patch | 2 +- ...r-reloading-of-pending-unload-chunks.patch | 23 ---------------- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 17 files changed, 17 insertions(+), 67 deletions(-) delete mode 100644 Spigot-Server-Patches/Revert-SPIGOT-3894-to-restore-vanilla-behavior.patch delete mode 100644 Spigot-Server-Patches/revert-Better-reloading-of-pending-unload-chunks.patch diff --git a/Spigot-Server-Patches/Add-EntityZapEvent.patch b/Spigot-Server-Patches/Add-EntityZapEvent.patch index 6e240650b5..bb97ea97c9 100644 --- a/Spigot-Server-Patches/Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/Add-EntityZapEvent.patch @@ -22,7 +22,7 @@ index 94d011721..fcf99e668 100644 if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) { return; diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index fd3714e8e..cfc8d986f 100644 +index 87ed31b21..9d201b14e 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { diff --git a/Spigot-Server-Patches/Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/Add-system-property-to-disable-book-size-limits.patch index 57682b4ab6..5037439070 100644 --- a/Spigot-Server-Patches/Add-system-property-to-disable-book-size-limits.patch +++ b/Spigot-Server-Patches/Add-system-property-to-disable-book-size-limits.patch @@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without limiting incoming data from packets in some other way. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -index ed89f64ac..91e3c4468 100644 +index a7e51d9f1..ffdb7ec82 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java @@ -0,0 +0,0 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { diff --git a/Spigot-Server-Patches/Chunk-registration-fixes.patch b/Spigot-Server-Patches/Chunk-registration-fixes.patch index 9d08336411..611e9b327e 100644 --- a/Spigot-Server-Patches/Chunk-registration-fixes.patch +++ b/Spigot-Server-Patches/Chunk-registration-fixes.patch @@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr Keep them consistent diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7976112e5..4bea2a9e1 100644 +index bafa37f64..d5e338eb3 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch index 864b24d41b..8ae273077f 100644 --- a/Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch +++ b/Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch @@ -28,7 +28,7 @@ index 513c4b020..631aa6eb9 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index cfc8d986f..d0183457e 100644 +index 9d201b14e..57fcc3c05 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { diff --git a/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch index b9b7f7352f..f04f13a3b7 100644 --- a/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -39,7 +39,7 @@ index 4e8ce79ff..2300ee10b 100644 if (i1 - j > 1000L) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 518ee1826..4ae6d6df6 100644 +index 279f0a261..a0b36b6ba 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/Don-t-spam-reload-spawn-chunks-in-nether-end.patch index e9e5a62029..55068872f9 100644 --- a/Spigot-Server-Patches/Don-t-spam-reload-spawn-chunks-in-nether-end.patch +++ b/Spigot-Server-Patches/Don-t-spam-reload-spawn-chunks-in-nether-end.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't spam reload spawn chunks in nether/end diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b092a84db..b3bebefe4 100644 +index f78298a5a..e2efbf8cb 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 6cdfc41104..191b5898ee 100644 --- a/Spigot-Server-Patches/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -156,7 +156,7 @@ index 0255986fd..e14f614f5 100644 this.die(); diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index d0183457e..812e88e58 100644 +index 57fcc3c05..a9c4ab10d 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { diff --git a/Spigot-Server-Patches/Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/Optimize-isValidLocation-getType-and-getBlockData-fo.patch index 088d7a3f8a..d284bd5d0a 100644 --- a/Spigot-Server-Patches/Optimize-isValidLocation-getType-and-getBlockData-fo.patch +++ b/Spigot-Server-Patches/Optimize-isValidLocation-getType-and-getBlockData-fo.patch @@ -99,7 +99,7 @@ index 3d784d0dc..afdc4a779 100644 private NibbleArray skyLight; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 03fec7195..93257a38e 100644 +index 9339bf83a..a20c9810f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/Player-affects-spawning-API.patch b/Spigot-Server-Patches/Player-affects-spawning-API.patch index d9d768bd98..0233be0ebb 100644 --- a/Spigot-Server-Patches/Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/Player-affects-spawning-API.patch @@ -57,7 +57,7 @@ index a599a043d..1c7c187c7 100644 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 -index 3cdbedf14..b2b82d520 100644 +index 759964b0f..26d4bd690 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/Remove-unused-World-Tile-Entity-List.patch index edbda4e600..f5e54ed64a 100644 --- a/Spigot-Server-Patches/Remove-unused-World-Tile-Entity-List.patch +++ b/Spigot-Server-Patches/Remove-unused-World-Tile-Entity-List.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List Massive hit to performance and it is completely unnecessary. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b3bebefe4..37713adf0 100644 +index e2efbf8cb..aae2d5786 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/Revert-SPIGOT-3894-to-restore-vanilla-behavior.patch b/Spigot-Server-Patches/Revert-SPIGOT-3894-to-restore-vanilla-behavior.patch deleted file mode 100644 index 9c6e5095bc..0000000000 --- a/Spigot-Server-Patches/Revert-SPIGOT-3894-to-restore-vanilla-behavior.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Wed, 18 Apr 2018 01:42:42 -0400 -Subject: [PATCH] Revert SPIGOT-3894 to restore vanilla behavior - -reporter of this issue was incorrect and did not verify vanilla logic - -vanilla logic only skips ticks if the flag is set - -spigots change causes bugs as it now skips ticking and processing -chunk teleportation, which was a bug I fixed many many years ago... - -diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 4ce846b5e..6c92f93a9 100644 ---- a/src/main/java/net/minecraft/server/World.java -+++ b/src/main/java/net/minecraft/server/World.java -@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { - // CraftBukkit end - - // Spigot start -- if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { -+ if (flag && !org.spigotmc.ActivationRange.checkIfActive(entity)) { // Paper - Revert spigot change back to vanilla - entity.ticksLived++; - entity.inactiveTick(); - return; --- \ No newline at end of file diff --git a/Spigot-Server-Patches/Timings-v2.patch b/Spigot-Server-Patches/Timings-v2.patch index 1f585e1b78..6c7ac34c45 100644 --- a/Spigot-Server-Patches/Timings-v2.patch +++ b/Spigot-Server-Patches/Timings-v2.patch @@ -1148,7 +1148,7 @@ index 5a5a588e7..d2d4ff6fb 100644 private static final RegistryMaterials> f = new RegistryMaterials(); protected World world; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 07fd5d957..ec83c431e 100644 +index 843320ffb..d902e2630 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -0,0 +0,0 @@ import com.google.common.collect.Maps; @@ -1229,11 +1229,10 @@ index 07fd5d957..ec83c431e 100644 this.methodProfiler.b(); } @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { - return; } - // Spigot end + // CraftBukkit end + - entity.tickTimer.startTiming(); // Spigot -+ entity.M = entity.locX; entity.N = entity.locY; entity.O = entity.locZ; diff --git a/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch index a469f8ef9b..83ca3bdc9c 100644 --- a/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch @@ -31,7 +31,7 @@ index 60149c1ca..a5730d1c7 100644 IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 66e56e0fd..942f57df1 100644 +index ea6f46522..01dba285a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/revert-Better-reloading-of-pending-unload-chunks.patch b/Spigot-Server-Patches/revert-Better-reloading-of-pending-unload-chunks.patch deleted file mode 100644 index 3efbd60caf..0000000000 --- a/Spigot-Server-Patches/revert-Better-reloading-of-pending-unload-chunks.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shane Freeder -Date: Sun, 8 Apr 2018 01:21:23 +0100 -Subject: [PATCH] revert "Better reloading of pending unload chunks" - -many areas of NMS calls through to this method which means that -the server can easilly keep chunks loaded in certain conditions -even when they're no longer needed. - -diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 55dada668..2ed3fc40b 100644 ---- a/src/main/java/net/minecraft/server/ChunkProviderServer.java -+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider { - } - - public Chunk getChunkAt(int i, int j, Runnable runnable, boolean generate) { -- Chunk chunk = getLoadedChunkAt(i, j); -+ Chunk chunk = getChunkIfLoaded(i, j); // Paper - revert "Better reloading of pending unload chunks" (see patch) - ChunkRegionLoader loader = null; - - if (this.chunkLoader instanceof ChunkRegionLoader) { --- \ No newline at end of file diff --git a/work/Bukkit b/work/Bukkit index bf61ffc26b..33a62b9591 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit bf61ffc26b4845816da86e9ce53c29b7263fb7a7 +Subproject commit 33a62b95913e6df50dc60f0fdad3144ba094bef7 diff --git a/work/CraftBukkit b/work/CraftBukkit index bea5a842bc..21d5f75d6c 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit bea5a842bc51229c58db6ee9a0ce8768935543ea +Subproject commit 21d5f75d6c7b2f13faf8815b20ba877681a0f47f diff --git a/work/Spigot b/work/Spigot index eadd615b84..2086bb074d 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit eadd615b8418d25885b85acb922c4f3be674dd76 +Subproject commit 2086bb074d6795823451bdb9f857d83c0f566990