diff --git a/Spigot-Server-Patches/0197-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0196-Cap-Entity-Collisions.patch similarity index 93% rename from Spigot-Server-Patches/0197-Cap-Entity-Collisions.patch rename to Spigot-Server-Patches/0196-Cap-Entity-Collisions.patch index 8c744c0e85..9f004244f2 100644 --- a/Spigot-Server-Patches/0197-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0196-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From 27376f342b71acfc59a880589e60757726ac340d Mon Sep 17 00:00:00 2001 +From 30d0223b0455e9c911511ddb3a66304a98dc45e2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 22 Jan 2017 18:07:56 -0500 Subject: [PATCH] Cap Entity Collisions @@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped. You can set this to 0 to disable collisions. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 7871406e4..3ba465305 100644 +index 7871406e..3ba46530 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -408,4 +408,10 @@ public class PaperWorldConfig { @@ -27,7 +27,7 @@ index 7871406e4..3ba465305 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 546059414..a5ed651dd 100644 +index 54605941..a5ed651d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -170,6 +170,7 @@ public abstract class Entity implements ICommandListener { @@ -39,7 +39,7 @@ index 546059414..a5ed651dd 100644 // Spigot end diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 91e8c1d75..adb045937 100644 +index 91e8c1d7..adb04593 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2191,8 +2191,11 @@ public abstract class EntityLiving extends Entity { @@ -56,5 +56,5 @@ index 91e8c1d75..adb045937 100644 this.C(entity); } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0196-Remove-the-Vanilla-Method-Profiler.patch b/Spigot-Server-Patches/0196-Remove-the-Vanilla-Method-Profiler.patch deleted file mode 100644 index d61a8cbda1..0000000000 --- a/Spigot-Server-Patches/0196-Remove-the-Vanilla-Method-Profiler.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 1c34ffa74f4b1012824137f90a845d916eaf2530 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Sat, 21 Jan 2017 08:00:33 +0100 -Subject: [PATCH] Remove the Vanilla Method Profiler - -Spigot rebrought this back after it was removed for years due to the performance hit. - -It is unknown if the JIT will optimize it out as efficiently with how it was -added, so we do not want any risk of performance degredation. - -Paper has a proper Timings system that makes the Vanilla Method profiler obsolete and inferior. - -diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java -index 89708da96..7586168db 100644 ---- a/src/main/java/net/minecraft/server/CommandDebug.java -+++ b/src/main/java/net/minecraft/server/CommandDebug.java -@@ -35,12 +35,11 @@ public class CommandDebug extends CommandAbstract { - - public void execute(MinecraftServer minecraftserver, ICommandListener icommandlistener, String[] astring) throws CommandException { - // CraftBukkit start - only allow use when enabled (so that no blank profile results occur) -- if (!minecraftserver.methodProfiler.ENABLED) { -- icommandlistener.sendMessage(new ChatComponentText("Vanilla debug profiling is disabled.")); -- icommandlistener.sendMessage(new ChatComponentText("To enable, restart the server with `-DenableDebugMethodProfiler=true' before `-jar'.")); -- icommandlistener.sendMessage(new ChatComponentText("Use `/timings' for plugin timings.")); -+ if (true) { // Paper -+ icommandlistener.sendMessage(new ChatComponentText("Use `/timings report'")); // Paper - return; - } -+ /* - // CraftBukkit end - if (astring.length < 1) { - throw new ExceptionUsage("commands.debug.usage", new Object[0]); -@@ -146,7 +145,7 @@ public class CommandDebug extends CommandAbstract { - return astring[(int) (System.nanoTime() % (long) astring.length)]; - } catch (Throwable throwable) { - return "Witty comment unavailable :("; -- } -+ }*/ // Paper - } - - public List tabComplete(MinecraftServer minecraftserver, ICommandListener icommandlistener, String[] astring, @Nullable BlockPosition blockposition) { -diff --git a/src/main/java/net/minecraft/server/MethodProfiler.java b/src/main/java/net/minecraft/server/MethodProfiler.java -index 480e2ca97..a76d50723 100644 ---- a/src/main/java/net/minecraft/server/MethodProfiler.java -+++ b/src/main/java/net/minecraft/server/MethodProfiler.java -@@ -11,7 +11,31 @@ import java.util.function.Supplier; - import org.apache.logging.log4j.LogManager; - import org.apache.logging.log4j.Logger; - -+// Paper - Remove this system - we have a more efficient Timings system - public class MethodProfiler { -+ public boolean a; -+ -+ MethodProfiler() {} -+ -+ public final void a() {} -+ -+ public final void a(String s) {} -+ -+ public void a(Supplier supplier) {} -+ -+ public final void b() {} -+ -+ public List b(String s) { -+ return Collections.emptyList(); -+ } -+ -+ public final void c(String s) {} -+ -+ public final String c() { -+ return "[DISABLED]"; -+ } -+/* -+class MethodProfiler { - - public static final boolean ENABLED = Boolean.getBoolean("enableDebugMethodProfiler"); // CraftBukkit - disable unless specified in JVM arguments - private static final Logger b = LogManager.getLogger(); -@@ -149,6 +173,7 @@ public class MethodProfiler { - if (!ENABLED) return "[DISABLED]"; // CraftBukkit - return this.c.isEmpty() ? "[UNKNOWN]" : (String) this.c.get(this.c.size() - 1); - } -+*/ - - public static final class ProfilerInfo implements Comparable { - --- -2.16.1 - diff --git a/Spigot-Server-Patches/0198-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch b/Spigot-Server-Patches/0197-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch similarity index 92% rename from Spigot-Server-Patches/0198-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch rename to Spigot-Server-Patches/0197-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch index 210bba2e21..fcfd2c5274 100644 --- a/Spigot-Server-Patches/0198-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch +++ b/Spigot-Server-Patches/0197-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch @@ -1,11 +1,11 @@ -From fa1c8f839892e9c574684d25588f1455a0f6ec7f Mon Sep 17 00:00:00 2001 +From 394ab9e7cb86fd104b5058737e73b0a476f0f251 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 23 Jan 2017 15:10:25 -0600 Subject: [PATCH] Do not allow a zero max height in BiomeJungle diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java -index 8f67cb36c..8dc0b6238 100644 +index 8f67cb36..8dc0b623 100644 --- a/src/main/java/net/minecraft/server/BiomeJungle.java +++ b/src/main/java/net/minecraft/server/BiomeJungle.java @@ -40,7 +40,11 @@ public class BiomeJungle extends BiomeBase { @@ -22,7 +22,7 @@ index 8f67cb36c..8dc0b6238 100644 (new WorldGenMelon()).generate(world, random, blockposition.a(i, k, j)); WorldGenVines worldgenvines = new WorldGenVines(); diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 6a0b3a62d..38a7af58c 100644 +index 6a0b3a62..38a7af58 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -42,6 +42,7 @@ public class BlockPosition extends BaseBlockPosition { @@ -34,5 +34,5 @@ index 6a0b3a62d..38a7af58c 100644 return d0 == 0.0D && d1 == 0.0D && d2 == 0.0D ? this : new BlockPosition((double) this.getX() + d0, (double) this.getY() + d1, (double) this.getZ() + d2); } -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0199-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0198-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 96% rename from Spigot-Server-Patches/0199-Remove-CraftScheduler-Async-Task-Debugger.patch rename to Spigot-Server-Patches/0198-Remove-CraftScheduler-Async-Task-Debugger.patch index 9725de493b..1ec8d56424 100644 --- a/Spigot-Server-Patches/0199-Remove-CraftScheduler-Async-Task-Debugger.patch +++ b/Spigot-Server-Patches/0198-Remove-CraftScheduler-Async-Task-Debugger.patch @@ -1,4 +1,4 @@ -From 06e0c2047f0e86e7ca6f80a588f2698df7e75d22 Mon Sep 17 00:00:00 2001 +From 52882fe0e3db0ad65c6f46e7902d9b570db2ccac Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 5 Feb 2017 00:04:04 -0500 Subject: [PATCH] Remove CraftScheduler Async Task Debugger @@ -9,7 +9,7 @@ One report of a suspected memory leak with the system. This adds additional overhead to asynchronous task dispatching diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index bce411288..e47f4cca2 100644 +index 200d1ee7..cc4a256c 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -80,8 +80,8 @@ public class CraftScheduler implements BukkitScheduler { @@ -58,5 +58,5 @@ index bce411288..e47f4cca2 100644 @Deprecated -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0200-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0199-Shame-on-you-Mojang.patch similarity index 95% rename from Spigot-Server-Patches/0200-Shame-on-you-Mojang.patch rename to Spigot-Server-Patches/0199-Shame-on-you-Mojang.patch index cd23789bdf..76144e5333 100644 --- a/Spigot-Server-Patches/0200-Shame-on-you-Mojang.patch +++ b/Spigot-Server-Patches/0199-Shame-on-you-Mojang.patch @@ -1,4 +1,4 @@ -From 4d09624b3f9bfda502cf181485092be9ba875a0d Mon Sep 17 00:00:00 2001 +From 813194e55444cb2fefefe306c24a11d3ac72cc87 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 5 Feb 2017 19:17:28 -0500 Subject: [PATCH] Shame on you Mojang @@ -12,7 +12,7 @@ This then triggers async chunk loads! What in the hell were you thinking? diff --git a/src/main/java/net/minecraft/server/BlockBeacon.java b/src/main/java/net/minecraft/server/BlockBeacon.java -index f07ac0186..21075974d 100644 +index f07ac018..21075974 100644 --- a/src/main/java/net/minecraft/server/BlockBeacon.java +++ b/src/main/java/net/minecraft/server/BlockBeacon.java @@ -62,8 +62,8 @@ public class BlockBeacon extends BlockTileEntity { @@ -55,5 +55,5 @@ index f07ac0186..21075974d 100644 } } -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0201-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0200-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch similarity index 91% rename from Spigot-Server-Patches/0201-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch rename to Spigot-Server-Patches/0200-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch index fa92c50e2b..e863eb34ca 100644 --- a/Spigot-Server-Patches/0201-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch +++ b/Spigot-Server-Patches/0200-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch @@ -1,11 +1,11 @@ -From 8b31487b02eb4c83a7a448e570b95920ba0fce98 Mon Sep 17 00:00:00 2001 +From 43c02c779f0499de08651113c1d4cc3228f370fd Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 7 Feb 2017 16:55:35 -0600 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 73554a518..2558ba8c3 100644 +index 73554a51..2558ba8c 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -325,7 +325,7 @@ public class ChunkProviderServer implements IChunkProvider { @@ -18,5 +18,5 @@ index 73554a518..2558ba8c3 100644 Iterator iterator = this.unloadQueue.iterator(); -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0202-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0201-Do-not-let-armorstands-drown.patch similarity index 92% rename from Spigot-Server-Patches/0202-Do-not-let-armorstands-drown.patch rename to Spigot-Server-Patches/0201-Do-not-let-armorstands-drown.patch index 91bb4dc71f..15dc57541d 100644 --- a/Spigot-Server-Patches/0202-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0201-Do-not-let-armorstands-drown.patch @@ -1,11 +1,11 @@ -From 32462fe122bceb27d35a68cfae1e43abf1f5b15f Mon Sep 17 00:00:00 2001 +From 31b46597044bfba5497b3f6aab5b21642cad5612 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 18 Feb 2017 19:29:58 -0600 Subject: [PATCH] Do not let armorstands drown diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index ee3d37a71..df0d66ad0 100644 +index ee3d37a7..df0d66ad 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -779,5 +779,10 @@ public class EntityArmorStand extends EntityLiving { @@ -20,7 +20,7 @@ index ee3d37a71..df0d66ad0 100644 // Paper end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 6829f8f9c..4e7cf5de6 100644 +index adb04593..aa4c23a1 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -195,6 +195,7 @@ public abstract class EntityLiving extends Entity { @@ -41,5 +41,5 @@ index 6829f8f9c..4e7cf5de6 100644 if (this.getAirTicks() == -20) { this.setAirTicks(0); -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0203-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch b/Spigot-Server-Patches/0202-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch similarity index 90% rename from Spigot-Server-Patches/0203-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch rename to Spigot-Server-Patches/0202-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch index 5eaa7e6097..41da0adfff 100644 --- a/Spigot-Server-Patches/0203-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch +++ b/Spigot-Server-Patches/0202-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch @@ -1,4 +1,4 @@ -From ed42fa5362cb89e856e137f264bd18318ea3631e Mon Sep 17 00:00:00 2001 +From 48ad7625f43d7fd2a6856e321c5ae439372a2d9c Mon Sep 17 00:00:00 2001 From: kashike Date: Sun, 9 Apr 2017 23:50:15 -0700 Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack @@ -6,7 +6,7 @@ Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack Thanks @gabizou diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 9465f4c16..52cb34abd 100644 +index 9465f4c1..52cb34ab 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -119,7 +119,7 @@ public final class ItemStack { @@ -19,5 +19,5 @@ index 9465f4c16..52cb34abd 100644 // CraftBukkit start - Route through setData for filtering // this.damage = Math.max(0, nbttagcompound.getShort("Damage")); -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0204-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0203-Properly-handle-async-calls-to-restart-the-server.patch similarity index 98% rename from Spigot-Server-Patches/0204-Properly-handle-async-calls-to-restart-the-server.patch rename to Spigot-Server-Patches/0203-Properly-handle-async-calls-to-restart-the-server.patch index d5c2fcc6fe..9cf8975088 100644 --- a/Spigot-Server-Patches/0204-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0203-Properly-handle-async-calls-to-restart-the-server.patch @@ -1,4 +1,4 @@ -From db841e9eb293958d9c9a79807a6e421294cabda1 Mon Sep 17 00:00:00 2001 +From fa9d2a8159458408c68c6b1b56f12ae0a590e66b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 12 May 2017 23:34:11 -0500 Subject: [PATCH] Properly handle async calls to restart the server @@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result in corruption/dataloss. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 13c6b5ccd..908a5d273 100644 +index 13c6b5cc..908a5d27 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -71,6 +71,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -78,7 +78,7 @@ index 13c6b5ccd..908a5d273 100644 return this.serverThread; } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 054483a73..fbbb4e73c 100644 +index 054483a7..fbbb4e73 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1378,10 +1378,15 @@ public abstract class PlayerList { @@ -107,7 +107,7 @@ index 054483a73..fbbb4e73c 100644 // CraftBukkit start public void sendMessage(IChatBaseComponent[] iChatBaseComponents) { diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java -index 947c43a5d..f15fd9f37 100644 +index 947c43a5..f15fd9f3 100644 --- a/src/main/java/org/spigotmc/RestartCommand.java +++ b/src/main/java/org/spigotmc/RestartCommand.java @@ -46,88 +46,123 @@ public class RestartCommand extends Command @@ -306,5 +306,5 @@ index 947c43a5d..f15fd9f37 100644 } } -- -2.16.3 +2.14.3 diff --git a/Spigot-Server-Patches/0205-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0204-Add-system-property-to-disable-book-size-limits.patch similarity index 96% rename from Spigot-Server-Patches/0205-Add-system-property-to-disable-book-size-limits.patch rename to Spigot-Server-Patches/0204-Add-system-property-to-disable-book-size-limits.patch index 5a17aeec9d..88530f02af 100644 --- a/Spigot-Server-Patches/0205-Add-system-property-to-disable-book-size-limits.patch +++ b/Spigot-Server-Patches/0204-Add-system-property-to-disable-book-size-limits.patch @@ -1,4 +1,4 @@ -From 44354be7cfc0c47083784dceeac767eaaeabd525 Mon Sep 17 00:00:00 2001 +From 164188358ca9ad1cb4a0769c211922fe5d92ab07 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 13 May 2017 20:11:21 -0500 Subject: [PATCH] Add system property to disable book size limits @@ -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 6fab8cd17..d8684eed4 100644 +index 6fab8cd1..d8684eed 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java @@ -40,6 +40,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { @@ -57,5 +57,5 @@ index 6fab8cd17..d8684eed4 100644 } -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0206-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0205-Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 94% rename from Spigot-Server-Patches/0206-Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to Spigot-Server-Patches/0205-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index e24015f040..cc510877cd 100644 --- a/Spigot-Server-Patches/0206-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/Spigot-Server-Patches/0205-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -1,4 +1,4 @@ -From 11ca5b04707c3fdbb26a30fdd80c74db844da97d Mon Sep 17 00:00:00 2001 +From ebbbd57bf2397064370febaf38071d5e5d21f868 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 16 May 2017 21:29:08 -0500 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement @@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release. To be converted into a Paper-API event at some point in the future? diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3ba465305..79b12a6e9 100644 +index 3ba46530..79b12a6e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -414,4 +414,10 @@ public class PaperWorldConfig { @@ -26,7 +26,7 @@ index 3ba465305..79b12a6e9 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 0f1d99636..9cda8a177 100644 +index 0f1d9963..9cda8a17 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -399,7 +399,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -39,7 +39,7 @@ index 0f1d99636..9cda8a177 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 2367ff1f0..9c8828ebd 100644 +index 9abc9852..3104fc0e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1514,6 +1514,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -57,5 +57,5 @@ index 2367ff1f0..9c8828ebd 100644 case STOP_SNEAKING: -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0207-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0206-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 91% rename from Spigot-Server-Patches/0207-Add-configuration-option-to-prevent-player-names-fro.patch rename to Spigot-Server-Patches/0206-Add-configuration-option-to-prevent-player-names-fro.patch index 05c09165c5..23b1184e2d 100644 --- a/Spigot-Server-Patches/0207-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-Server-Patches/0206-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From 92072faa8f876e43559b99eb36df6767dae5369e Mon Sep 17 00:00:00 2001 +From bc818c7595edb2ea72a1fb84bd4ecfb1a623a92b Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 9 Jun 2017 07:24:34 -0700 Subject: [PATCH] Add configuration option to prevent player names from being @@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index ea6fcb39f..dbafef023 100644 +index ea6fcb39..dbafef02 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -271,4 +271,9 @@ public class PaperConfig { @@ -20,7 +20,7 @@ index ea6fcb39f..dbafef023 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 41357cb0e..27c6caddc 100644 +index 41357cb0..27c6cadd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1908,5 +1908,10 @@ public final class CraftServer implements Server { @@ -35,5 +35,5 @@ index 41357cb0e..27c6caddc 100644 // Paper end } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0208-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0207-Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 98% rename from Spigot-Server-Patches/0208-Use-TerminalConsoleAppender-for-console-improvements.patch rename to Spigot-Server-Patches/0207-Use-TerminalConsoleAppender-for-console-improvements.patch index a04e5e3ad9..944b78e3f4 100644 --- a/Spigot-Server-Patches/0208-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0207-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -1,4 +1,4 @@ -From 94cf8c9a8de4ab8d0762cdd45f647b38bac61000 Mon Sep 17 00:00:00 2001 +From 07c93a8dc027e8dbe591f476f6bcb2a134bab7a7 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 9 Jun 2017 19:03:43 +0200 Subject: [PATCH] Use TerminalConsoleAppender for console improvements @@ -20,7 +20,7 @@ Other changes: configuration diff --git a/pom.xml b/pom.xml -index 5d9f71b1d..da69bb93f 100644 +index 5d9f71b1..da69bb93 100644 --- a/pom.xml +++ b/pom.xml @@ -53,12 +53,6 @@ @@ -90,7 +90,7 @@ index 5d9f71b1d..da69bb93f 100644 org.apache.maven.plugins diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java new file mode 100644 -index 000000000..685deaa0e +index 00000000..685deaa0 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java @@ -0,0 +1,17 @@ @@ -113,7 +113,7 @@ index 000000000..685deaa0e +} diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java new file mode 100644 -index 000000000..d5bc61490 +index 00000000..d5bc6149 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java @@ -0,0 +1,60 @@ @@ -178,7 +178,7 @@ index 000000000..d5bc61490 + +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 8f2afcc32..b3f1aa999 100644 +index 8f2afcc3..b3f1aa99 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -73,7 +73,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -231,7 +231,7 @@ index 8f2afcc32..b3f1aa999 100644 System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true)); System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true)); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 908a5d273..e8bddc171 100644 +index 908a5d27..e8bddc17 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -42,7 +42,6 @@ import org.apache.commons.lang3.Validate; @@ -290,7 +290,7 @@ index 908a5d273..e8bddc171 100644 public boolean a(int i, String s) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 6c34f858c..563b0fb12 100644 +index fbbb4e73..15af94b3 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -78,8 +78,7 @@ public abstract class PlayerList { @@ -304,7 +304,7 @@ index 6c34f858c..563b0fb12 100644 this.k = new GameProfileBanList(PlayerList.a); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 27c6caddc..539f492e0 100644 +index 27c6cadd..539f492e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -128,7 +128,6 @@ import io.netty.buffer.ByteBuf; @@ -330,7 +330,7 @@ index 27c6caddc..539f492e0 100644 @Override public PluginCommand getPluginCommand(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index ec9508e90..d3d848f8c 100644 +index ec9508e9..d3d848f8 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -14,7 +14,7 @@ import java.util.logging.Logger; @@ -372,7 +372,7 @@ index ec9508e90..d3d848f8c 100644 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java deleted file mode 100644 -index 26a2fb894..000000000 +index 26a2fb89..00000000 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java +++ /dev/null @@ -1,74 +0,0 @@ @@ -451,7 +451,7 @@ index 26a2fb894..000000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java -index 33e8ea02c..1e3aae3b8 100644 +index 33e8ea02..1e3aae3b 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java @@ -8,17 +8,27 @@ import java.util.logging.Level; @@ -530,7 +530,7 @@ index 33e8ea02c..1e3aae3b8 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java -index 984df4083..bbb5a84f3 100644 +index 984df408..bbb5a84f 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java @@ -20,7 +20,7 @@ public class ServerShutdownThread extends Thread { @@ -544,7 +544,7 @@ index 984df4083..bbb5a84f3 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java deleted file mode 100644 -index b64097113..000000000 +index b6409711..00000000 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java +++ /dev/null @@ -1,54 +0,0 @@ @@ -603,7 +603,7 @@ index b64097113..000000000 - } -} diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 5cee8f00e..08b6bb7f9 100644 +index 5cee8f00..08b6bb7f 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -1,12 +1,11 @@ @@ -633,5 +633,5 @@ index 5cee8f00e..08b6bb7f9 100644 -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0209-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0208-provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 92% rename from Spigot-Server-Patches/0209-provide-a-configurable-option-to-disable-creeper-lin.patch rename to Spigot-Server-Patches/0208-provide-a-configurable-option-to-disable-creeper-lin.patch index 561fa7e759..1a8eb54d62 100644 --- a/Spigot-Server-Patches/0209-provide-a-configurable-option-to-disable-creeper-lin.patch +++ b/Spigot-Server-Patches/0208-provide-a-configurable-option-to-disable-creeper-lin.patch @@ -1,4 +1,4 @@ -From 163dadb9811b049e78caefbeeb5bdf57235d0e35 Mon Sep 17 00:00:00 2001 +From a734bec584fc7eb12b44e35c5693392f9df1e57e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Jun 2017 21:01:18 +0100 Subject: [PATCH] provide a configurable option to disable creeper lingering @@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 79b12a6e9..7802cc1f4 100644 +index 79b12a6e..7802cc1f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -420,4 +420,10 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 79b12a6e9..7802cc1f4 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index c872607fc..8098d4d9f 100644 +index c872607f..8098d4d9 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -222,7 +222,7 @@ public class EntityCreeper extends EntityMonster { @@ -34,5 +34,5 @@ index c872607fc..8098d4d9f 100644 entityareaeffectcloud.setSource(this); // CraftBukkit -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0210-Item-canEntityPickup.patch b/Spigot-Server-Patches/0209-Item-canEntityPickup.patch similarity index 92% rename from Spigot-Server-Patches/0210-Item-canEntityPickup.patch rename to Spigot-Server-Patches/0209-Item-canEntityPickup.patch index a0a52604a4..7c05f76807 100644 --- a/Spigot-Server-Patches/0210-Item-canEntityPickup.patch +++ b/Spigot-Server-Patches/0209-Item-canEntityPickup.patch @@ -1,11 +1,11 @@ -From 6e8a4f5f1b65d1146871827983d0cec19b615db9 Mon Sep 17 00:00:00 2001 +From b03021584a918c0fd7ad5ae659da9f53a2ea21dd Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 5 May 2017 03:57:17 -0500 Subject: [PATCH] Item#canEntityPickup diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 5ea9f3097..89e878365 100644 +index 5ea9f309..89e87836 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -514,6 +514,12 @@ public abstract class EntityInsentient extends EntityLiving { @@ -22,7 +22,7 @@ index 5ea9f3097..89e878365 100644 this.a(entityitem); } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 6593fc633..99dbb1393 100644 +index 6593fc63..99dbb139 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -22,6 +22,7 @@ public class EntityItem extends Entity implements HopperPusher { @@ -34,7 +34,7 @@ index 6593fc633..99dbb1393 100644 private String g; private String h; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -index a17a537d6..1df17f09b 100644 +index a17a537d..1df17f09 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java @@ -37,6 +37,16 @@ public class CraftItem extends CraftEntity implements Item { @@ -55,5 +55,5 @@ index a17a537d6..1df17f09b 100644 public String toString() { return "CraftItem"; -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0211-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0210-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 95% rename from Spigot-Server-Patches/0211-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to Spigot-Server-Patches/0210-PlayerPickupItemEvent-setFlyAtPlayer.patch index 23c7515748..8acaf986bb 100644 --- a/Spigot-Server-Patches/0211-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-Server-Patches/0210-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,11 +1,11 @@ -From 1e8be13e9b43dfc3a65c2ee2ba9e58b01b415083 Mon Sep 17 00:00:00 2001 +From 32dbe9a6e036ce0b9481cd58393dd0f533835ac4 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 May 2017 06:26:09 -0500 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 99dbb1393..ae4910b4b 100644 +index 99dbb139..ae4910b4 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -332,6 +332,7 @@ public class EntityItem extends Entity implements HopperPusher { @@ -44,5 +44,5 @@ index 99dbb1393..ae4910b4b 100644 this.die(); itemstack.setCount(i); -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0212-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0211-PlayerAttemptPickupItemEvent.patch similarity index 94% rename from Spigot-Server-Patches/0212-PlayerAttemptPickupItemEvent.patch rename to Spigot-Server-Patches/0211-PlayerAttemptPickupItemEvent.patch index 27b84eca91..7597230170 100644 --- a/Spigot-Server-Patches/0212-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-Server-Patches/0211-PlayerAttemptPickupItemEvent.patch @@ -1,11 +1,11 @@ -From 71201da7cbe09745d06d37bf47bb1d23a1686249 Mon Sep 17 00:00:00 2001 +From 8a9c03adf99ca8e4f43009560601ab56346fd67b Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 11 Jun 2017 16:30:30 -0500 Subject: [PATCH] PlayerAttemptPickupItemEvent diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index ae4910b4b..0b7fc327f 100644 +index ae4910b4..0b7fc327 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -8,6 +8,7 @@ import org.apache.logging.log4j.Logger; @@ -40,5 +40,5 @@ index ae4910b4b..0b7fc327f 100644 itemstack.setCount(canHold); // Call legacy event -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0213-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0212-Add-UnknownCommandEvent.patch similarity index 93% rename from Spigot-Server-Patches/0213-Add-UnknownCommandEvent.patch rename to Spigot-Server-Patches/0212-Add-UnknownCommandEvent.patch index 392b4130cf..7b2d443b79 100644 --- a/Spigot-Server-Patches/0213-Add-UnknownCommandEvent.patch +++ b/Spigot-Server-Patches/0212-Add-UnknownCommandEvent.patch @@ -1,11 +1,11 @@ -From dcf6d346b92839c6bdbb430995cc6217878faa4f Mon Sep 17 00:00:00 2001 +From b8b8a1100adb5e0a6a350c437b0e3f6a7e43f95d Mon Sep 17 00:00:00 2001 From: Sweepyoface Date: Sat, 17 Jun 2017 18:48:21 -0400 Subject: [PATCH] Add UnknownCommandEvent diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index fa831dc8f..8d0a9e8ca 100644 +index 539f492e..77c16fe2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -78,6 +78,7 @@ import org.bukkit.craftbukkit.util.Versioning; @@ -32,5 +32,5 @@ index fa831dc8f..8d0a9e8ca 100644 // Spigot end -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0214-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0213-Basic-PlayerProfile-API.patch similarity index 98% rename from Spigot-Server-Patches/0214-Basic-PlayerProfile-API.patch rename to Spigot-Server-Patches/0213-Basic-PlayerProfile-API.patch index c5ea678bb1..3c8e47be7f 100644 --- a/Spigot-Server-Patches/0214-Basic-PlayerProfile-API.patch +++ b/Spigot-Server-Patches/0213-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From dcdadafa3574152be245d8ebdad7d666a12006c1 Mon Sep 17 00:00:00 2001 +From 8660aebe21b1e188d8657e726f5e5e9c3baa136e Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 22:11:48 -0500 Subject: [PATCH] Basic PlayerProfile API @@ -6,7 +6,7 @@ Subject: [PATCH] Basic PlayerProfile API diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java new file mode 100644 -index 000000000..8cc85be8f +index 00000000..8cc85be8 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java @@ -0,0 +1,276 @@ @@ -287,7 +287,7 @@ index 000000000..8cc85be8f + } +} diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 02940d697..4539b5601 100644 +index 02940d69..4539b560 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -1,6 +1,9 @@ @@ -312,7 +312,7 @@ index 02940d697..4539b5601 100644 * Calculates distance between 2 entities * @param e1 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e8bddc171..3b01ebd96 100644 +index e8bddc17..3b01ebd9 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1538,6 +1538,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -324,7 +324,7 @@ index e8bddc171..3b01ebd96 100644 return this.W; } diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index 7ce08eb8b..6a750c25e 100644 +index 7ce08eb8..6a750c25 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -44,7 +44,7 @@ public class UserCache { @@ -360,7 +360,7 @@ index 7ce08eb8b..6a750c25e 100644 private UserCacheEntry(GameProfile gameprofile, Date date) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 77c16fe2c..2dd7ed96a 100644 +index 77c16fe2..2dd7ed96 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -135,6 +135,10 @@ import org.bukkit.craftbukkit.util.CraftNamespacedKey; @@ -397,5 +397,5 @@ index 77c16fe2c..2dd7ed96a 100644 // Paper end } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0215-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0214-Shoulder-Entities-Release-API.patch similarity index 96% rename from Spigot-Server-Patches/0215-Shoulder-Entities-Release-API.patch rename to Spigot-Server-Patches/0214-Shoulder-Entities-Release-API.patch index d082889a7b..ed48d4daba 100644 --- a/Spigot-Server-Patches/0215-Shoulder-Entities-Release-API.patch +++ b/Spigot-Server-Patches/0214-Shoulder-Entities-Release-API.patch @@ -1,11 +1,11 @@ -From 8a2456fdcb912d83beea339b4614c3be96526570 Mon Sep 17 00:00:00 2001 +From 20a3ba600feed3c199f6419f5884f8086c488a6f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 15:18:30 -0400 Subject: [PATCH] Shoulder Entities Release API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 9cda8a177..deb0f4a9c 100644 +index 9cda8a17..deb0f4a9 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1721,21 +1721,48 @@ public abstract class EntityHuman extends EntityLiving { @@ -62,7 +62,7 @@ index 9cda8a177..deb0f4a9c 100644 public abstract boolean isSpectator(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index a54548f02..a0128426f 100644 +index a54548f0..a0128426 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -444,6 +444,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -99,5 +99,5 @@ index a54548f02..a0128426f 100644 public org.bukkit.entity.Entity getShoulderEntityLeft() { if (!getHandle().getShoulderEntityLeft().isEmpty()) { -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0216-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0215-Profile-Lookup-Events.patch similarity index 97% rename from Spigot-Server-Patches/0216-Profile-Lookup-Events.patch rename to Spigot-Server-Patches/0215-Profile-Lookup-Events.patch index d98751c49e..57913022d7 100644 --- a/Spigot-Server-Patches/0216-Profile-Lookup-Events.patch +++ b/Spigot-Server-Patches/0215-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From c1c4f93d153d0a7aa37b28b7d937bae85bd19bdd Mon Sep 17 00:00:00 2001 +From bc59867ea93608a0e6e541d286b76d8579ab3df7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 17:00:32 -0400 Subject: [PATCH] Profile Lookup Events @@ -8,7 +8,7 @@ profiles that had to be looked up. diff --git a/src/main/java/com/destroystokyo/paper/profile/WrappedGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/WrappedGameProfileRepository.java new file mode 100644 -index 000000000..bffba6a65 +index 00000000..bffba6a6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/WrappedGameProfileRepository.java @@ -0,0 +1,70 @@ @@ -83,7 +83,7 @@ index 000000000..bffba6a65 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e8bddc171..6159cf4c0 100644 +index 3b01ebd9..85b9ac98 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1021,6 +1021,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -95,5 +95,5 @@ index e8bddc171..6159cf4c0 100644 final DedicatedServer dedicatedserver = new DedicatedServer(options, DataConverterRegistry.a(), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, usercache); -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0217-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0216-Block-player-logins-during-server-shutdown.patch similarity index 90% rename from Spigot-Server-Patches/0217-Block-player-logins-during-server-shutdown.patch rename to Spigot-Server-Patches/0216-Block-player-logins-during-server-shutdown.patch index 57df0d2fb3..ffbf17d855 100644 --- a/Spigot-Server-Patches/0217-Block-player-logins-during-server-shutdown.patch +++ b/Spigot-Server-Patches/0216-Block-player-logins-during-server-shutdown.patch @@ -1,11 +1,11 @@ -From 612c97646db6fb6ae5f1e04d0608999378901668 Mon Sep 17 00:00:00 2001 +From c7ed96698d32b583244d6e2cb2b511c53f0f413a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 2 Jul 2017 21:35:56 -0500 Subject: [PATCH] Block player logins during server shutdown diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 2158fcd32..c5434e6ba 100644 +index 2158fcd3..c5434e6b 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -53,6 +53,12 @@ public class LoginListener implements PacketLoginInListener, ITickable { @@ -22,5 +22,5 @@ index 2158fcd32..c5434e6ba 100644 this.b(); } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) { -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0218-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0217-Entity-fromMobSpawner.patch similarity index 94% rename from Spigot-Server-Patches/0218-Entity-fromMobSpawner.patch rename to Spigot-Server-Patches/0217-Entity-fromMobSpawner.patch index 39f9a91af7..e0993e1baf 100644 --- a/Spigot-Server-Patches/0218-Entity-fromMobSpawner.patch +++ b/Spigot-Server-Patches/0217-Entity-fromMobSpawner.patch @@ -1,11 +1,11 @@ -From 02fc93e13edbb0732f1c96cf475498644a2e4e83 Mon Sep 17 00:00:00 2001 +From f19c6cf608e13d6fe8e7e031b89651436b695518 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 18 Jun 2017 18:17:05 -0500 Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index a5ed651dd..58fe1aa3e 100644 +index a5ed651d..58fe1aa3 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -170,6 +170,7 @@ public abstract class Entity implements ICommandListener { @@ -37,7 +37,7 @@ index a5ed651dd..58fe1aa3e 100644 } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index a5261d70b..1ed0def1e 100644 +index a5261d70..1ed0def1 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -107,6 +107,7 @@ public abstract class MobSpawnerAbstract { @@ -49,7 +49,7 @@ index a5261d70b..1ed0def1e 100644 if ( entity.world.spigotConfig.nerfSpawnerMobs ) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 14df5ff0d..1571e4eb5 100644 +index 14df5ff0..1571e4eb 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -793,5 +793,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -64,5 +64,5 @@ index 14df5ff0d..1571e4eb5 100644 // Paper end } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0219-Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/0218-Fix-Anvil-Level-sync-to-client.patch similarity index 93% rename from Spigot-Server-Patches/0219-Fix-Anvil-Level-sync-to-client.patch rename to Spigot-Server-Patches/0218-Fix-Anvil-Level-sync-to-client.patch index f1f6bb6ea6..5de15bb37e 100644 --- a/Spigot-Server-Patches/0219-Fix-Anvil-Level-sync-to-client.patch +++ b/Spigot-Server-Patches/0218-Fix-Anvil-Level-sync-to-client.patch @@ -1,4 +1,4 @@ -From a1b3f0d72d6a2bcd932ca516d96d1075f5ed1f6a Mon Sep 17 00:00:00 2001 +From 050a2e794129a5d4ed1847e2d30441322e074197 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 11 Jul 2017 23:17:57 -0400 Subject: [PATCH] Fix Anvil Level sync to client @@ -10,7 +10,7 @@ Was done incorrectly and is now causing level desyncs to client. Always send current level to the client, and instead make setWindowProperty set the level. diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java -index 175753c5a..16ec67569 100644 +index 175753c5..16ec6756 100644 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java @@ -376,9 +376,9 @@ public class ContainerAnvil extends Container { @@ -26,7 +26,7 @@ index 175753c5a..16ec67569 100644 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 -index a9186b77a..1269a02aa 100644 +index a9186b77..1269a02a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1328,6 +1328,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -42,5 +42,5 @@ index a9186b77a..1269a02aa 100644 return true; } -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0220-Add-missing-coverages-for-getTileEntity-in-order-to-.patch b/Spigot-Server-Patches/0219-Add-missing-coverages-for-getTileEntity-in-order-to-.patch similarity index 90% rename from Spigot-Server-Patches/0220-Add-missing-coverages-for-getTileEntity-in-order-to-.patch rename to Spigot-Server-Patches/0219-Add-missing-coverages-for-getTileEntity-in-order-to-.patch index cba9e3e6a5..a4924caa93 100644 --- a/Spigot-Server-Patches/0220-Add-missing-coverages-for-getTileEntity-in-order-to-.patch +++ b/Spigot-Server-Patches/0219-Add-missing-coverages-for-getTileEntity-in-order-to-.patch @@ -1,4 +1,4 @@ -From 72dee9e52b8ac496dcfcd504ed65d40ce6dcf273 Mon Sep 17 00:00:00 2001 +From 6445da8529404c4cd75d3f6fb3db54bb084166b7 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 22 Jul 2017 15:22:59 +0100 Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 2ac5caaa4..c03be509f 100644 +index 2ac5caaa..c03be509 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -235,6 +235,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -24,5 +24,5 @@ index 2ac5caaa4..c03be509f 100644 return result; } -- -2.16.1 +2.14.3 diff --git a/Spigot-Server-Patches/0221-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0220-Improve-the-Saddle-API-for-Horses.patch similarity index 94% rename from Spigot-Server-Patches/0221-Improve-the-Saddle-API-for-Horses.patch rename to Spigot-Server-Patches/0220-Improve-the-Saddle-API-for-Horses.patch index 81286f8787..1976aad2f7 100644 --- a/Spigot-Server-Patches/0221-Improve-the-Saddle-API-for-Horses.patch +++ b/Spigot-Server-Patches/0220-Improve-the-Saddle-API-for-Horses.patch @@ -1,4 +1,4 @@ -From efd42e114eb71c2be0d86ead30021912f824eeb6 Mon Sep 17 00:00:00 2001 +From 74e1dfd74867073c9afff75f279f5effa837d0b3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Dec 2016 16:24:06 -0500 Subject: [PATCH] Improve the Saddle API for Horses @@ -7,7 +7,7 @@ Not all horses with Saddles have armor. This lets us break up the horses with sa and access their saddle state separately from an interface shared with Armor. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java -index 14d041680..e56bef334 100644 +index 14d04168..e56bef33 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java @@ -6,6 +6,7 @@ import net.minecraft.server.EntityHorseAbstract; @@ -27,7 +27,7 @@ index 14d041680..e56bef334 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java -index 173818e68..2f6852404 100644 +index 173818e6..2f685240 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java @@ -4,7 +4,7 @@ import net.minecraft.server.IInventory; @@ -41,7 +41,7 @@ index 173818e68..2f6852404 100644 super(inventory); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java new file mode 100644 -index 000000000..99cfbaf90 +index 00000000..99cfbaf9 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java @@ -0,0 +1,15 @@ @@ -61,5 +61,5 @@ index 000000000..99cfbaf90 + +} -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0222-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0221-Implement-ensureServerConversions-API.patch similarity index 90% rename from Spigot-Server-Patches/0222-Implement-ensureServerConversions-API.patch rename to Spigot-Server-Patches/0221-Implement-ensureServerConversions-API.patch index d143d966b7..75c6afb2ce 100644 --- a/Spigot-Server-Patches/0222-Implement-ensureServerConversions-API.patch +++ b/Spigot-Server-Patches/0221-Implement-ensureServerConversions-API.patch @@ -1,4 +1,4 @@ -From fe7ce33993d440e9c76081fc200f7ec485585577 Mon Sep 17 00:00:00 2001 +From 953a933ae57f5f8b5fbdb0148af7f7ee9d84f4ef Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 22:43:12 -0400 Subject: [PATCH] Implement ensureServerConversions API @@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr to ensure it meets latest minecraft expectations. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 49ebad22e..eb6987338 100644 +index 49ebad22..eb698733 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -194,4 +194,11 @@ public final class CraftItemFactory implements ItemFactory { @@ -23,5 +23,5 @@ index 49ebad22e..eb6987338 100644 + // Paper end } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0223-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0222-Implement-getI18NDisplayName.patch similarity index 92% rename from Spigot-Server-Patches/0223-Implement-getI18NDisplayName.patch rename to Spigot-Server-Patches/0222-Implement-getI18NDisplayName.patch index bb03d79c9a..ddc1dd3212 100644 --- a/Spigot-Server-Patches/0223-Implement-getI18NDisplayName.patch +++ b/Spigot-Server-Patches/0222-Implement-getI18NDisplayName.patch @@ -1,4 +1,4 @@ -From 353af92aee149a9fa8da7be14063da43f482bbad Mon Sep 17 00:00:00 2001 +From 51f002ac4471d23a58b5746bc588dd050a2bcb47 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:59:38 -0400 Subject: [PATCH] Implement getI18NDisplayName @@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this, You must replace the language file embedded in the server jar. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index eb6987338..c2f26577c 100644 +index eb698733..c2f26577 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -200,5 +200,18 @@ public final class CraftItemFactory implements ItemFactory { @@ -31,5 +31,5 @@ index eb6987338..c2f26577c 100644 // Paper end } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0224-GH-806-Respect-saving-disabled-before-unloading-all-.patch b/Spigot-Server-Patches/0223-GH-806-Respect-saving-disabled-before-unloading-all-.patch similarity index 90% rename from Spigot-Server-Patches/0224-GH-806-Respect-saving-disabled-before-unloading-all-.patch rename to Spigot-Server-Patches/0223-GH-806-Respect-saving-disabled-before-unloading-all-.patch index 4556b07624..f5ba13532d 100644 --- a/Spigot-Server-Patches/0224-GH-806-Respect-saving-disabled-before-unloading-all-.patch +++ b/Spigot-Server-Patches/0223-GH-806-Respect-saving-disabled-before-unloading-all-.patch @@ -1,4 +1,4 @@ -From 1704f540314c0ebee0050656bc2bfd1bfa5ca4f0 Mon Sep 17 00:00:00 2001 +From eb4e6e2473ded2b465e7d7fcf510f9aadc4cfe93 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 27 Jul 2017 00:06:43 -0400 Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks @@ -9,7 +9,7 @@ This behavior causes a save to occur even though saving was supposed to be turne It's triggered when Hell/End worlds are empty of players. diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 0b10f1684..4af557321 100644 +index 0b10f168..4af55732 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -220,7 +220,7 @@ public class PlayerChunkMap { @@ -22,5 +22,5 @@ index 0b10f1684..4af557321 100644 } } // Paper timing -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0225-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0224-ProfileWhitelistVerifyEvent.patch similarity index 96% rename from Spigot-Server-Patches/0225-ProfileWhitelistVerifyEvent.patch rename to Spigot-Server-Patches/0224-ProfileWhitelistVerifyEvent.patch index ae65245005..3585369d38 100644 --- a/Spigot-Server-Patches/0225-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-Server-Patches/0224-ProfileWhitelistVerifyEvent.patch @@ -1,11 +1,11 @@ -From 82b87aee30bce50a525a25af11b68edf8725c1cf Mon Sep 17 00:00:00 2001 +From 4c23b0fe27af664d733b1db39eb4804a8d81c38c Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Jul 2017 18:11:10 -0500 Subject: [PATCH] ProfileWhitelistVerifyEvent diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 15af94b3f..1c0c1bd81 100644 +index 15af94b3..1c0c1bd8 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -542,9 +542,9 @@ public abstract class PlayerList { @@ -48,5 +48,5 @@ index 15af94b3f..1c0c1bd81 100644 public boolean isOp(GameProfile gameprofile) { return this.operators.d(gameprofile) || this.server.R() && this.server.worlds.get(0).getWorldData().u() && this.server.Q().equalsIgnoreCase(gameprofile.getName()) || this.u; // CraftBukkit -- -2.16.3 +2.14.3 diff --git a/Spigot-Server-Patches/0226-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0225-Fix-this-stupid-bullshit.patch similarity index 93% rename from Spigot-Server-Patches/0226-Fix-this-stupid-bullshit.patch rename to Spigot-Server-Patches/0225-Fix-this-stupid-bullshit.patch index deb193bf36..d8b02fa8a9 100644 --- a/Spigot-Server-Patches/0226-Fix-this-stupid-bullshit.patch +++ b/Spigot-Server-Patches/0225-Fix-this-stupid-bullshit.patch @@ -1,4 +1,4 @@ -From dd3e82914551cdfbe5cc5c1ade02d05278d7e31b Mon Sep 17 00:00:00 2001 +From 2fa3cd75bba6abd3b22121568acff664bc26c994 Mon Sep 17 00:00:00 2001 From: DemonWav Date: Sun, 6 Aug 2017 17:17:53 -0500 Subject: [PATCH] Fix this stupid bullshit @@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa and to provide some level of hint without being disruptive. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index d3d848f8c..21628e196 100644 +index d3d848f8..21628e19 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -209,10 +209,12 @@ public class Main { @@ -29,5 +29,5 @@ index d3d848f8c..21628e196 100644 } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0227-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0226-Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 88% rename from Spigot-Server-Patches/0227-Ocelot-despawns-should-honor-nametags-and-leash.patch rename to Spigot-Server-Patches/0226-Ocelot-despawns-should-honor-nametags-and-leash.patch index 24bc5bd9a5..e8eb735489 100644 --- a/Spigot-Server-Patches/0227-Ocelot-despawns-should-honor-nametags-and-leash.patch +++ b/Spigot-Server-Patches/0226-Ocelot-despawns-should-honor-nametags-and-leash.patch @@ -1,11 +1,11 @@ -From 403eb99cf2c74d9fee9fad03715624fa76997ea6 Mon Sep 17 00:00:00 2001 +From 4f99b255c13f02401c796105308ab123146ed09b Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:54:40 -0500 Subject: [PATCH] Ocelot despawns should honor nametags and leash diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java -index 5a76821ea..858bbef5b 100644 +index 5a76821e..858bbef5 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -58,7 +58,7 @@ public class EntityOcelot extends EntityTameableAnimal { @@ -18,5 +18,5 @@ index 5a76821ea..858bbef5b 100644 protected void initAttributes() { -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0228-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0227-Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 91% rename from Spigot-Server-Patches/0228-Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to Spigot-Server-Patches/0227-Reset-spawner-timer-when-spawner-event-is-cancelled.patch index d390e870e0..6a023d33ee 100644 --- a/Spigot-Server-Patches/0228-Reset-spawner-timer-when-spawner-event-is-cancelled.patch +++ b/Spigot-Server-Patches/0227-Reset-spawner-timer-when-spawner-event-is-cancelled.patch @@ -1,11 +1,11 @@ -From 2d6f54549cc44458e18bb0c430ffa3528c0cee54 Mon Sep 17 00:00:00 2001 +From bfb645af77354320d1f86b3da34c0c9c92aa495c Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:45:19 -0500 Subject: [PATCH] Reset spawner timer when spawner event is cancelled diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 1ed0def1e..87fe4775f 100644 +index 1ed0def1..87fe4775 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -113,6 +113,9 @@ public abstract class MobSpawnerAbstract { @@ -28,5 +28,5 @@ index 1ed0def1e..87fe4775f 100644 } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0229-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch b/Spigot-Server-Patches/0228-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch similarity index 89% rename from Spigot-Server-Patches/0229-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch rename to Spigot-Server-Patches/0228-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch index 12abf28074..4e7abd94f3 100644 --- a/Spigot-Server-Patches/0229-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch +++ b/Spigot-Server-Patches/0228-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch @@ -1,4 +1,4 @@ -From 6f6d06130c0008bff90b2008873ca6809fb803fc Mon Sep 17 00:00:00 2001 +From 1fde548e4122113c845379d7cbef2e05767b1ca4 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Fri, 11 Aug 2017 03:29:26 +0200 Subject: [PATCH] MC-94186 Fix dragon egg falling in lazy chunks @@ -8,7 +8,7 @@ Fixes falling dragon eggs in lazy chunks fall to the block below the last empty See also https://bugs.mojang.com/browse/MC-94186 diff --git a/src/main/java/net/minecraft/server/BlockDragonEgg.java b/src/main/java/net/minecraft/server/BlockDragonEgg.java -index ce186f825..291342c90 100644 +index ce186f82..291342c9 100644 --- a/src/main/java/net/minecraft/server/BlockDragonEgg.java +++ b/src/main/java/net/minecraft/server/BlockDragonEgg.java @@ -44,7 +44,7 @@ public class BlockDragonEgg extends Block { @@ -21,5 +21,5 @@ index ce186f825..291342c90 100644 } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0230-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0229-Fix-MC-117075-TE-Unload-Lag-Spike.patch similarity index 91% rename from Spigot-Server-Patches/0230-Fix-MC-117075-TE-Unload-Lag-Spike.patch rename to Spigot-Server-Patches/0229-Fix-MC-117075-TE-Unload-Lag-Spike.patch index eae243576a..bbf74bfcb8 100644 --- a/Spigot-Server-Patches/0230-Fix-MC-117075-TE-Unload-Lag-Spike.patch +++ b/Spigot-Server-Patches/0229-Fix-MC-117075-TE-Unload-Lag-Spike.patch @@ -1,11 +1,11 @@ -From 44ca262d4f689d942d058797c586ffd4c99d4028 Mon Sep 17 00:00:00 2001 +From 4f4f5c11402533599513023b147f1b72e53d091a Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 9 Aug 2017 17:51:22 -0500 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b0139fff6..00513d02c 100644 +index b0139fff..00513d02 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1572,7 +1572,11 @@ public abstract class World implements IBlockAccess { @@ -22,5 +22,5 @@ index b0139fff6..00513d02c 100644 this.tileEntityListUnload.clear(); } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0231-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0230-Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 94% rename from Spigot-Server-Patches/0231-Allow-specifying-a-custom-authentication-servers-dow.patch rename to Spigot-Server-Patches/0230-Allow-specifying-a-custom-authentication-servers-dow.patch index 8fb8ee1164..ddfe7c9e25 100644 --- a/Spigot-Server-Patches/0231-Allow-specifying-a-custom-authentication-servers-dow.patch +++ b/Spigot-Server-Patches/0230-Allow-specifying-a-custom-authentication-servers-dow.patch @@ -1,4 +1,4 @@ -From b4539bef0e0f7e9d88337f7e738f41906d939ab1 Mon Sep 17 00:00:00 2001 +From cc4dbb1de0f22f088fbe86a6323b98dbc3227ef3 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 17 Aug 2017 16:08:20 -0700 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick @@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index dbafef023..ec89ecfca 100644 +index dbafef02..ec89ecfc 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -1,5 +1,6 @@ @@ -27,7 +27,7 @@ index dbafef023..ec89ecfca 100644 + } } diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index c5434e6ba..75df92836 100644 +index c5434e6b..75df9283 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -250,6 +250,10 @@ public class LoginListener implements PacketLoginInListener, ITickable { @@ -42,5 +42,5 @@ index c5434e6ba..75df92836 100644 LoginListener.c.error("Couldn\'t verify username because servers are unavailable"); } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0232-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0231-LivingEntity-setKiller.patch similarity index 91% rename from Spigot-Server-Patches/0232-LivingEntity-setKiller.patch rename to Spigot-Server-Patches/0231-LivingEntity-setKiller.patch index 32d2b5b786..3044cf014e 100644 --- a/Spigot-Server-Patches/0232-LivingEntity-setKiller.patch +++ b/Spigot-Server-Patches/0231-LivingEntity-setKiller.patch @@ -1,11 +1,11 @@ -From a3a43308ff532e716ed9c416bc8c437b271e90cf Mon Sep 17 00:00:00 2001 +From a894cdb9a87abbfb870f4448215c61f9355c24db Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:49:48 -0500 Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index d4d51688c..a7b076377 100644 +index d4d51688..a7b07637 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -252,6 +252,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -26,5 +26,5 @@ index d4d51688c..a7b076377 100644 return addPotionEffect(effect, false); } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0233-Avoid-NPE-during-CraftBlockEntityState-load.patch b/Spigot-Server-Patches/0232-Avoid-NPE-during-CraftBlockEntityState-load.patch similarity index 92% rename from Spigot-Server-Patches/0233-Avoid-NPE-during-CraftBlockEntityState-load.patch rename to Spigot-Server-Patches/0232-Avoid-NPE-during-CraftBlockEntityState-load.patch index 484e2030b6..056d598ae9 100644 --- a/Spigot-Server-Patches/0233-Avoid-NPE-during-CraftBlockEntityState-load.patch +++ b/Spigot-Server-Patches/0232-Avoid-NPE-during-CraftBlockEntityState-load.patch @@ -1,11 +1,11 @@ -From 52613fd6e28b47b552e1a2118326de8c45160d46 Mon Sep 17 00:00:00 2001 +From 2ea6eccdaeee514a4896c592c7a3756c1e72da91 Mon Sep 17 00:00:00 2001 From: kashike Date: Mon, 18 Sep 2017 13:38:40 -0700 Subject: [PATCH] Avoid NPE during CraftBlockEntityState load diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 54b719d91..3f2c5b2d5 100644 +index 54b719d9..3f2c5b2d 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -60,7 +60,7 @@ public class TileEntitySign extends TileEntity { @@ -18,7 +18,7 @@ index 54b719d91..3f2c5b2d5 100644 }; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index 266f87d7f..22dcaea72 100644 +index 266f87d7..22dcaea7 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -24,6 +24,7 @@ public class CraftBlockEntityState extends CraftBlockState @@ -38,5 +38,5 @@ index 266f87d7f..22dcaea72 100644 } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0234-Anti-Xray.patch b/Spigot-Server-Patches/0233-Anti-Xray.patch similarity index 98% rename from Spigot-Server-Patches/0234-Anti-Xray.patch rename to Spigot-Server-Patches/0233-Anti-Xray.patch index 4f9eb5ed9e..c3e3a564f5 100644 --- a/Spigot-Server-Patches/0234-Anti-Xray.patch +++ b/Spigot-Server-Patches/0233-Anti-Xray.patch @@ -1,11 +1,11 @@ -From 3edbb5d38723f7afa16a794c46cc6d84bb83dcf4 Mon Sep 17 00:00:00 2001 +From 8d22ff6f6f29ab5e7f2ab17f5166e92620c1c749 Mon Sep 17 00:00:00 2001 From: stonar96 Date: Thu, 21 Sep 2017 00:38:47 +0200 Subject: [PATCH] Anti-Xray diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 7802cc1f4..69fd81898 100644 +index 7802cc1f..69fd8189 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -1,7 +1,10 @@ @@ -47,7 +47,7 @@ index 7802cc1f4..69fd81898 100644 } diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java new file mode 100644 -index 000000000..6833cfad2 +index 00000000..6833cfad --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java @@ -0,0 +1,36 @@ @@ -89,7 +89,7 @@ index 000000000..6833cfad2 +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java new file mode 100644 -index 000000000..91fa945fa +index 00000000..91fa945f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java @@ -0,0 +1,627 @@ @@ -722,7 +722,7 @@ index 000000000..91fa945fa +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java new file mode 100644 -index 000000000..92399318c +index 00000000..92399318 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java @@ -0,0 +1,56 @@ @@ -784,7 +784,7 @@ index 000000000..92399318c +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java new file mode 100644 -index 000000000..aca0b9d71 +index 00000000..aca0b9d7 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java @@ -0,0 +1,84 @@ @@ -874,7 +874,7 @@ index 000000000..aca0b9d71 +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.java b/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.java new file mode 100644 -index 000000000..0bd269a07 +index 00000000..0bd269a0 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.java @@ -0,0 +1,80 @@ @@ -960,7 +960,7 @@ index 000000000..0bd269a07 +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfoAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfoAntiXray.java new file mode 100644 -index 000000000..8ea2beb59 +index 00000000..8ea2beb5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfoAntiXray.java @@ -0,0 +1,28 @@ @@ -993,7 +993,7 @@ index 000000000..8ea2beb59 + } +} diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 1d056031b..d1066d82e 100644 +index 1d056031..d1066d82 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -129,7 +129,7 @@ public class Chunk { @@ -1024,7 +1024,7 @@ index 1d056031b..d1066d82e 100644 this.initLighting(); } diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 14f88e91d..bcce5e8b7 100644 +index 14f88e91..bcce5e8b 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -416,7 +416,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -1037,7 +1037,7 @@ index 14f88e91d..bcce5e8b7 100644 NibbleArray nibblearray = new NibbleArray(nbttagcompound1.getByteArray("Data")); NibbleArray nibblearray1 = nbttagcompound1.hasKeyOfType("Add", 7) ? new NibbleArray(nbttagcompound1.getByteArray("Add")) : null; diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index afdc4a779..aae227fdb 100644 +index afdc4a77..aae227fd 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -9,9 +9,15 @@ public class ChunkSection { @@ -1077,7 +1077,7 @@ index afdc4a779..aae227fdb 100644 int xx = i & 15; int yy = (i >> 8) & 15; diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java -index fa0fd8a9c..401dc7cdc 100644 +index fa0fd8a9..401dc7cd 100644 --- a/src/main/java/net/minecraft/server/DataBits.java +++ b/src/main/java/net/minecraft/server/DataBits.java @@ -51,6 +51,7 @@ public class DataBits { @@ -1089,7 +1089,7 @@ index fa0fd8a9c..401dc7cdc 100644 return this.a; } diff --git a/src/main/java/net/minecraft/server/DataPalette.java b/src/main/java/net/minecraft/server/DataPalette.java -index 5765b2588..d522611ec 100644 +index 5765b258..d522611e 100644 --- a/src/main/java/net/minecraft/server/DataPalette.java +++ b/src/main/java/net/minecraft/server/DataPalette.java @@ -4,8 +4,10 @@ import javax.annotation.Nullable; @@ -1104,7 +1104,7 @@ index 5765b2588..d522611ec 100644 IBlockData a(int i); diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index 2cb462b8e..67784b4a6 100644 +index 2cb462b8..67784b4a 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -2,22 +2,55 @@ package net.minecraft.server; @@ -1212,7 +1212,7 @@ index 2cb462b8e..67784b4a6 100644 } diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index d0b67d8fd..eeaa625d2 100644 +index d0b67d8f..eeaa625d 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -74,6 +74,7 @@ public class EntityFallingBlock extends Entity { @@ -1232,7 +1232,7 @@ index d0b67d8fd..eeaa625d2 100644 if (block instanceof BlockFalling) { ((BlockFalling) block).a(this.world, blockposition, this.block, iblockdata); diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index e148901e5..61fbdeb6a 100644 +index e148901e..61fbdeb6 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -228,6 +228,7 @@ public class Explosion { @@ -1244,7 +1244,7 @@ index e148901e5..61fbdeb6a 100644 if (flag) { double d0 = (double) ((float) blockposition.getX() + this.world.random.nextFloat()); diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index d583cced6..2eddb68d7 100644 +index d583cced..2eddb68d 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -62,7 +62,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -1343,7 +1343,7 @@ index d583cced6..2eddb68d7 100644 public QueuedPacket(Packet packet, GenericFutureListener>... agenericfuturelistener) { this.a = packet; diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java -index c1273e988..d71734df8 100644 +index c1273e98..d71734df 100644 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java @@ -33,6 +33,7 @@ public class PacketDataSerializer extends ByteBuf { @@ -1355,7 +1355,7 @@ index c1273e988..d71734df8 100644 for (int j = 1; j < 5; ++j) { if ((i & -1 << j * 7) == 0) { diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index d16669bcc..306a6b7cd 100644 +index d16669bc..306a6b7c 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -8,6 +8,10 @@ import java.util.Iterator; @@ -1448,7 +1448,7 @@ index d16669bcc..306a6b7cd 100644 if (flag) { packetdataserializer.writeBytes(chunksection.getSkyLightArray().asBytes()); diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 48a008e0a..045adbd3d 100644 +index 48a008e0..045adbd3 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -134,6 +134,8 @@ public class PlayerChunk { @@ -1477,7 +1477,7 @@ index 48a008e0a..045adbd3d 100644 } else { this.a((Packet) (new PacketPlayOutMultiBlockChange(this.dirtyCount, this.dirtyBlocks, this.chunk))); diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index a49b5c81a..5ec7f5819 100644 +index a49b5c81..5ec7f581 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -200,6 +200,8 @@ public class PlayerInteractManager { @@ -1490,7 +1490,7 @@ index a49b5c81a..5ec7f5819 100644 public void a(BlockPosition blockposition) { diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java -index 8860a0129..fa0d66d63 100644 +index 8860a012..fa0d66d6 100644 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java @@ -47,6 +47,7 @@ public class RegistryBlockID implements Registry { // Paper - Fix decompile e @@ -1502,7 +1502,7 @@ index 8860a0129..fa0d66d63 100644 return this.a.size(); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 00513d02c..592e5b3ba 100644 +index 00513d02..592e5b3b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -35,6 +35,8 @@ import org.bukkit.generator.ChunkGenerator; @@ -1539,7 +1539,7 @@ index 00513d02c..592e5b3ba 100644 public void a(BlockPosition blockposition, Block block, EnumDirection enumdirection) { diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java -index 9942f0c75..2da6edc63 100644 +index 9942f0c7..2da6edc6 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java @@ -73,7 +73,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator { @@ -1579,5 +1579,5 @@ index 9942f0c75..2da6edc63 100644 } } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0235-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0234-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch similarity index 93% rename from Spigot-Server-Patches/0235-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch rename to Spigot-Server-Patches/0234-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch index 77b5fbadde..924a72d19b 100644 --- a/Spigot-Server-Patches/0235-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch +++ b/Spigot-Server-Patches/0234-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch @@ -1,4 +1,4 @@ -From d3721c2c211d6a732466fe31e0aa31fcd9f6eb73 Mon Sep 17 00:00:00 2001 +From e527a04082247252ccc8d5cf4a106d211c2746e7 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Mon, 18 Sep 2017 12:00:03 +0200 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger @@ -12,7 +12,7 @@ results in a separate line, even though it should not result in a line break. Log4j's implementation handles it correctly. diff --git a/pom.xml b/pom.xml -index da69bb93f..7734d84e8 100644 +index da69bb93..7734d84e 100644 --- a/pom.xml +++ b/pom.xml @@ -97,6 +97,13 @@ @@ -30,7 +30,7 @@ index da69bb93f..7734d84e8 100644 junit diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index b3f1aa999..854455711 100644 +index b3f1aa99..85445571 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -129,8 +129,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -47,5 +47,5 @@ index b3f1aa999..854455711 100644 thread.setDaemon(true); -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0236-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0235-Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 95% rename from Spigot-Server-Patches/0236-Handle-plugin-prefixes-using-Log4J-configuration.patch rename to Spigot-Server-Patches/0235-Handle-plugin-prefixes-using-Log4J-configuration.patch index 1579b9ebf0..16cc295947 100644 --- a/Spigot-Server-Patches/0236-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/Spigot-Server-Patches/0235-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -1,4 +1,4 @@ -From 3b9137e60577cf746bd17a92387f490e5309bc49 Mon Sep 17 00:00:00 2001 +From 67a131ffff6c1b087b0afb1de69806244b24c0ea 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 @@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/pom.xml b/pom.xml -index 7734d84e8..28976dae8 100644 +index 7734d84e..28976dae 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ @@ -28,7 +28,7 @@ index 7734d84e8..28976dae8 100644 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 9ce3e1365..cc1f3ac96 100644 +index 9ce3e136..cc1f3ac9 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -282,7 +282,7 @@ public class SpigotConfig @@ -41,7 +41,7 @@ index 9ce3e1365..cc1f3ac96 100644 public static int playerShuffle; diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 08b6bb7f9..9f8334376 100644 +index 08b6bb7f..9f833437 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -2,10 +2,22 @@ @@ -70,5 +70,5 @@ index 08b6bb7f9..9f8334376 100644 -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0237-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0236-Include-Log4J2-SLF4J-implementation.patch similarity index 86% rename from Spigot-Server-Patches/0237-Include-Log4J2-SLF4J-implementation.patch rename to Spigot-Server-Patches/0236-Include-Log4J2-SLF4J-implementation.patch index da3b268f41..7b393dbcfd 100644 --- a/Spigot-Server-Patches/0237-Include-Log4J2-SLF4J-implementation.patch +++ b/Spigot-Server-Patches/0236-Include-Log4J2-SLF4J-implementation.patch @@ -1,11 +1,11 @@ -From 0de29dbddb249cb3b210935e18e4ed61e4caf1f0 Mon Sep 17 00:00:00 2001 +From b810abd1c308634b722548b03cd532dba405ead6 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:35 +0200 Subject: [PATCH] Include Log4J2 SLF4J implementation diff --git a/pom.xml b/pom.xml -index 28976dae8..ffa9f5a97 100644 +index 28976dae..ffa9f5a9 100644 --- a/pom.xml +++ b/pom.xml @@ -98,6 +98,12 @@ @@ -22,5 +22,5 @@ index 28976dae8..ffa9f5a97 100644 org.apache.logging.log4j log4j-iostreams -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0238-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0237-Disable-logger-prefix-for-various-plugins-bypassing-.patch similarity index 95% rename from Spigot-Server-Patches/0238-Disable-logger-prefix-for-various-plugins-bypassing-.patch rename to Spigot-Server-Patches/0237-Disable-logger-prefix-for-various-plugins-bypassing-.patch index 936531e59b..783eda7bda 100644 --- a/Spigot-Server-Patches/0238-Disable-logger-prefix-for-various-plugins-bypassing-.patch +++ b/Spigot-Server-Patches/0237-Disable-logger-prefix-for-various-plugins-bypassing-.patch @@ -1,4 +1,4 @@ -From 145ff25d57dec3f3a86e7afc1344c7532607bddc Mon Sep 17 00:00:00 2001 +From 432385ee12a9a154c4924b5581b287a8f37f21f4 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sat, 23 Sep 2017 21:07:20 +0200 Subject: [PATCH] Disable logger prefix for various plugins bypassing the @@ -11,7 +11,7 @@ log. Disable the logger prefix for these plugins so the messages show up correctly. diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 9f8334376..6711e6dff 100644 +index 9f833437..6711e6df 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -5,7 +5,8 @@ @@ -35,5 +35,5 @@ index 9f8334376..6711e6dff 100644 -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0239-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0238-Add-PlayerJumpEvent.patch similarity index 96% rename from Spigot-Server-Patches/0239-Add-PlayerJumpEvent.patch rename to Spigot-Server-Patches/0238-Add-PlayerJumpEvent.patch index 02c5b9d8c6..27e48d982c 100644 --- a/Spigot-Server-Patches/0239-Add-PlayerJumpEvent.patch +++ b/Spigot-Server-Patches/0238-Add-PlayerJumpEvent.patch @@ -1,11 +1,11 @@ -From c272a375273ed825e19202ba075bb8dd7dfd25c2 Mon Sep 17 00:00:00 2001 +From 6aa7c71a2150705b12dab5e58add78b04d0f98a1 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Sep 2017 17:21:44 -0400 Subject: [PATCH] Add PlayerJumpEvent diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index deb0f4a9c..579996d1e 100644 +index deb0f4a9..579996d1 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1399,6 +1399,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -17,7 +17,7 @@ index deb0f4a9c..579996d1e 100644 super.cu(); this.b(StatisticList.w); diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 3104fc0ea..aa57ff8ed 100644 +index 3104fc0e..aa57ff8e 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.EquipmentSlot; @@ -65,5 +65,5 @@ index 3104fc0ea..aa57ff8ed 100644 this.player.move(EnumMoveType.PLAYER, d7, d8, d9); -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0240-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0239-handle-PacketPlayInKeepAlive-async.patch similarity index 95% rename from Spigot-Server-Patches/0240-handle-PacketPlayInKeepAlive-async.patch rename to Spigot-Server-Patches/0239-handle-PacketPlayInKeepAlive-async.patch index 6b69d12a01..d6401d2ad7 100644 --- a/Spigot-Server-Patches/0240-handle-PacketPlayInKeepAlive-async.patch +++ b/Spigot-Server-Patches/0239-handle-PacketPlayInKeepAlive-async.patch @@ -1,4 +1,4 @@ -From 336d31b126a2d9cdc3cb53fbe1ef71af40c9da81 Mon Sep 17 00:00:00 2001 +From 041fa5d77011eb2a6a790046228fa84d3afbaece Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 5 Oct 2017 01:54:07 +0100 Subject: [PATCH] handle PacketPlayInKeepAlive async @@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing random disconnections for clients. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index aa57ff8ed..869a2b402 100644 +index aa57ff8e..869a2b40 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2230,14 +2230,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -42,5 +42,5 @@ index aa57ff8ed..869a2b402 100644 } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0241-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0240-Expose-client-protocol-version-and-virtual-host.patch similarity index 95% rename from Spigot-Server-Patches/0241-Expose-client-protocol-version-and-virtual-host.patch rename to Spigot-Server-Patches/0240-Expose-client-protocol-version-and-virtual-host.patch index ec37085f43..f262a1ea48 100644 --- a/Spigot-Server-Patches/0241-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-Server-Patches/0240-Expose-client-protocol-version-and-virtual-host.patch @@ -1,4 +1,4 @@ -From 3d483cab8e7200988d72276aef4f6f56ec86a615 Mon Sep 17 00:00:00 2001 +From 5cef17ac96b6148501f5b69324e5dbc002f4cb48 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 10 Oct 2017 18:45:20 +0200 Subject: [PATCH] Expose client protocol version and virtual host @@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java new file mode 100644 -index 000000000..5caca6439 +index 00000000..5caca643 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java @@ -0,0 +1,50 @@ @@ -61,7 +61,7 @@ index 000000000..5caca6439 + +} diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 309ab18df..c583ab7d9 100644 +index 309ab18d..c583ab7d 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -84,7 +84,7 @@ index 309ab18df..c583ab7d9 100644 public void a(IChatBaseComponent ichatbasecomponent) {} diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 2eddb68d7..b93a26e8f 100644 +index 2eddb68d..b93a26e8 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -75,6 +75,10 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -99,7 +99,7 @@ index 2eddb68d7..b93a26e8f 100644 public NetworkManager(EnumProtocolDirection enumprotocoldirection) { this.h = enumprotocoldirection; diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java -index aececa39d..1d4ba3b3d 100644 +index aececa39..1d4ba3b3 100644 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java @@ -33,6 +33,7 @@ public class PacketHandshakingInSetProtocol implements Packet Date: Sun, 15 Oct 2017 00:29:07 +0100 Subject: [PATCH] revert serverside behavior of keepalives @@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients, at the cost of dead connections being kept open for longer. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 869a2b402..284db9b9e 100644 +index 869a2b40..284db9b9 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -68,7 +68,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -74,5 +74,5 @@ index 869a2b402..284db9b9e 100644 this.minecraftServer.methodProfiler.b(); // CraftBukkit start -- -2.16.3 +2.14.3 diff --git a/Spigot-Server-Patches/0243-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch b/Spigot-Server-Patches/0242-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch similarity index 92% rename from Spigot-Server-Patches/0243-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch rename to Spigot-Server-Patches/0242-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch index f8bd471821..c91d6fe9e3 100644 --- a/Spigot-Server-Patches/0243-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch +++ b/Spigot-Server-Patches/0242-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch @@ -1,4 +1,4 @@ -From de0e79d31274e5264ec0982b542429b843462c06 Mon Sep 17 00:00:00 2001 +From 965e44334174a233db11efe7f368f8db2c97c7e7 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Fri, 20 Oct 2017 04:33:45 +0200 Subject: [PATCH] Replace HashSet with fastutil's ObjectOpenHashSet in @@ -13,7 +13,7 @@ ObjectOpenHashSet never uses compareTo(), so the inconsistencies of NextTickList Fixes https://github.com/PaperMC/Paper/issues/588 diff --git a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java -index 80a5c29f3..cd864c404 100644 +index 80a5c29f..cd864c40 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java +++ b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java @@ -8,7 +8,7 @@ import java.util.TreeSet; @@ -26,5 +26,5 @@ index 80a5c29f3..cd864c404 100644 public HashTreeSet() { -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0244-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0243-Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 97% rename from Spigot-Server-Patches/0244-Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to Spigot-Server-Patches/0243-Send-attack-SoundEffects-only-to-players-who-can-see.patch index 2adb1415a0..eb5b9b7bfb 100644 --- a/Spigot-Server-Patches/0244-Send-attack-SoundEffects-only-to-players-who-can-see.patch +++ b/Spigot-Server-Patches/0243-Send-attack-SoundEffects-only-to-players-who-can-see.patch @@ -1,4 +1,4 @@ -From dc5e0bc19d3620712cf9b32b740cac0165e20960 Mon Sep 17 00:00:00 2001 +From 96f7c1bdb10080dfeb611fbff817d8fb39bffb4c Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 31 Oct 2017 03:26:18 +0100 Subject: [PATCH] Send attack SoundEffects only to players who can see the @@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 579996d1e..347237055 100644 +index 579996d1..34723705 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -939,6 +939,15 @@ public abstract class EntityHuman extends EntityLiving { @@ -72,7 +72,7 @@ index 579996d1e..347237055 100644 entity.extinguish(); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 592e5b3ba..d45cbf2f6 100644 +index 592e5b3b..d45cbf2f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1061,6 +1061,12 @@ public abstract class World implements IBlockAccess { @@ -89,5 +89,5 @@ index 592e5b3ba..d45cbf2f6 100644 for (int i = 0; i < this.u.size(); ++i) { ((IWorldAccess) this.u.get(i)).a(entityhuman, soundeffect, soundcategory, d0, d1, d2, f, f1); -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0245-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0244-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 95% rename from Spigot-Server-Patches/0245-Option-for-maximum-exp-value-when-merging-orbs.patch rename to Spigot-Server-Patches/0244-Option-for-maximum-exp-value-when-merging-orbs.patch index 276b8ce79e..53b416021b 100644 --- a/Spigot-Server-Patches/0245-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/Spigot-Server-Patches/0244-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -1,11 +1,11 @@ -From a828e7d4f74282b4672b1d694de81afe9b12904a Mon Sep 17 00:00:00 2001 +From c65aa11566146474df22c01b4cbe1140d34f3858 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 10 Nov 2017 23:03:12 -0500 Subject: [PATCH] Option for maximum exp value when merging orbs diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 69fd81898..e6ee13ee5 100644 +index 69fd8189..e6ee13ee 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -450,4 +450,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 69fd81898..e6ee13ee5 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d45cbf2f6..0193364d2 100644 +index d45cbf2f..0193364d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1143,16 +1143,30 @@ public abstract class World implements IBlockAccess { @@ -56,5 +56,5 @@ index d45cbf2f6..0193364d2 100644 } // Spigot end -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0246-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0245-Add-PlayerArmorChangeEvent.patch similarity index 94% rename from Spigot-Server-Patches/0246-Add-PlayerArmorChangeEvent.patch rename to Spigot-Server-Patches/0245-Add-PlayerArmorChangeEvent.patch index 1506af4ffa..2500d8b6e1 100644 --- a/Spigot-Server-Patches/0246-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-Server-Patches/0245-Add-PlayerArmorChangeEvent.patch @@ -1,11 +1,11 @@ -From 3808c1301f671596ed68c498a2cfd835c55b337d Mon Sep 17 00:00:00 2001 +From fa64634c12186e182b6df1852967948db0d21c32 Mon Sep 17 00:00:00 2001 From: pkt77 Date: Fri, 10 Nov 2017 23:46:34 -0500 Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index aa4c23a16..d1b3b20fb 100644 +index aa4c23a1..d1b3b20f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1,5 +1,6 @@ @@ -30,7 +30,7 @@ index aa4c23a16..d1b3b20fb 100644 if (!itemstack.isEmpty()) { this.getAttributeMap().a(itemstack.a(enumitemslot)); diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java -index cdf3a3ba4..be5d0bf89 100644 +index cdf3a3ba..be5d0bf8 100644 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java @@ -16,6 +16,7 @@ public enum EnumItemSlot { @@ -42,5 +42,5 @@ index cdf3a3ba4..be5d0bf89 100644 return this.g; } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0247-Improve-Structures-Checking.patch b/Spigot-Server-Patches/0246-Improve-Structures-Checking.patch similarity index 97% rename from Spigot-Server-Patches/0247-Improve-Structures-Checking.patch rename to Spigot-Server-Patches/0246-Improve-Structures-Checking.patch index 090200de6f..e20fb38eb8 100644 --- a/Spigot-Server-Patches/0247-Improve-Structures-Checking.patch +++ b/Spigot-Server-Patches/0246-Improve-Structures-Checking.patch @@ -1,4 +1,4 @@ -From e7c2c2926920c0809361f62f0e454d6cc67569d0 Mon Sep 17 00:00:00 2001 +From 2de082f53860d4623c135b9c1f8daf6cb161a32b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 11 Nov 2017 17:57:39 -0500 Subject: [PATCH] Improve Structures Checking @@ -14,7 +14,7 @@ that has been around for a whilewith lots of structures due to ineffeciencies in how MC stores structures (even unloaded chunks has structured data loaded) diff --git a/src/main/java/net/minecraft/server/StructureBoundingBox.java b/src/main/java/net/minecraft/server/StructureBoundingBox.java -index db419cd99..d9329bd42 100644 +index db419cd9..d9329bd4 100644 --- a/src/main/java/net/minecraft/server/StructureBoundingBox.java +++ b/src/main/java/net/minecraft/server/StructureBoundingBox.java @@ -4,12 +4,14 @@ import com.google.common.base.MoreObjects; @@ -47,7 +47,7 @@ index db419cd99..d9329bd42 100644 return baseblockposition.getX() >= this.a && baseblockposition.getX() <= this.d && baseblockposition.getZ() >= this.c && baseblockposition.getZ() <= this.f && baseblockposition.getY() >= this.b && baseblockposition.getY() <= this.e; } diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java -index e8263baa4..f4dfba8f3 100644 +index e8263baa..f4dfba8f 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectMap; @@ -157,7 +157,7 @@ index e8263baa4..f4dfba8f3 100644 this.a.a(structurestart.a(i, j), i, j); this.a.c(); diff --git a/src/main/java/net/minecraft/server/StructurePiece.java b/src/main/java/net/minecraft/server/StructurePiece.java -index 93903bc67..fcc13f811 100644 +index 93903bc6..fcc13f81 100644 --- a/src/main/java/net/minecraft/server/StructurePiece.java +++ b/src/main/java/net/minecraft/server/StructurePiece.java @@ -53,6 +53,7 @@ public abstract class StructurePiece { @@ -169,7 +169,7 @@ index 93903bc67..fcc13f811 100644 return this.l; } diff --git a/src/main/java/net/minecraft/server/StructureStart.java b/src/main/java/net/minecraft/server/StructureStart.java -index b6abc74e0..f9bb953d0 100644 +index b6abc74e..f9bb953d 100644 --- a/src/main/java/net/minecraft/server/StructureStart.java +++ b/src/main/java/net/minecraft/server/StructureStart.java @@ -19,10 +19,12 @@ public abstract class StructureStart { @@ -195,5 +195,5 @@ index b6abc74e0..f9bb953d0 100644 } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0248-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0247-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 90% rename from Spigot-Server-Patches/0248-Prevent-logins-from-being-processed-when-the-player-.patch rename to Spigot-Server-Patches/0247-Prevent-logins-from-being-processed-when-the-player-.patch index d6e64ca160..e3f299ac06 100644 --- a/Spigot-Server-Patches/0248-Prevent-logins-from-being-processed-when-the-player-.patch +++ b/Spigot-Server-Patches/0247-Prevent-logins-from-being-processed-when-the-player-.patch @@ -1,4 +1,4 @@ -From 05147fb3c8fbcf1a5044784c7d9ac9321ab8a143 Mon Sep 17 00:00:00 2001 +From 138b8d9ad24d25d198ec0904bc556ebdea9cdd36 Mon Sep 17 00:00:00 2001 From: killme Date: Sun, 12 Nov 2017 19:40:01 +0100 Subject: [PATCH] Prevent logins from being processed when the player has @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 75df92836..eaac25dc3 100644 +index 75df9283..eaac25dc 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -60,7 +60,11 @@ public class LoginListener implements PacketLoginInListener, ITickable { @@ -23,5 +23,5 @@ index 75df92836..eaac25dc3 100644 EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId()); -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0249-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0248-use-CB-BlockState-implementations-for-captured-block.patch similarity index 94% rename from Spigot-Server-Patches/0249-use-CB-BlockState-implementations-for-captured-block.patch rename to Spigot-Server-Patches/0248-use-CB-BlockState-implementations-for-captured-block.patch index bff8b34062..b2e0e1615f 100644 --- a/Spigot-Server-Patches/0249-use-CB-BlockState-implementations-for-captured-block.patch +++ b/Spigot-Server-Patches/0248-use-CB-BlockState-implementations-for-captured-block.patch @@ -1,4 +1,4 @@ -From 34a37e9c46c3c50ffbd9454c207761a17db79dc0 Mon Sep 17 00:00:00 2001 +From d4d62f09d576402a7920cecb653028ad76590f42 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 16 Nov 2017 12:12:41 +0000 Subject: [PATCH] use CB BlockState implementations for captured blocks @@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping information on restoration when the event is cancelled. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0193364d2..e4502551b 100644 +index 0193364d..e4502551 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -393,7 +393,8 @@ public abstract class World implements IBlockAccess { @@ -32,5 +32,5 @@ index 0193364d2..e4502551b 100644 } // CraftBukkit end -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0250-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0249-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 95% rename from Spigot-Server-Patches/0250-API-to-get-a-BlockState-without-a-snapshot.patch rename to Spigot-Server-Patches/0249-API-to-get-a-BlockState-without-a-snapshot.patch index 003f7b4951..463a51628e 100644 --- a/Spigot-Server-Patches/0250-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-Server-Patches/0249-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From f95656f371344b14c743f297f282253e5ec114fa Mon Sep 17 00:00:00 2001 +From 8cd8c32f4d0e94e0c1d4591c3cbb28329d54e1dd Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 6 Nov 2017 21:08:22 -0500 Subject: [PATCH] API to get a BlockState without a snapshot @@ -9,7 +9,7 @@ on the real tile entity. This is useful for where performance is needed diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 537e4b155..8e2d55a73 100644 +index 537e4b15..8e2d55a7 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -264,7 +264,12 @@ public abstract class TileEntity { @@ -35,7 +35,7 @@ index 537e4b155..8e2d55a73 100644 return null; } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 46670c346..a9d3f12bc 100644 +index 46670c34..a9d3f12b 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -260,7 +260,22 @@ public class CraftBlock implements Block { @@ -62,7 +62,7 @@ index 46670c346..a9d3f12bc 100644 switch (material) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index 22dcaea72..3b5a90c39 100644 +index 22dcaea7..3b5a90c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -22,17 +22,34 @@ public class CraftBlockEntityState extends CraftBlockState @@ -101,5 +101,5 @@ index 22dcaea72..3b5a90c39 100644 // copy tile entity data: this.snapshot = this.createSnapshot(tileEntity); -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0251-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0250-AsyncTabCompleteEvent.patch similarity index 97% rename from Spigot-Server-Patches/0251-AsyncTabCompleteEvent.patch rename to Spigot-Server-Patches/0250-AsyncTabCompleteEvent.patch index 5585863a92..54ebe78ce3 100644 --- a/Spigot-Server-Patches/0251-AsyncTabCompleteEvent.patch +++ b/Spigot-Server-Patches/0250-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From 64855ea7893dfa03167b3a6019050b312109cc7b Mon Sep 17 00:00:00 2001 +From ef21a8c5f4fb0e822edc88e1bdbfa0df78df4b69 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Nov 2017 13:19:58 -0500 Subject: [PATCH] AsyncTabCompleteEvent @@ -14,7 +14,7 @@ completion, such as offline players. Also adds isCommand and getLocation to the sync TabCompleteEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 167e386c8..3fbf51e52 100644 +index 284db9b9..e6d0c636 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2276,24 +2276,51 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -80,7 +80,7 @@ index 167e386c8..3fbf51e52 100644 public void a(PacketPlayInSettings packetplayinsettings) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index aca5ea7c0..090a4d2f2 100644 +index 2dd7ed96..e86c1675 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1643,8 +1643,8 @@ public final class CraftServer implements Server { @@ -95,7 +95,7 @@ index aca5ea7c0..090a4d2f2 100644 return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions(); diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java -index 1e3aae3b8..95d13c146 100644 +index 1e3aae3b..95d13c14 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java @@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer { @@ -139,5 +139,5 @@ index 1e3aae3b8..95d13c146 100644 Waitable> waitable = new Waitable>() { @Override -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0252-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0251-Avoid-NPE-in-PathfinderGoalTempt.patch similarity index 88% rename from Spigot-Server-Patches/0252-Avoid-NPE-in-PathfinderGoalTempt.patch rename to Spigot-Server-Patches/0251-Avoid-NPE-in-PathfinderGoalTempt.patch index 5b7e3da39b..de9602ef55 100644 --- a/Spigot-Server-Patches/0252-Avoid-NPE-in-PathfinderGoalTempt.patch +++ b/Spigot-Server-Patches/0251-Avoid-NPE-in-PathfinderGoalTempt.patch @@ -1,11 +1,11 @@ -From 501d5c54604d790979c421b8e848d7768a6756e9 Mon Sep 17 00:00:00 2001 +From a811f2e4313c6205db1b899c4c23abb6e1fefef9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 29 Nov 2017 22:18:54 -0500 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java -index 188825d19..8004f3a3f 100644 +index 188825d1..8004f3a3 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java @@ -54,7 +54,7 @@ public class PathfinderGoalTempt extends PathfinderGoal { @@ -18,5 +18,5 @@ index 188825d19..8004f3a3f 100644 } } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0253-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch b/Spigot-Server-Patches/0252-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch similarity index 95% rename from Spigot-Server-Patches/0253-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch rename to Spigot-Server-Patches/0252-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch index bb9529d275..752e9c8dc1 100644 --- a/Spigot-Server-Patches/0253-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch +++ b/Spigot-Server-Patches/0252-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch @@ -1,4 +1,4 @@ -From 7a024bd2fa7106faeee289d90f6b790a73f5aee6 Mon Sep 17 00:00:00 2001 +From 92f05c91447dccd21a3efbb7708f813ce6bd1864 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 18 Dec 2017 07:26:56 +0000 Subject: [PATCH] Don't blindly send unlit chunks when lighting updates are @@ -18,7 +18,7 @@ only send chunks which are actually ready to be sent, otherwise, we will always send chunks. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index d1066d82e..001fca42a 100644 +index d1066d82..001fca42 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -39,7 +39,7 @@ public class Chunk { @@ -44,5 +44,5 @@ index d1066d82e..001fca42a 100644 } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0254-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0253-PlayerPickupExperienceEvent.patch similarity index 91% rename from Spigot-Server-Patches/0254-PlayerPickupExperienceEvent.patch rename to Spigot-Server-Patches/0253-PlayerPickupExperienceEvent.patch index 85bc8e967d..52ff9a8b17 100644 --- a/Spigot-Server-Patches/0254-PlayerPickupExperienceEvent.patch +++ b/Spigot-Server-Patches/0253-PlayerPickupExperienceEvent.patch @@ -1,4 +1,4 @@ -From 0bd1877fce888d94bb2781c405f16329f51a57b7 Mon Sep 17 00:00:00 2001 +From be768786c2c453da077ab12b03d21bd1517c0b7b Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:02:53 -0500 Subject: [PATCH] PlayerPickupExperienceEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent Allows plugins to cancel a player picking up an experience orb diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index d567ad4a5..ff5cc74ba 100644 +index d567ad4a..ff5cc74b 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -206,7 +206,7 @@ public class EntityExperienceOrb extends Entity { @@ -19,5 +19,5 @@ index d567ad4a5..ff5cc74ba 100644 entityhuman.receive(this, 1); ItemStack itemstack = EnchantmentManager.b(Enchantments.C, (EntityLiving) entityhuman); -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0255-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0254-ExperienceOrbMergeEvent.patch similarity index 93% rename from Spigot-Server-Patches/0255-ExperienceOrbMergeEvent.patch rename to Spigot-Server-Patches/0254-ExperienceOrbMergeEvent.patch index 42435211f3..293a6e7fcb 100644 --- a/Spigot-Server-Patches/0255-ExperienceOrbMergeEvent.patch +++ b/Spigot-Server-Patches/0254-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From 300676cf7bbd8e89cb7ca9cf0b20ed259d144c6e Mon Sep 17 00:00:00 2001 +From 1f708df86d0848f78966d930eda728832f4f3b2b Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:57:26 -0500 Subject: [PATCH] ExperienceOrbMergeEvent @@ -8,7 +8,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e4502551b..9f5388ed9 100644 +index e4502551..9f5388ed 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1153,7 +1153,7 @@ public abstract class World implements IBlockAccess { @@ -21,5 +21,5 @@ index e4502551b..9f5388ed9 100644 // Paper start if (!mergeUnconditionally && xp.value > maxValue) { -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0256-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0255-Ability-to-apply-mending-to-XP-API.patch similarity index 95% rename from Spigot-Server-Patches/0256-Ability-to-apply-mending-to-XP-API.patch rename to Spigot-Server-Patches/0255-Ability-to-apply-mending-to-XP-API.patch index 209c04da4e..eb561eb6d6 100644 --- a/Spigot-Server-Patches/0256-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-Server-Patches/0255-Ability-to-apply-mending-to-XP-API.patch @@ -1,4 +1,4 @@ -From 75ba076d78fd31338f40ec6843714bb9978a3cdf Mon Sep 17 00:00:00 2001 +From 596b1db6a5e10475c0bc5c0f0d91fa43821c1d6e Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 17:36:49 -0500 Subject: [PATCH] Ability to apply mending to XP API @@ -10,7 +10,7 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java -index 98300d0a2..f714dc326 100644 +index 98300d0a..f714dc32 100644 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java @@ -226,6 +226,7 @@ public class EnchantmentManager { @@ -22,7 +22,7 @@ index 98300d0a2..f714dc326 100644 List list = enchantment.a(entityliving); diff --git a/src/main/java/net/minecraft/server/Enchantments.java b/src/main/java/net/minecraft/server/Enchantments.java -index 35e87eb1c..74a6a4f60 100644 +index 35e87eb1..74a6a4f6 100644 --- a/src/main/java/net/minecraft/server/Enchantments.java +++ b/src/main/java/net/minecraft/server/Enchantments.java @@ -32,7 +32,7 @@ public class Enchantments { @@ -35,7 +35,7 @@ index 35e87eb1c..74a6a4f60 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index ff5cc74ba..1c59fd966 100644 +index ff5cc74b..1c59fd96 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -234,10 +234,12 @@ public class EntityExperienceOrb extends Entity { @@ -52,7 +52,7 @@ index ff5cc74ba..1c59fd966 100644 return i * 2; } diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 52cb34abd..d1ff97a9e 100644 +index 52cb34ab..d1ff97a9 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -28,7 +28,7 @@ public final class ItemStack { @@ -78,7 +78,7 @@ index 52cb34abd..d1ff97a9e 100644 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 -index 428b208ae..21631c588 100644 +index 428b208a..21631c58 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -923,8 +923,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -123,5 +123,5 @@ index 428b208ae..21631c588 100644 } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0257-Configurable-Chunks-Sends-per-Tick-setting.patch b/Spigot-Server-Patches/0256-Configurable-Chunks-Sends-per-Tick-setting.patch similarity index 92% rename from Spigot-Server-Patches/0257-Configurable-Chunks-Sends-per-Tick-setting.patch rename to Spigot-Server-Patches/0256-Configurable-Chunks-Sends-per-Tick-setting.patch index 879c9e84a0..d21255b526 100644 --- a/Spigot-Server-Patches/0257-Configurable-Chunks-Sends-per-Tick-setting.patch +++ b/Spigot-Server-Patches/0256-Configurable-Chunks-Sends-per-Tick-setting.patch @@ -1,4 +1,4 @@ -From a0551028ff94e0db88c39c6f3c76137541fb0d58 Mon Sep 17 00:00:00 2001 +From f0a620d88b20747060726bb0ffc329917aadaa12 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 1 Jan 2018 15:41:59 -0500 Subject: [PATCH] Configurable Chunks Sends per Tick setting @@ -8,7 +8,7 @@ Vanilla already had this limited, make it configurable. Limit how much exploration lags the server diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e6ee13ee5..8949b0290 100644 +index e6ee13ee..8949b029 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -456,4 +456,13 @@ public class PaperWorldConfig { @@ -26,7 +26,7 @@ index e6ee13ee5..8949b0290 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 4af557321..6ee9f6cfb 100644 +index 4af55732..6ee9f6cf 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -198,7 +198,7 @@ public class PlayerChunkMap { @@ -39,5 +39,5 @@ index 4af557321..6ee9f6cfb 100644 Iterator iterator2 = this.g.iterator(); -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0258-Configurable-Max-Chunk-Gens-per-Tick.patch b/Spigot-Server-Patches/0257-Configurable-Max-Chunk-Gens-per-Tick.patch similarity index 95% rename from Spigot-Server-Patches/0258-Configurable-Max-Chunk-Gens-per-Tick.patch rename to Spigot-Server-Patches/0257-Configurable-Max-Chunk-Gens-per-Tick.patch index 3bd6cd46d7..1042b09bbc 100644 --- a/Spigot-Server-Patches/0258-Configurable-Max-Chunk-Gens-per-Tick.patch +++ b/Spigot-Server-Patches/0257-Configurable-Max-Chunk-Gens-per-Tick.patch @@ -1,4 +1,4 @@ -From ad4b9433cd1e5053f6fb2519c6099fa60b44f76d Mon Sep 17 00:00:00 2001 +From 12a2b49cb2f955721aa6dfdb2edb2d04d5483426 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 1 Jan 2018 16:10:24 -0500 Subject: [PATCH] Configurable Max Chunk Gens per Tick @@ -13,7 +13,7 @@ This should result in no noticeable speed reduction in generation for servers no lagging, and let larger servers reduce this value according to their own desires. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 8949b0290..cd036b440 100644 +index 8949b029..cd036b44 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -465,4 +465,16 @@ public class PaperWorldConfig { @@ -34,7 +34,7 @@ index 8949b0290..cd036b440 100644 + } diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 045adbd3d..20e734bc8 100644 +index 045adbd3..20e734bc 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -27,6 +27,7 @@ public class PlayerChunk { @@ -54,7 +54,7 @@ index 045adbd3d..20e734bc8 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 6ee9f6cfb..99652ae3e 100644 +index 6ee9f6cf..99652ae3 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -166,6 +166,7 @@ public class PlayerChunkMap { @@ -78,7 +78,7 @@ index 6ee9f6cfb..99652ae3e 100644 if (playerchunk1.a(flag)) { iterator1.remove(); diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java -index 9aaca21a7..f50d55c8e 100644 +index 9aaca21a..f50d55c8 100644 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java @@ -35,4 +35,10 @@ public class ChunkIOExecutor { @@ -93,7 +93,7 @@ index 9aaca21a7..f50d55c8e 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java -index 193c3621c..cf1258c55 100644 +index 193c3621..cf1258c5 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java +++ b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java @@ -351,4 +351,10 @@ public final class AsynchronousExecutor { @@ -108,5 +108,5 @@ index 193c3621c..cf1258c55 100644 + // Paper end } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0259-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0258-Make-max-squid-spawn-height-configurable.patch similarity index 92% rename from Spigot-Server-Patches/0259-Make-max-squid-spawn-height-configurable.patch rename to Spigot-Server-Patches/0258-Make-max-squid-spawn-height-configurable.patch index a5218a444d..2c23a6607e 100644 --- a/Spigot-Server-Patches/0259-Make-max-squid-spawn-height-configurable.patch +++ b/Spigot-Server-Patches/0258-Make-max-squid-spawn-height-configurable.patch @@ -1,4 +1,4 @@ -From 360c4600147704b64657ce9e37ca2dee7b1454b0 Mon Sep 17 00:00:00 2001 +From 84975cf3c2f9cff53bd8cfb2e6c99e6bf3c7bc36 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 11 Jan 2018 16:47:28 -0600 Subject: [PATCH] Make max squid spawn height configurable @@ -7,7 +7,7 @@ I don't know why upstream made only the minimum height configurable but whatever diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index cd036b440..1947f2466 100644 +index cd036b44..1947f246 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -477,4 +477,9 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index cd036b440..1947f2466 100644 + } diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 0ce16be65..58a902831 100644 +index 0ce16be6..58a90283 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -141,7 +141,9 @@ public class EntitySquid extends EntityWaterAnimal { @@ -36,5 +36,5 @@ index 0ce16be65..58a902831 100644 public void b(float f, float f1, float f2) { -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0260-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0259-PreCreatureSpawnEvent.patch similarity index 97% rename from Spigot-Server-Patches/0260-PreCreatureSpawnEvent.patch rename to Spigot-Server-Patches/0259-PreCreatureSpawnEvent.patch index b59f21adba..2a806c1792 100644 --- a/Spigot-Server-Patches/0260-PreCreatureSpawnEvent.patch +++ b/Spigot-Server-Patches/0259-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From 5b1782d302698f34d71ea00d4f112025a78bca1d Mon Sep 17 00:00:00 2001 +From 4cb187dd3ca69fc416f369cd3b369126efd023b4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:01:31 -0500 Subject: [PATCH] PreCreatureSpawnEvent @@ -15,7 +15,7 @@ instead and save a lot of server resources. See: https://github.com/PaperMC/Paper/issues/917 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 87fe4775f..9d580ea01 100644 +index 87fe4775..9d580ea0 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -1,6 +1,7 @@ @@ -57,7 +57,7 @@ index 87fe4775f..9d580ea01 100644 if (entity == null) { diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 2cd063829..e217d3340 100644 +index 2cd06382..e217d334 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -184,6 +184,25 @@ public final class SpawnerCreature { @@ -87,5 +87,5 @@ index 2cd063829..e217d3340 100644 try { -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0261-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0260-PlayerNaturallySpawnCreaturesEvent.patch similarity index 93% rename from Spigot-Server-Patches/0261-PlayerNaturallySpawnCreaturesEvent.patch rename to Spigot-Server-Patches/0260-PlayerNaturallySpawnCreaturesEvent.patch index e124c41897..6136897ff1 100644 --- a/Spigot-Server-Patches/0261-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-Server-Patches/0260-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From 477d4982ea2e5826f9c389b3b4e7dea231721745 Mon Sep 17 00:00:00 2001 +From 7006795db9ba34d371a26c6a02a83600d1f2b117 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:36:02 -0500 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent @@ -9,7 +9,7 @@ from triggering monster spawns on a server. Also a highly more effecient way to blanket block spawns in a world diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index e217d3340..46faa062d 100644 +index e217d334..46faa062 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -72,6 +72,15 @@ public final class SpawnerCreature { @@ -29,5 +29,5 @@ index e217d3340..46faa062d 100644 for (int i1 = -b0; i1 <= b0; ++i1) { for (k = -b0; k <= b0; ++k) { -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0262-Add-SkullMeta.setPlayerProfile-API.patch b/Spigot-Server-Patches/0261-Add-SkullMeta.setPlayerProfile-API.patch similarity index 94% rename from Spigot-Server-Patches/0262-Add-SkullMeta.setPlayerProfile-API.patch rename to Spigot-Server-Patches/0261-Add-SkullMeta.setPlayerProfile-API.patch index 7b5c515c0d..1bcad4f1a4 100644 --- a/Spigot-Server-Patches/0262-Add-SkullMeta.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0261-Add-SkullMeta.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 8f9e12c59e5c19ba02c4baad5a2d5575a07a3ffc Mon Sep 17 00:00:00 2001 +From e9dc047d681a808472cbf58f3ec4128367d8e8c6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 19 Jan 2018 00:36:25 -0500 Subject: [PATCH] Add SkullMeta.setPlayerProfile API @@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo which commonly cause rate limit issues with Mojang API diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index e2ea49cd9..dbc083351 100644 +index e2ea49cd..dbc08335 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -2,6 +2,8 @@ package org.bukkit.craftbukkit.inventory; @@ -49,5 +49,5 @@ index e2ea49cd9..dbc083351 100644 public OfflinePlayer getOwningPlayer() { if (hasOwner()) { -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0263-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0262-Fill-Profile-Property-Events.patch similarity index 97% rename from Spigot-Server-Patches/0263-Fill-Profile-Property-Events.patch rename to Spigot-Server-Patches/0262-Fill-Profile-Property-Events.patch index 1c0484ccda..741a036afa 100644 --- a/Spigot-Server-Patches/0263-Fill-Profile-Property-Events.patch +++ b/Spigot-Server-Patches/0262-Fill-Profile-Property-Events.patch @@ -1,4 +1,4 @@ -From b903d537f8b4858692643e6d1c90379e9fb1d554 Mon Sep 17 00:00:00 2001 +From 00ec1784d8da4298b04ae652324c5ff1df3285aa Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 2 Jan 2018 00:31:26 -0500 Subject: [PATCH] Fill Profile Property Events @@ -12,7 +12,7 @@ This is useful for implementing a ProfileCache for Player Skulls diff --git a/src/main/java/com/destroystokyo/paper/profile/WrappedMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/WrappedMinecraftSessionService.java new file mode 100644 -index 000000000..9914f98c2 +index 00000000..9914f98c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/WrappedMinecraftSessionService.java @@ -0,0 +1,71 @@ @@ -88,7 +88,7 @@ index 000000000..9914f98c2 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6159cf4c0..95d1ac442 100644 +index 85b9ac98..ed0e2acc 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1019,7 +1019,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -101,5 +101,5 @@ index 6159cf4c0..95d1ac442 100644 gameprofilerepository = new com.destroystokyo.paper.profile.WrappedGameProfileRepository(gameprofilerepository); // Paper UserCache usercache = new UserCache(gameprofilerepository, new File(s1, MinecraftServer.a.getName())); -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0264-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0263-PlayerAdvancementCriterionGrantEvent.patch similarity index 90% rename from Spigot-Server-Patches/0264-PlayerAdvancementCriterionGrantEvent.patch rename to Spigot-Server-Patches/0263-PlayerAdvancementCriterionGrantEvent.patch index d9c83c3617..582ed473aa 100644 --- a/Spigot-Server-Patches/0264-PlayerAdvancementCriterionGrantEvent.patch +++ b/Spigot-Server-Patches/0263-PlayerAdvancementCriterionGrantEvent.patch @@ -1,11 +1,11 @@ -From e6ed90358568cc2422eab0f489fd2e1be0b2ea7c Mon Sep 17 00:00:00 2001 +From d6e9b9c825d7abaea63c248016e31e2ce9c41766 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Jan 2018 08:15:29 -0600 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -index 6896b7095..8913e2744 100644 +index 6896b709..8913e274 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java @@ -196,6 +196,12 @@ public class AdvancementDataPlayer { @@ -22,5 +22,5 @@ index 6896b7095..8913e2744 100644 this.i.add(advancement); flag = true; -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0265-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch b/Spigot-Server-Patches/0264-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch similarity index 90% rename from Spigot-Server-Patches/0265-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch rename to Spigot-Server-Patches/0264-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch index 146b3afa04..d17d599547 100644 --- a/Spigot-Server-Patches/0265-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch +++ b/Spigot-Server-Patches/0264-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch @@ -1,4 +1,4 @@ -From 8138a69b7faebbfd9ad210ce8b76c8282424c426 Mon Sep 17 00:00:00 2001 +From 1e2a62261aadcd7ed15ca4cd0af79cf14eb7058f Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 24 Jan 2018 20:06:39 -0500 Subject: [PATCH] MC-99321 - Dont check for blocked double chest for hoppers @@ -11,7 +11,7 @@ This removes the necessity to disable the cat on chest behavior to improve perfo now performance will be improved even if you have cat chest detection on. diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java -index 90267a1fb..91d3308c1 100644 +index 90267a1f..91d3308c 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/src/main/java/net/minecraft/server/BlockChest.java @@ -348,7 +348,7 @@ public class BlockChest extends BlockTileEntity { @@ -24,5 +24,5 @@ index 90267a1fb..91d3308c1 100644 } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0266-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0265-Add-ArmorStand-Item-Meta.patch similarity index 98% rename from Spigot-Server-Patches/0266-Add-ArmorStand-Item-Meta.patch rename to Spigot-Server-Patches/0265-Add-ArmorStand-Item-Meta.patch index 6adcd9fcfa..092ba2eba0 100644 --- a/Spigot-Server-Patches/0266-Add-ArmorStand-Item-Meta.patch +++ b/Spigot-Server-Patches/0265-Add-ArmorStand-Item-Meta.patch @@ -1,4 +1,4 @@ -From fc7571ae73456691d437cf3a6403b9d62c020b11 Mon Sep 17 00:00:00 2001 +From 202978d1bc267893f69124193ea9591a552d83cd Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 27 Jan 2018 17:04:14 -0500 Subject: [PATCH] Add ArmorStand Item Meta @@ -13,7 +13,7 @@ starting point for future additions in this area. Fixes GH-559 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index c2f26577c..851960afb 100644 +index c2f26577..851960af 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -96,6 +96,8 @@ public final class CraftItemFactory implements ItemFactory { @@ -26,7 +26,7 @@ index c2f26577c..851960afb 100644 case CHEST: case TRAPPED_CHEST: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index cdf16e15a..aa99254ff 100644 +index cdf16e15..aa99254f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -307,6 +307,8 @@ public final class CraftItemStack extends ItemStack { @@ -40,7 +40,7 @@ index cdf16e15a..aa99254ff 100644 case TRAPPED_CHEST: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java new file mode 100644 -index 000000000..dc372f6db +index 00000000..dc372f6d --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java @@ -0,0 +1,305 @@ @@ -350,7 +350,7 @@ index 000000000..dc372f6db + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 0cdc8007a..2ab4a1cf4 100644 +index 0cdc8007..2ab4a1cf 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -129,6 +129,7 @@ class CraftMetaItem implements ItemMeta, Repairable { @@ -379,7 +379,7 @@ index 0cdc8007a..2ab4a1cf4 100644 } return HANDLED_TAGS; diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java -index 1f537d584..a29731f1d 100644 +index 1f537d58..a29731f1 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java @@ -5,6 +5,8 @@ import static org.hamcrest.Matchers.*; @@ -407,5 +407,5 @@ index 1f537d584..a29731f1d 100644 ); -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0267-Extend-Player-Interact-cancellation-to-GUIs.patch b/Spigot-Server-Patches/0266-Extend-Player-Interact-cancellation-to-GUIs.patch similarity index 94% rename from Spigot-Server-Patches/0267-Extend-Player-Interact-cancellation-to-GUIs.patch rename to Spigot-Server-Patches/0266-Extend-Player-Interact-cancellation-to-GUIs.patch index 198bb4f3f0..7b5ec7042d 100644 --- a/Spigot-Server-Patches/0267-Extend-Player-Interact-cancellation-to-GUIs.patch +++ b/Spigot-Server-Patches/0266-Extend-Player-Interact-cancellation-to-GUIs.patch @@ -1,4 +1,4 @@ -From 2b7de80466e6bf6fd5ad582be810a43d5ff65546 Mon Sep 17 00:00:00 2001 +From 556a730d0e2356f74df220a1f01d13f680085781 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Feb 2018 10:43:46 +0000 Subject: [PATCH] Extend Player Interact cancellation to GUIs @@ -7,7 +7,7 @@ GUIs are opened on the client, meaning that the server cannot block them from op However, it is possible to close these GUIs from the server. diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 5ec7f5819..b1cdb2154 100644 +index 5ec7f581..b1cdb215 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -468,6 +468,12 @@ public class PlayerInteractManager { @@ -24,5 +24,5 @@ index 5ec7f5819..b1cdb2154 100644 ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-2867 enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS; -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0268-Optimize-Hoppers.patch b/Spigot-Server-Patches/0267-Optimize-Hoppers.patch similarity index 98% rename from Spigot-Server-Patches/0268-Optimize-Hoppers.patch rename to Spigot-Server-Patches/0267-Optimize-Hoppers.patch index 4157ec6e60..be490eb12d 100644 --- a/Spigot-Server-Patches/0268-Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/0267-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From a0d6eed8bdd12a63bb237367bc4bc2c9dab9e4f1 Mon Sep 17 00:00:00 2001 +From a5b59c4a74ae629e213e85929baaf8c543fbef60 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Optimize Hoppers @@ -11,7 +11,7 @@ Subject: [PATCH] Optimize Hoppers * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 1947f2466..61cc1d4e6 100644 +index 1947f246..61cc1d4e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -482,4 +482,12 @@ public class PaperWorldConfig { @@ -28,7 +28,7 @@ index 1947f2466..61cc1d4e6 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 95d1ac442..e8c72db96 100644 +index ed0e2acc..579f0ba0 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -876,6 +876,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -40,7 +40,7 @@ index 95d1ac442..e8c72db96 100644 this.methodProfiler.a(() -> { return worldserver.getWorldData().getName(); diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 8e2d55a73..fe2df18df 100644 +index 8e2d55a7..fe2df18d 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -34,6 +34,7 @@ public abstract class TileEntity { @@ -60,7 +60,7 @@ index 8e2d55a73..fe2df18df 100644 this.g = iblockdata.getBlock().toLegacyData(iblockdata); diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index e9315f2d5..5198a590a 100644 +index e9315f2d..5198a590 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -196,6 +196,154 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -280,5 +280,5 @@ index e9315f2d5..5198a590a 100644 flag = true; } else if (a(itemstack1, itemstack)) { -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0269-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0268-Tameable-getOwnerUniqueId-API.patch similarity index 91% rename from Spigot-Server-Patches/0269-Tameable-getOwnerUniqueId-API.patch rename to Spigot-Server-Patches/0268-Tameable-getOwnerUniqueId-API.patch index a7de20e8d0..18e4da1b0e 100644 --- a/Spigot-Server-Patches/0269-Tameable-getOwnerUniqueId-API.patch +++ b/Spigot-Server-Patches/0268-Tameable-getOwnerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 80184feb9923f988543045716346b8638e11ac0f Mon Sep 17 00:00:00 2001 +From c40913d4c0e5ddb77f6d83bb3831323bb1d7c846 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 24 Feb 2018 01:14:55 -0500 Subject: [PATCH] Tameable#getOwnerUniqueId API @@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java -index e56bef334..cc9d432e7 100644 +index e56bef33..cc9d432e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java @@ -83,6 +83,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac @@ -21,7 +21,7 @@ index e56bef334..cc9d432e7 100644 return getHandle().getOwnerUUID(); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java -index eaaebeab8..2e959321b 100644 +index eaaebeab..2e959321 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java @@ -18,6 +18,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat @@ -35,5 +35,5 @@ index eaaebeab8..2e959321b 100644 try { return getHandle().getOwnerUUID(); -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0270-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0269-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 92% rename from Spigot-Server-Patches/0270-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to Spigot-Server-Patches/0269-Toggleable-player-crits-helps-mitigate-hacked-client.patch index 9c565bf10d..7e751d46f3 100644 --- a/Spigot-Server-Patches/0270-Toggleable-player-crits-helps-mitigate-hacked-client.patch +++ b/Spigot-Server-Patches/0269-Toggleable-player-crits-helps-mitigate-hacked-client.patch @@ -1,11 +1,11 @@ -From 688442287074e5f6311a3ee512c92c6d8193a0e5 Mon Sep 17 00:00:00 2001 +From 5e4dc61000da32545bc0bfcd3b32165f8af8314c Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Sat, 10 Mar 2018 00:50:24 +0100 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 61cc1d4e6..038f874b3 100644 +index 61cc1d4e..038f874b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -232,6 +232,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 61cc1d4e6..038f874b3 100644 private void allChunksAreSlimeChunks() { allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false); diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 347237055..4b82e43a8 100644 +index 34723705..4b82e43a 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -978,7 +978,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -34,5 +34,5 @@ index 347237055..4b82e43a8 100644 if (flag2) { f *= 1.5F; -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0271-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0270-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch similarity index 92% rename from Spigot-Server-Patches/0271-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch rename to Spigot-Server-Patches/0270-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch index e8647d9c02..7a1401cadf 100644 --- a/Spigot-Server-Patches/0271-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch +++ b/Spigot-Server-Patches/0270-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch @@ -1,4 +1,4 @@ -From 02780e7f31207c021b84cb2757eb77c8bf29ca65 Mon Sep 17 00:00:00 2001 +From 28121602c16d0b23af519891ed0d404a21f93aa5 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Mar 2018 13:03:49 +0000 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened @@ -6,7 +6,7 @@ Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java -index cd7de2b53..37b494b78 100644 +index cd7de2b5..37b494b7 100644 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java @@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder; @@ -27,5 +27,5 @@ index cd7de2b53..37b494b78 100644 } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0272-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0271-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 93% rename from Spigot-Server-Patches/0272-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to Spigot-Server-Patches/0271-Prevent-Frosted-Ice-from-loading-holding-chunks.patch index 42db27830e..df57714b6f 100644 --- a/Spigot-Server-Patches/0272-Prevent-Frosted-Ice-from-loading-holding-chunks.patch +++ b/Spigot-Server-Patches/0271-Prevent-Frosted-Ice-from-loading-holding-chunks.patch @@ -1,11 +1,11 @@ -From 6dc061c0c7c25b187f45d8247ca8ce18ca4d2ab3 Mon Sep 17 00:00:00 2001 +From 1fd52dc633eb87295f7c5f9d60fb8434ac1ef08b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Mar 2018 16:33:15 -0500 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java -index a8dbbf20a..87f40bfcf 100644 +index a8dbbf20..87f40bfc 100644 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java @@ -50,7 +50,9 @@ public class BlockIceFrost extends BlockIce { @@ -30,5 +30,5 @@ index a8dbbf20a..87f40bfcf 100644 if (iblockdata1.getBlock() == this) { this.a(world, blockposition1, iblockdata1, random, false); -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0273-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0272-Disable-Explicit-Network-Manager-Flushing.patch similarity index 93% rename from Spigot-Server-Patches/0273-Disable-Explicit-Network-Manager-Flushing.patch rename to Spigot-Server-Patches/0272-Disable-Explicit-Network-Manager-Flushing.patch index 8ad1d037c6..550345ef82 100644 --- a/Spigot-Server-Patches/0273-Disable-Explicit-Network-Manager-Flushing.patch +++ b/Spigot-Server-Patches/0272-Disable-Explicit-Network-Manager-Flushing.patch @@ -1,4 +1,4 @@ -From 9e1c5a7852f21efbc2bc259be9eb5b3a567f3b9e Mon Sep 17 00:00:00 2001 +From 3413ad534b54b0203e71ba0293a5a51ada2b097d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 11 Mar 2018 14:13:33 -0400 Subject: [PATCH] Disable Explicit Network Manager Flushing @@ -12,7 +12,7 @@ flushing on the netty event loop, so it won't do the flush on the main thread. Renable flushing by passing -Dpaper.explicit-flush=true diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index b93a26e8f..3d32e0056 100644 +index b93a26e8..3d32e005 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -78,6 +78,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -33,5 +33,5 @@ index b93a26e8f..3d32e0056 100644 } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0274-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0273-Implement-extended-PaperServerListPingEvent.patch similarity index 99% rename from Spigot-Server-Patches/0274-Implement-extended-PaperServerListPingEvent.patch rename to Spigot-Server-Patches/0273-Implement-extended-PaperServerListPingEvent.patch index 2f893e6885..b623510d53 100644 --- a/Spigot-Server-Patches/0274-Implement-extended-PaperServerListPingEvent.patch +++ b/Spigot-Server-Patches/0273-Implement-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From f61ac2e8621e11b322ff53f1d819279ba62d9824 Mon Sep 17 00:00:00 2001 +From 79ba50cb7dd573b4448adc4f3f0d7be96995933b Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 15:56:26 +0200 Subject: [PATCH] Implement extended PaperServerListPingEvent @@ -264,5 +264,5 @@ index cc1f3ac9..4f9fd4bc 100644 } -- -2.16.3 +2.14.3 diff --git a/Spigot-Server-Patches/0275-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0274-Improved-Async-Task-Scheduler.patch similarity index 99% rename from Spigot-Server-Patches/0275-Improved-Async-Task-Scheduler.patch rename to Spigot-Server-Patches/0274-Improved-Async-Task-Scheduler.patch index bfe57b01ff..c9aa4bdd31 100644 --- a/Spigot-Server-Patches/0275-Improved-Async-Task-Scheduler.patch +++ b/Spigot-Server-Patches/0274-Improved-Async-Task-Scheduler.patch @@ -1,4 +1,4 @@ -From 319def15cb52ba90e5799dddf8c00714bbf98b16 Mon Sep 17 00:00:00 2001 +From ce10f29e40b9ccb5989ca1c901e6f7644c806553 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Mar 2018 22:59:43 -0400 Subject: [PATCH] Improved Async Task Scheduler @@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue. diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java new file mode 100644 -index 000000000..eaf869287 +index 00000000..eaf86928 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java @@ -0,0 +1,127 @@ @@ -164,7 +164,7 @@ index 000000000..eaf869287 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index cc4a256c2..5d0d26e1a 100644 +index cc4a256c..5d0d26e1 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -15,7 +15,6 @@ import java.util.concurrent.atomic.AtomicReference; @@ -383,5 +383,5 @@ index cc4a256c2..5d0d26e1a 100644 private boolean isReady(final int currentTick) { -- -2.16.3 +2.14.3 diff --git a/Spigot-Server-Patches/0276-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0275-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 95% rename from Spigot-Server-Patches/0276-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to Spigot-Server-Patches/0275-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index 495dc5c41a..b8ce7e67d7 100644 --- a/Spigot-Server-Patches/0276-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/Spigot-Server-Patches/0275-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -1,4 +1,4 @@ -From cccaac220a16d63ca4b3888c5288f36c97d3acdb Mon Sep 17 00:00:00 2001 +From 12cb0549504a718334e7f0badf1aa6d1984e8d4a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 11:45:57 -0400 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent This will allow you to change the players name or skin on login. diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index eaac25dc3..2842956bf 100644 +index eaac25dc..2842956b 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -1,5 +1,7 @@ @@ -44,5 +44,5 @@ index eaac25dc3..2842956bf 100644 if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) { final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId); -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0277-Call-PortalCreateEvent-for-exit-portals.patch b/Spigot-Server-Patches/0276-Call-PortalCreateEvent-for-exit-portals.patch similarity index 97% rename from Spigot-Server-Patches/0277-Call-PortalCreateEvent-for-exit-portals.patch rename to Spigot-Server-Patches/0276-Call-PortalCreateEvent-for-exit-portals.patch index 4fa4694af0..3305ddaf42 100644 --- a/Spigot-Server-Patches/0277-Call-PortalCreateEvent-for-exit-portals.patch +++ b/Spigot-Server-Patches/0276-Call-PortalCreateEvent-for-exit-portals.patch @@ -1,11 +1,11 @@ -From 07002b8cac576afa02cc8be735a4f125d9c973cc Mon Sep 17 00:00:00 2001 +From 1926f7c5b49a00135c820f7352ec38e400c9603b Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Sun, 18 Mar 2018 15:44:44 +0100 Subject: [PATCH] Call PortalCreateEvent for exit portals diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java -index f49729796..42e4b2d01 100644 +index f4972979..42e4b2d0 100644 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java @@ -3,10 +3,17 @@ package net.minecraft.server; @@ -111,5 +111,5 @@ index f49729796..42e4b2d01 100644 } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0278-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0277-Player.setPlayerProfile-API.patch similarity index 97% rename from Spigot-Server-Patches/0278-Player.setPlayerProfile-API.patch rename to Spigot-Server-Patches/0277-Player.setPlayerProfile-API.patch index fd1e94bd24..5fe492bfd2 100644 --- a/Spigot-Server-Patches/0278-Player.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0277-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From cebd684862b0e016056fc87f8ddff96dadbcd272 Mon Sep 17 00:00:00 2001 +From 18b5a2e1abbb2f763bdae6656a2f6d7aea11f28b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 12:29:48 -0400 Subject: [PATCH] Player.setPlayerProfile API @@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API This can be useful for changing name or skins after a player has logged in. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 4b82e43a8..35fde8b23 100644 +index 4b82e43a..35fde8b2 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -59,7 +59,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -19,7 +19,7 @@ index 4b82e43a8..35fde8b23 100644 private final ItemCooldown bW; @Nullable diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 2842956bf..8aeded425 100644 +index 2842956b..8aeded42 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -41,7 +41,7 @@ public class LoginListener implements PacketLoginInListener, ITickable { @@ -48,7 +48,7 @@ index 2842956bf..8aeded425 100644 uniqueId = i.getId(); // 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 21631c588..1e73a3308 100644 +index 21631c58..1e73a330 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,6 +1,8 @@ @@ -118,5 +118,5 @@ index 21631c588..1e73a3308 100644 public void removeDisconnectingPlayer(Player player) { hiddenPlayers.remove(player.getUniqueId()); -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0279-Configurable-Unrestricted-Signs.patch b/Spigot-Server-Patches/0278-Configurable-Unrestricted-Signs.patch similarity index 96% rename from Spigot-Server-Patches/0279-Configurable-Unrestricted-Signs.patch rename to Spigot-Server-Patches/0278-Configurable-Unrestricted-Signs.patch index 858cc0dd68..c29d9d7de5 100644 --- a/Spigot-Server-Patches/0279-Configurable-Unrestricted-Signs.patch +++ b/Spigot-Server-Patches/0278-Configurable-Unrestricted-Signs.patch @@ -1,4 +1,4 @@ -From d5469b0d39edc94565e0f6558b4ffb2e1636187b Mon Sep 17 00:00:00 2001 +From b0972764eddda27e7f6ff9e0f55f2fecda2bb046 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Mar 2018 19:57:10 -0400 Subject: [PATCH] Configurable Unrestricted Signs @@ -18,7 +18,7 @@ Creative servers should absolutely never enable this. Non creative servers, enable at own risk!!! diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 3f2c5b2d5..67bd3bcbe 100644 +index 3f2c5b2d..67bd3bcb 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -38,7 +38,7 @@ public class TileEntitySign extends TileEntity { @@ -46,7 +46,7 @@ index 3f2c5b2d5..67bd3bcbe 100644 + public interface ISignCommandListener extends ICommandListener {} // Paper } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 090a4d2f2..74d684506 100644 +index e86c1675..6095948e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -175,6 +175,7 @@ public final class CraftServer implements Server { @@ -79,5 +79,5 @@ index 090a4d2f2..74d684506 100644 } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0280-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0279-Fix-Dragon-Server-Crashes.patch similarity index 92% rename from Spigot-Server-Patches/0280-Fix-Dragon-Server-Crashes.patch rename to Spigot-Server-Patches/0279-Fix-Dragon-Server-Crashes.patch index a831d614bd..0987b05fb3 100644 --- a/Spigot-Server-Patches/0280-Fix-Dragon-Server-Crashes.patch +++ b/Spigot-Server-Patches/0279-Fix-Dragon-Server-Crashes.patch @@ -1,4 +1,4 @@ -From 5f1caeb5976c2ad194ad44ff269bea5caf7b39b4 Mon Sep 17 00:00:00 2001 +From bd0e9f4b5282b25360b81d1949405051aca3d6aa Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Mar 2018 20:52:07 -0400 Subject: [PATCH] Fix Dragon Server Crashes @@ -7,7 +7,7 @@ If the dragon tries to find "ground" and hits a hole, or off edge, it will infinitely keep looking for non air and eventually crash. diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java -index 054a7ef6c..deee5c4cc 100644 +index 054a7ef6..deee5c4c 100644 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java @@ -51,7 +51,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded @@ -20,5 +20,5 @@ index 054a7ef6c..deee5c4cc 100644 blockposition_mutableblockposition.c(MathHelper.floor(d0), MathHelper.floor(d2), MathHelper.floor(d1)); } -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0281-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0280-getPlayerUniqueId-API.patch similarity index 94% rename from Spigot-Server-Patches/0281-getPlayerUniqueId-API.patch rename to Spigot-Server-Patches/0280-getPlayerUniqueId-API.patch index 284df16fba..d3aa38b8bf 100644 --- a/Spigot-Server-Patches/0281-getPlayerUniqueId-API.patch +++ b/Spigot-Server-Patches/0280-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 4f8924548dc2ad84bd261462e5419ab0c08705b4 Mon Sep 17 00:00:00 2001 +From 9b72cfcb95a129eab484671c09991b25381bcc85 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:40:24 -0400 Subject: [PATCH] getPlayerUniqueId API @@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6095948e8..80702f6f6 100644 +index 6095948e..80702f6f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1346,6 +1346,26 @@ public final class CraftServer implements Server { @@ -40,5 +40,5 @@ index 6095948e8..80702f6f6 100644 @Deprecated public OfflinePlayer getOfflinePlayer(String name) { -- -2.16.2 +2.14.3 diff --git a/Spigot-Server-Patches/0282-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0281-Make-player-data-saving-configurable.patch similarity index 93% rename from Spigot-Server-Patches/0282-Make-player-data-saving-configurable.patch rename to Spigot-Server-Patches/0281-Make-player-data-saving-configurable.patch index cba162d1fe..84f1ef94bb 100644 --- a/Spigot-Server-Patches/0282-Make-player-data-saving-configurable.patch +++ b/Spigot-Server-Patches/0281-Make-player-data-saving-configurable.patch @@ -1,11 +1,11 @@ -From 42d1033fe2a9acf0cc1fd264f30267e7922783dd Mon Sep 17 00:00:00 2001 +From 68cdd788988d3cce8fe37f10886f707df1a2ee22 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 26 Mar 2018 18:30:53 +0300 Subject: [PATCH] Make player data saving configurable diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index ec89ecfca..b602bbf12 100644 +index ec89ecfc..b602bbf1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -282,4 +282,13 @@ public class PaperConfig { @@ -23,7 +23,7 @@ index ec89ecfca..b602bbf12 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index eba1228fd..4e33cc2f2 100644 +index eba1228f..4e33cc2f 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -142,6 +142,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData { @@ -35,5 +35,5 @@ index eba1228fd..4e33cc2f2 100644 NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound()); File file = new File(this.playerDir, entityhuman.bn() + ".dat.tmp"); -- -2.16.3 +2.14.3 diff --git a/Spigot-Server-Patches/0283-Make-the-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0282-Make-the-legacy-ping-handler-more-reliable.patch similarity index 98% rename from Spigot-Server-Patches/0283-Make-the-legacy-ping-handler-more-reliable.patch rename to Spigot-Server-Patches/0282-Make-the-legacy-ping-handler-more-reliable.patch index c1aa1a8d15..3afbc5a02f 100644 --- a/Spigot-Server-Patches/0283-Make-the-legacy-ping-handler-more-reliable.patch +++ b/Spigot-Server-Patches/0282-Make-the-legacy-ping-handler-more-reliable.patch @@ -1,4 +1,4 @@ -From 8e5a4d422205bd51108889a54cc0232b9c2595ce Mon Sep 17 00:00:00 2001 +From e5e2cd4ea0e1734564f236f55af9b40950da47db Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 18:22:50 +0200 Subject: [PATCH] Make the legacy ping handler more reliable @@ -28,7 +28,7 @@ respond to the request. [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java -index 4c1a0181a..f084a653a 100644 +index 4c1a0181..f084a653 100644 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java @@ -14,6 +14,7 @@ public class LegacyPingHandler extends ChannelInboundHandlerAdapter { @@ -153,5 +153,5 @@ index 4c1a0181a..f084a653a 100644 channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE); } -- -2.16.3 +2.14.3 diff --git a/Spigot-Server-Patches/0284-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0283-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 98% rename from Spigot-Server-Patches/0284-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to Spigot-Server-Patches/0283-Call-PaperServerListPingEvent-for-legacy-pings.patch index 257eb106b3..a31c761506 100644 --- a/Spigot-Server-Patches/0284-Call-PaperServerListPingEvent-for-legacy-pings.patch +++ b/Spigot-Server-Patches/0283-Call-PaperServerListPingEvent-for-legacy-pings.patch @@ -1,4 +1,4 @@ -From ef980d38e4f0edea3e20cdc1b4bfb27f78a2fe7f Mon Sep 17 00:00:00 2001 +From 0f653c3c6e5b1cc21be1d517c236236820a4d549 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 19:30:51 +0200 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings @@ -6,7 +6,7 @@ Subject: [PATCH] Call PaperServerListPingEvent for legacy pings diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java new file mode 100644 -index 000000000..74c012fd4 +index 00000000..74c012fd --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java @@ -0,0 +1,73 @@ @@ -84,7 +84,7 @@ index 000000000..74c012fd4 + +} diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java -index f084a653a..39d19e91b 100644 +index f084a653..39d19e91 100644 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java @@ -9,6 +9,7 @@ import java.net.InetSocketAddress; @@ -153,5 +153,5 @@ index f084a653a..39d19e91b 100644 } -- -2.16.3 +2.14.3 diff --git a/Spigot-Server-Patches/0285-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0284-Flag-to-disable-the-channel-limit.patch similarity index 94% rename from Spigot-Server-Patches/0285-Flag-to-disable-the-channel-limit.patch rename to Spigot-Server-Patches/0284-Flag-to-disable-the-channel-limit.patch index 31b8b46889..64a9081ce3 100644 --- a/Spigot-Server-Patches/0285-Flag-to-disable-the-channel-limit.patch +++ b/Spigot-Server-Patches/0284-Flag-to-disable-the-channel-limit.patch @@ -1,4 +1,4 @@ -From c935ab9de2fc167f1a59d13595b327d84f23637b Mon Sep 17 00:00:00 2001 +From 2edffdfd3deece0bf7c81be7d36754bc6483d022 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 31 Mar 2018 17:04:26 +0100 Subject: [PATCH] Flag to disable the channel limit @@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs. provide an optional flag to disable this check, at your own risk. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1e73a3308..fd47065c6 100644 +index 1e73a330..fd47065c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -93,6 +93,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -30,5 +30,5 @@ index 1e73a3308..fd47065c6 100644 server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel)); } -- -2.16.3 +2.14.3