diff --git a/Spigot-Server-Patches/0209-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0209-Handle-plugin-prefixes-using-Log4J-configuration.patch index 723e3c257d..3942f1a3c4 100644 --- a/Spigot-Server-Patches/0209-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/Spigot-Server-Patches/0209-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -1,4 +1,4 @@ -From 28222826f87feef4f8cdd05f38e2b6220e987dc6 Mon Sep 17 00:00:00 2001 +From 0cb27d53aa22f145a8515ee04760f587a64dc4bf Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:14:55 +0200 Subject: [PATCH] Handle plugin prefixes using Log4J configuration @@ -28,10 +28,10 @@ index a93ed45df9..bb32cb749d 100644 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 676780b619..5a873fe9d7 100644 +index ffbb1e894a..7f3543970f 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -286,7 +286,7 @@ public class SpigotConfig +@@ -292,7 +292,7 @@ public class SpigotConfig private static void playerSample() { playerSample = getInt( "settings.sample-count", 12 ); diff --git a/Spigot-Server-Patches/0243-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0243-Implement-extended-PaperServerListPingEvent.patch index 5fc1bc5d8e..8cf52e859c 100644 --- a/Spigot-Server-Patches/0243-Implement-extended-PaperServerListPingEvent.patch +++ b/Spigot-Server-Patches/0243-Implement-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From f84dca7cff9a63c999b574287e6542ec3bcc0ccb Mon Sep 17 00:00:00 2001 +From ce7b02aacbd7529f9bffc562a9a24d7fb2a988c4 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 15:56:26 +0200 Subject: [PATCH] Implement extended PaperServerListPingEvent @@ -177,7 +177,7 @@ index 0000000000..350410527b + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index cdcc375923..66b637326a 100644 +index 8e72220f37..90b1871196 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -915,7 +915,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -251,10 +251,10 @@ index d7e1ecc031..f20cddc41c 100644 this.c = agameprofile; } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 5a873fe9d7..42bd3b6edd 100644 +index 7f3543970f..6cc48258dc 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -285,7 +285,7 @@ public class SpigotConfig +@@ -291,7 +291,7 @@ public class SpigotConfig public static int playerSample; private static void playerSample() { diff --git a/removed/server/0080-Custom-replacement-for-eaten-items.patch b/removed/server/0080-Custom-replacement-for-eaten-items.patch deleted file mode 100644 index 04bc9b376a..0000000000 --- a/removed/server/0080-Custom-replacement-for-eaten-items.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 6aca1eb30fa703436f9e195e2a3b17c38c223f15 Mon Sep 17 00:00:00 2001 -From: Jedediah Smith -Date: Sun, 21 Jun 2015 15:07:20 -0400 -Subject: [PATCH] Custom replacement for eaten items - - -diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 2aaeac324..7e2cc66d7 100644 ---- a/src/main/java/net/minecraft/server/EntityLiving.java -+++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2377,12 +2377,13 @@ public abstract class EntityLiving extends Entity { - - protected void v() { - if (!this.activeItem.isEmpty() && this.isHandRaised()) { -+ PlayerItemConsumeEvent event = null; // Paper - this.b(this.activeItem, 16); - // CraftBukkit start - fire PlayerItemConsumeEvent - ItemStack itemstack; - if (this instanceof EntityPlayer) { - org.bukkit.inventory.ItemStack craftItem = CraftItemStack.asBukkitCopy(this.activeItem); -- PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem); -+ event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem); // Paper - world.getServer().getPluginManager().callEvent(event); - - if (event.isCancelled()) { -@@ -2397,9 +2398,21 @@ public abstract class EntityLiving extends Entity { - itemstack = this.activeItem.a(this.world, this); - } - -+ // Paper start - save the default replacement item and change it if necessary -+ final ItemStack defaultReplacement = itemstack; -+ if (event != null && event.getReplacement() != null) { -+ itemstack = CraftItemStack.asNMSCopy(event.getReplacement()); -+ } -+ // Paper end -+ - this.a(this.cH(), itemstack); - // CraftBukkit end - this.cN(); -+ -+ // Paper start - if the replacement is anything but the default, update the client inventory -+ if (this instanceof EntityPlayer && !com.google.common.base.Objects.equal(defaultReplacement, itemstack)) { -+ ((EntityPlayer) this).getBukkitEntity().updateInventory(); -+ } - } - - } --- -2.18.0 - diff --git a/removed/server/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/removed/server/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch deleted file mode 100644 index a10fc9b891..0000000000 --- a/removed/server/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b61b569f426f29ca36a9b769f868e62d552645ec 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 - -Fixes chunk unload issues - -diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 1e78fc625..ba3ee64f8 100644 ---- a/src/main/java/net/minecraft/server/Chunk.java -+++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -1044,25 +1044,25 @@ public class Chunk { - // CraftBukkit end - world.timings.syncChunkLoadPostTimer.stopTiming(); // Paper - world.timings.syncChunkLoadPopulateNeighbors.startTiming(); // Paper -- Chunk chunk = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ - 1); -- Chunk chunk1 = ichunkprovider.getLoadedChunkAt(this.locX + 1, this.locZ); -- Chunk chunk2 = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ + 1); -- Chunk chunk3 = ichunkprovider.getLoadedChunkAt(this.locX - 1, this.locZ); -+ Chunk chunk = MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX, this.locZ - 1); // Paper -+ Chunk chunk1 = MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX + 1, this.locZ); // Paper -+ Chunk chunk2 = MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX, this.locZ + 1); // Paper -+ Chunk chunk3 = MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX - 1, this.locZ); // Paper - -- if (chunk1 != null && chunk2 != null && ichunkprovider.getLoadedChunkAt(this.locX + 1, this.locZ + 1) != null) { -+ if (chunk1 != null && chunk2 != null && MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX + 1, this.locZ + 1) != null) { // Paper - this.a(chunkgenerator); - } - -- if (chunk3 != null && chunk2 != null && ichunkprovider.getLoadedChunkAt(this.locX - 1, this.locZ + 1) != null) { -+ if (chunk3 != null && chunk2 != null && MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX - 1, this.locZ + 1) != null) { // Paper - chunk3.a(chunkgenerator); - } - -- if (chunk != null && chunk1 != null && ichunkprovider.getLoadedChunkAt(this.locX + 1, this.locZ - 1) != null) { -+ if (chunk != null && chunk1 != null && MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX + 1, this.locZ - 1) != null) { // Paper - chunk.a(chunkgenerator); - } - - if (chunk != null && chunk3 != null) { -- Chunk chunk4 = ichunkprovider.getLoadedChunkAt(this.locX - 1, this.locZ - 1); -+ Chunk chunk4 = MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX - 1, this.locZ - 1); // Paper - - if (chunk4 != null) { - chunk4.a(chunkgenerator); --- -2.18.0 - diff --git a/work/Spigot b/work/Spigot index 5eb39219b1..a85f7ec0de 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 5eb39219b1987510730e082ef6c14470b11bcc5b +Subproject commit a85f7ec0de6263efed322bb8527c6360ea1109a7