From 7f12781017d4dfbf3f1c483cfbcaf3657786d17c Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 18 Nov 2017 03:04:21 +0000 Subject: [PATCH] Update B/CB/S --- ...upstream-javadoc-warnings-and-errors.patch | 20 +++++------ .../0002-Paper-config-files.patch | 34 +++++++++---------- Spigot-Server-Patches/0006-Timings-v2.patch | 6 ++-- ...020-Further-improve-server-tick-loop.patch | 10 +++--- .../0022-Add-async-chunk-load-API.patch | 8 ++--- ...49-Ensure-commands-are-not-ran-async.patch | 8 ++--- .../0053-Expose-server-CommandMap.patch | 8 ++--- .../0059-Add-velocity-warnings.patch | 12 +++---- ...ading-permissions.yml-before-plugins.patch | 10 +++--- ...llow-Reloading-of-Custom-Permissions.patch | 8 ++--- .../0070-Remove-Metadata-on-reload.patch | 8 ++--- ...le-Keep-Spawn-Loaded-range-per-world.patch | 12 +++---- ...unk-Unloads-based-on-Player-Movement.patch | 10 +++--- ...setting-for-proxy-online-mode-status.patch | 8 ++--- ...0-Allow-Reloading-of-Command-Aliases.patch | 8 ++--- .../0193-Enforce-Sync-Chunk-Unloads.patch | 10 +++--- ...n-option-to-prevent-player-names-fro.patch | 8 ++--- ...oleAppender-for-console-improvements.patch | 6 ++-- .../0215-Add-UnknownCommandEvent.patch | 8 ++--- .../0216-Shoulder-Entities-Release-API.patch | 8 ++--- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 23 files changed, 108 insertions(+), 108 deletions(-) diff --git a/Spigot-API-Patches/0052-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0052-Fix-upstream-javadoc-warnings-and-errors.patch index ae7ab21184..c2d44bbdb4 100644 --- a/Spigot-API-Patches/0052-Fix-upstream-javadoc-warnings-and-errors.patch +++ b/Spigot-API-Patches/0052-Fix-upstream-javadoc-warnings-and-errors.patch @@ -1,4 +1,4 @@ -From 3a264c354815e0a8cd58ef749c5d8311a9b71429 Mon Sep 17 00:00:00 2001 +From c951f10585428331ded76330d1363aef859b66b5 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 10 Jun 2017 16:59:40 -0500 Subject: [PATCH] Fix upstream javadoc warnings and errors @@ -21,10 +21,10 @@ index 9597a9d8..478f2c3c 100644 */ @Deprecated diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 4abdbadf..dd0dcb16 100644 +index 68388416..c69619da 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1395,6 +1395,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1405,6 +1405,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param count the number of particles * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -32,7 +32,7 @@ index 4abdbadf..dd0dcb16 100644 */ public void spawnParticle(Particle particle, Location location, int count, T data); -@@ -1410,6 +1411,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1420,6 +1421,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param count the number of particles * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -40,7 +40,7 @@ index 4abdbadf..dd0dcb16 100644 */ public void spawnParticle(Particle particle, double x, double y, double z, int count, T data); -@@ -1459,6 +1461,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1469,6 +1471,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param offsetZ the maximum random offset on the Z axis * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -48,7 +48,7 @@ index 4abdbadf..dd0dcb16 100644 */ public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data); -@@ -1478,6 +1481,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1488,6 +1491,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param offsetZ the maximum random offset on the Z axis * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -56,7 +56,7 @@ index 4abdbadf..dd0dcb16 100644 */ public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data); -@@ -1533,6 +1537,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1543,6 +1547,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * particle used (normally speed) * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -64,7 +64,7 @@ index 4abdbadf..dd0dcb16 100644 */ public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data); -@@ -1554,6 +1559,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1564,6 +1569,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * particle used (normally speed) * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -280,7 +280,7 @@ index c8e68570..45431b36 100644 void setRecipe(int i, MerchantRecipe recipe) throws IndexOutOfBoundsException; diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java -index 7aa5a2d1..54d85d0c 100644 +index 1413b361..b4a8051c 100644 --- a/src/main/java/org/bukkit/potion/Potion.java +++ b/src/main/java/org/bukkit/potion/Potion.java @@ -78,6 +78,7 @@ public class Potion { @@ -348,5 +348,5 @@ index 170ae21a..c0de37a7 100644 ChatColor getColor() throws IllegalStateException; -- -2.14.1 +2.15.0 diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch index e50ae66d53..b9585759b1 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -1,4 +1,4 @@ -From cb7d77b69a13ca1dfe6edd5e2eb97502481e66e4 Mon Sep 17 00:00:00 2001 +From 70528653756975b3b743d0ce9f5ab727b70036c0 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 21:02:09 -0600 Subject: [PATCH] Paper config files @@ -6,7 +6,7 @@ Subject: [PATCH] Paper config files diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java new file mode 100644 -index 00000000..ecd1c65a +index 000000000..ecd1c65a9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -0,0 +1,193 @@ @@ -205,7 +205,7 @@ index 00000000..ecd1c65a +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java new file mode 100644 -index 00000000..3d8ee9ed +index 000000000..3d8ee9ed3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -0,0 +1,173 @@ @@ -384,7 +384,7 @@ index 00000000..3d8ee9ed +} diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java new file mode 100644 -index 00000000..621bf705 +index 000000000..621bf7051 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -0,0 +1,66 @@ @@ -455,7 +455,7 @@ index 00000000..621bf705 + } +} diff --git a/src/main/java/net/minecraft/server/CommandAbstract.java b/src/main/java/net/minecraft/server/CommandAbstract.java -index 76501e29..76bf04f5 100644 +index 76501e299..76bf04f56 100644 --- a/src/main/java/net/minecraft/server/CommandAbstract.java +++ b/src/main/java/net/minecraft/server/CommandAbstract.java @@ -634,6 +634,7 @@ public abstract class CommandAbstract implements ICommand { @@ -467,7 +467,7 @@ index 76501e29..76bf04f5 100644 return a(astring, (Collection) Arrays.asList(astring1)); } diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 8c5361d6..e1cb96a8 100644 +index 8c5361d61..e1cb96a88 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -184,6 +184,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -482,7 +482,7 @@ index 8c5361d6..e1cb96a8 100644 DedicatedServer.LOGGER.info("Generating keypair"); this.a(MinecraftEncryption.b()); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index c2da96ea..8181ab2f 100644 +index b944be5c5..40f06c5bc 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -122,9 +122,9 @@ public abstract class Entity implements ICommandListener { @@ -499,7 +499,7 @@ index c2da96ea..8181ab2f 100644 public boolean impulse; public int portalCooldown; diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index eb6a955e..77b81a57 100644 +index eb6a955e3..77b81a575 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -21,6 +21,7 @@ public class EntityTypes { @@ -519,7 +519,7 @@ index eb6a955e..77b81a57 100644 return EntityTypes.d; } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index f62e7d9e..dbfed7c6 100644 +index f62e7d9e4..dbfed7c62 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -129,6 +129,8 @@ public abstract class World implements IBlockAccess { @@ -540,10 +540,10 @@ index f62e7d9e..dbfed7c6 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 814be6ee..37e3c14f 100644 +index e374e0fc1..18c62b20f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -702,6 +702,7 @@ public final class CraftServer implements Server { +@@ -700,6 +700,7 @@ public final class CraftServer implements Server { } org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot @@ -551,7 +551,7 @@ index 814be6ee..37e3c14f 100644 for (WorldServer world : console.worlds) { world.worldData.setDifficulty(difficulty); world.setSpawnFlags(monsters, animals); -@@ -717,6 +718,7 @@ public final class CraftServer implements Server { +@@ -715,6 +716,7 @@ public final class CraftServer implements Server { world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns(); } world.spigotConfig.init(); // Spigot @@ -559,7 +559,7 @@ index 814be6ee..37e3c14f 100644 } pluginManager.clearPlugins(); -@@ -724,6 +726,7 @@ public final class CraftServer implements Server { +@@ -722,6 +724,7 @@ public final class CraftServer implements Server { resetRecipes(); reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot @@ -567,7 +567,7 @@ index 814be6ee..37e3c14f 100644 overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*"); int pollCount = 0; -@@ -1786,4 +1789,26 @@ public final class CraftServer implements Server { +@@ -1784,4 +1787,26 @@ public final class CraftServer implements Server { { return spigot; } @@ -595,7 +595,7 @@ index 814be6ee..37e3c14f 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index a151451d..0c5862a3 100644 +index a151451d5..0c5862a3f 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -126,6 +126,14 @@ public class Main { @@ -614,7 +614,7 @@ index a151451d..0c5862a3 100644 }; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 01e73eb8..0b66f5e3 100644 +index 01e73eb89..0b66f5e35 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -39,31 +39,31 @@ public class SpigotWorldConfig @@ -655,5 +655,5 @@ index 01e73eb8..0b66f5e3 100644 config.addDefault( "world-settings.default." + path, def ); return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) ); -- -2.14.2.windows.2 +2.15.0 diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch index f3a7c62071..aa7c0796b6 100644 --- a/Spigot-Server-Patches/0006-Timings-v2.patch +++ b/Spigot-Server-Patches/0006-Timings-v2.patch @@ -1,4 +1,4 @@ -From 590ff828fdcfe1708f7f5dff3066d1017bad2cd1 Mon Sep 17 00:00:00 2001 +From a3d4b5574fd08f8f3ddeb6a99e82af21cecd175a Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -1388,10 +1388,10 @@ index d4f25cbf2..e492913a2 100644 // CraftBukkit start diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 37e3c14fd..fa6a74474 100644 +index 18c62b20f..cdef8254f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1759,12 +1759,31 @@ public final class CraftServer implements Server { +@@ -1757,12 +1757,31 @@ public final class CraftServer implements Server { private final Spigot spigot = new Spigot() { diff --git a/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch index 072107a255..e1e0240b1f 100644 --- a/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From 1639601e8c6aac033e2395d2c6b80dd1ff1c1d91 Mon Sep 17 00:00:00 2001 +From 58b45080e2438562356f599536095115a997929c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 42abdfe12..f4d0e2678 100644 +index 92d480251..47fe9262a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -114,16 +114,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -147,10 +147,10 @@ index 42abdfe12..f4d0e2678 100644 } lastTick = curTime; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 588521ff2..80e175e59 100644 +index e540650bc..22650a566 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1756,6 +1756,17 @@ public final class CraftServer implements Server { +@@ -1754,6 +1754,17 @@ public final class CraftServer implements Server { return CraftMagicNumbers.INSTANCE; } @@ -210,5 +210,5 @@ index be2e31dea..6d21c3269 100644 return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString() + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 ); -- -2.14.1.windows.1 +2.15.0 diff --git a/Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch index c17daf5a76..557f2b62e7 100644 --- a/Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch +++ b/Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch @@ -1,14 +1,14 @@ -From a35538236be21ec093715779bf57044a413516f3 Mon Sep 17 00:00:00 2001 +From f647a0ac1262878131e46148d82bd16ec24a0d10 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:19:01 -0600 Subject: [PATCH] Add async chunk load API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 822d73b9e..f65611a6a 100644 +index ef8165da4..01fc193db 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -127,6 +127,26 @@ public class CraftWorld implements World { +@@ -134,6 +134,26 @@ public class CraftWorld implements World { } } @@ -36,5 +36,5 @@ index 822d73b9e..f65611a6a 100644 return this.world.getChunkProviderServer().getChunkAt(x, z).bukkitChunk; } -- -2.12.2 +2.15.0 diff --git a/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch index 3fb97f785b..7a6b80483a 100644 --- a/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch +++ b/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch @@ -1,4 +1,4 @@ -From f9c8c46b3ae377cf61f8102d5e85cd52469efc6a Mon Sep 17 00:00:00 2001 +From 481937be155c07c0370e1fa3ee51972ae389deea Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 01:17:12 -0600 Subject: [PATCH] Ensure commands are not ran async @@ -48,10 +48,10 @@ index da25a8bea..5348c0cbc 100644 } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) { // Do nothing, this is coming from a plugin diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 80e175e59..7762cb432 100644 +index 22650a566..82f7109f1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -648,6 +648,29 @@ public final class CraftServer implements Server { +@@ -646,6 +646,29 @@ public final class CraftServer implements Server { Validate.notNull(sender, "Sender cannot be null"); Validate.notNull(commandLine, "CommandLine cannot be null"); @@ -82,5 +82,5 @@ index 80e175e59..7762cb432 100644 return true; } -- -2.14.3 +2.15.0 diff --git a/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch index ff694b99ed..cee1599f76 100644 --- a/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch +++ b/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch @@ -1,14 +1,14 @@ -From 44bc7fe619551870a5daa7f128492b764192a0cd Mon Sep 17 00:00:00 2001 +From 8487682f04e645c429b467724850d3829dc94146 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:15:57 -0600 Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 7762cb432..59ead80b0 100644 +index 82f7109f1..5ede2abf1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1567,6 +1567,7 @@ public final class CraftServer implements Server { +@@ -1565,6 +1565,7 @@ public final class CraftServer implements Server { return helpMap; } @@ -17,5 +17,5 @@ index 7762cb432..59ead80b0 100644 return commandMap; } -- -2.14.1.windows.1 +2.15.0 diff --git a/Spigot-Server-Patches/0059-Add-velocity-warnings.patch b/Spigot-Server-Patches/0059-Add-velocity-warnings.patch index dfabed4d24..04854f2707 100644 --- a/Spigot-Server-Patches/0059-Add-velocity-warnings.patch +++ b/Spigot-Server-Patches/0059-Add-velocity-warnings.patch @@ -1,15 +1,15 @@ -From 7089660ba58e4cb240c3a9a27e0f827ebbb9f977 Mon Sep 17 00:00:00 2001 +From d2b16855722957ca07e8f2c2baab169bb9d012f8 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:48:12 -0600 Subject: [PATCH] Add velocity warnings diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4ed92a652..52a03a2c5 100644 +index 5ede2abf1..5a054148c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -176,6 +176,7 @@ public final class CraftServer implements Server { - private final UUID invalidUserUUID = UUID.nameUUIDFromBytes("InvalidUsername".getBytes(Charsets.UTF_8)); +@@ -174,6 +174,7 @@ public final class CraftServer implements Server { + private boolean unrestrictedAdvancements; private final List playerView; public int reloadCount; + public static Exception excessiveVelEx; // Paper - Velocity warnings @@ -17,7 +17,7 @@ index 4ed92a652..52a03a2c5 100644 private final class BooleanWrapper { private boolean value = true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 9ee7593b2..437c3da11 100644 +index 0f38abaf8..8628cd5a2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -240,12 +240,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -91,5 +91,5 @@ index 3ed983cc0..6384d50e7 100644 log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log ); -- -2.13.0 +2.15.0 diff --git a/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch index 6f5a947e73..9e02e458d2 100644 --- a/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch +++ b/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch @@ -1,4 +1,4 @@ -From 67655fe56970c3f18883964c6563000ad398b929 Mon Sep 17 00:00:00 2001 +From 050ec3e7ee6b02af1e66d33480c4372757f673a3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:17:38 -0400 Subject: [PATCH] Default loading permissions.yml before plugins @@ -30,10 +30,10 @@ index 3898ad8fa..2f6e169f5 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 49f14e495..04ff4a555 100644 +index 5a054148c..4aba8dab8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -325,6 +325,7 @@ public final class CraftServer implements Server { +@@ -323,6 +323,7 @@ public final class CraftServer implements Server { if (type == PluginLoadOrder.STARTUP) { helpMap.clear(); helpMap.initializeGeneralTopics(); @@ -41,7 +41,7 @@ index 49f14e495..04ff4a555 100644 } Plugin[] plugins = pluginManager.getPlugins(); -@@ -342,7 +343,7 @@ public final class CraftServer implements Server { +@@ -340,7 +341,7 @@ public final class CraftServer implements Server { setVanillaCommands(false); // Spigot end commandMap.registerServerAliases(); @@ -51,5 +51,5 @@ index 49f14e495..04ff4a555 100644 CraftDefaultPermissions.registerCorePermissions(); helpMap.initializeCommands(); -- -2.14.1.windows.1 +2.15.0 diff --git a/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch index bf6c8e19e2..0d0a0949c6 100644 --- a/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch @@ -1,4 +1,4 @@ -From 0b85bd49b7813d26cad70e517f5e293cb9fd1980 Mon Sep 17 00:00:00 2001 +From 84ee34067cf36f3c0f9287d4bba0972149e44b5e Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:30:17 -0400 Subject: [PATCH] Allow Reloading of Custom Permissions @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions https://github.com/PaperMC/Paper/issues/49 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 04ff4a555..7be225421 100644 +index 4aba8dab8..411b8129c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1866,5 +1866,20 @@ public final class CraftServer implements Server { +@@ -1864,5 +1864,20 @@ public final class CraftServer implements Server { return false; } } @@ -31,5 +31,5 @@ index 04ff4a555..7be225421 100644 // Paper end } -- -2.14.1.windows.1 +2.15.0 diff --git a/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch index 635bcc5000..7629af5f35 100644 --- a/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch +++ b/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch @@ -1,4 +1,4 @@ -From ab2d474cfd44d63c2dbc39e265e85838e6d115a7 Mon Sep 17 00:00:00 2001 +From 69c29f2b3c037fa0dca834c89951d06b5d6ce765 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:50:14 -0400 Subject: [PATCH] Remove Metadata on reload @@ -7,10 +7,10 @@ Metadata is not meant to persist reload as things break badly with non primitive This will remove metadata on reload so it does not crash everything if a plugin uses it. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 7be225421..d0ec4e0bf 100644 +index 411b8129c..ed4ddb86a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -746,8 +746,18 @@ public final class CraftServer implements Server { +@@ -744,8 +744,18 @@ public final class CraftServer implements Server { world.paperConfig.init(); // Paper } @@ -30,5 +30,5 @@ index 7be225421..d0ec4e0bf 100644 reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot -- -2.14.1.windows.1 +2.15.0 diff --git a/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch index a8818b1ac7..e3db05f643 100644 --- a/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From d8ab597298a1901854bf1ba603ec6d52d7b8f481 Mon Sep 17 00:00:00 2001 +From 4ed7d6240915b4157d0dbe0ab537b4e76061f120 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world @@ -54,10 +54,10 @@ index f7987bb7b..641a1d7dd 100644 public void a(Packet packet) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d0ec4e0bf..5e37b54ae 100644 +index ed4ddb86a..a820c4335 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -964,7 +964,7 @@ public final class CraftServer implements Server { +@@ -962,7 +962,7 @@ public final class CraftServer implements Server { System.out.print("Preparing start region for level " + (console.worlds.size() - 1) + " (Seed: " + internal.getSeed() + ")"); if (internal.getWorld().getKeepSpawnInMemory()) { @@ -67,10 +67,10 @@ index d0ec4e0bf..5e37b54ae 100644 for (int j = -short1; j <= short1; j += 16) { for (int k = -short1; k <= short1; k += 16) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 357b59a26..51af32488 100644 +index 01fc193db..69dc11e2b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1276,8 +1276,9 @@ public class CraftWorld implements World { +@@ -1283,8 +1283,9 @@ public class CraftWorld implements World { int chunkCoordX = chunkcoordinates.getX() >> 4; int chunkCoordZ = chunkcoordinates.getZ() >> 4; // Cycle through the 25x25 Chunks around it to load/unload the chunks. @@ -83,5 +83,5 @@ index 357b59a26..51af32488 100644 loadChunk(chunkCoordX + x, chunkCoordZ + z); } else { -- -2.14.2 +2.15.0 diff --git a/Spigot-Server-Patches/0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch index e00377a2a6..21017de0b8 100644 --- a/Spigot-Server-Patches/0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -1,4 +1,4 @@ -From 9c77fdd6a8501f3abe70d50ece73744b47e8e176 Mon Sep 17 00:00:00 2001 +From 4fb7473b93210a52d08f546a4fcfcc3d819f7c6b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Jun 2016 23:22:12 -0400 Subject: [PATCH] Delay Chunk Unloads based on Player Movement @@ -35,7 +35,7 @@ index d5d6e7fcd..ef60c15bd 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 0845d1ffe..a0b5cd56b 100644 +index 2ef70d324..44f54cbd1 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -30,6 +30,7 @@ public class Chunk { @@ -127,10 +127,10 @@ index 0a0b5261b..14ea89c91 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 51af32488..67cb2230b 100644 +index 69dc11e2b..284dc6391 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1569,7 +1569,7 @@ public class CraftWorld implements World { +@@ -1576,7 +1576,7 @@ public class CraftWorld implements World { ChunkProviderServer cps = world.getChunkProviderServer(); for (net.minecraft.server.Chunk chunk : cps.chunks.values()) { // If in use, skip it @@ -140,5 +140,5 @@ index 51af32488..67cb2230b 100644 } -- -2.14.2 +2.15.0 diff --git a/Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch index ddfeb14a15..b006f29fe3 100644 --- a/Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch +++ b/Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch @@ -1,4 +1,4 @@ -From 451bf9278c72ef0d1b95229787cd23f7530eb955 Mon Sep 17 00:00:00 2001 +From 12f33b01c48ffab95a36255308843a2fc11027b8 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Fri, 5 Aug 2016 01:03:08 +0200 Subject: [PATCH] Add setting for proxy online mode status @@ -33,10 +33,10 @@ index b943a9b20..8f3b93dc1 100644 } else { String[] astring1 = astring; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5e37b54ae..d40b13c6e 100644 +index a820c4335..1bc394ada 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1338,7 +1338,8 @@ public final class CraftServer implements Server { +@@ -1336,7 +1336,8 @@ public final class CraftServer implements Server { // Spigot Start GameProfile profile = null; // Only fetch an online UUID in online mode @@ -47,5 +47,5 @@ index 5e37b54ae..d40b13c6e 100644 profile = console.getUserCache().getProfile( name ); } -- -2.14.1.windows.1 +2.15.0 diff --git a/Spigot-Server-Patches/0170-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0170-Allow-Reloading-of-Command-Aliases.patch index bac6b8f06b..9ffe56daed 100644 --- a/Spigot-Server-Patches/0170-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-Server-Patches/0170-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From 0d2536e60ec8f1c70ca0fe5df04dcb65e123f3c4 Mon Sep 17 00:00:00 2001 +From f9e9f1781bdcaa1043638e0e18324cec41cb9978 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:21:52 -0500 Subject: [PATCH] Allow Reloading of Command Aliases @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d40b13c6e..5bbb09c9d 100644 +index 1bc394ada..15d572489 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1892,5 +1892,24 @@ public final class CraftServer implements Server { +@@ -1890,5 +1890,24 @@ public final class CraftServer implements Server { }); } } @@ -35,5 +35,5 @@ index d40b13c6e..5bbb09c9d 100644 // Paper end } -- -2.14.2 +2.15.0 diff --git a/Spigot-Server-Patches/0193-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0193-Enforce-Sync-Chunk-Unloads.patch index 664ae35ce7..e3b90d69df 100644 --- a/Spigot-Server-Patches/0193-Enforce-Sync-Chunk-Unloads.patch +++ b/Spigot-Server-Patches/0193-Enforce-Sync-Chunk-Unloads.patch @@ -1,4 +1,4 @@ -From e0ec8707f50d33935695640662191784cd43b345 Mon Sep 17 00:00:00 2001 +From e32694bb0eb4b6de4e7872f9a1377d4dadbccadb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 16:06:44 -0500 Subject: [PATCH] Enforce Sync Chunk Unloads @@ -7,10 +7,10 @@ Unloading Chunks async is extremely dangerous. This will force it to main the same way we handle async chunk loads. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 00dd2976d..1f37fa47e 100644 +index 2e78cd8cf..4ffe0d208 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -238,6 +238,7 @@ public class CraftWorld implements World { +@@ -245,6 +245,7 @@ public class CraftWorld implements World { } private boolean unloadChunk0(int x, int z, boolean save) { @@ -18,7 +18,7 @@ index 00dd2976d..1f37fa47e 100644 net.minecraft.server.Chunk chunk = world.getChunkProviderServer().getChunkIfLoaded(x, z); if (chunk == null) { return true; -@@ -245,6 +246,7 @@ public class CraftWorld implements World { +@@ -252,6 +253,7 @@ public class CraftWorld implements World { // If chunk had previously been queued to save, must do save to avoid loss of that data return world.getChunkProviderServer().unloadChunk(chunk, chunk.mustSave || save); @@ -27,5 +27,5 @@ index 00dd2976d..1f37fa47e 100644 public boolean regenerateChunk(int x, int z) { -- -2.14.2 +2.15.0 diff --git a/Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch index d1768628c9..7a3e89a411 100644 --- a/Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From 7562e2d3ed8337b1719e1657bc3aa47cb59fa525 Mon Sep 17 00:00:00 2001 +From 8ea05fcb53e23086119334e50f63d165ede7d0d8 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 @@ -20,10 +20,10 @@ index 28917f63d..f4b237034 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5bbb09c9d..5c36e7373 100644 +index 15d572489..3cdce9d03 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1911,5 +1911,10 @@ public final class CraftServer implements Server { +@@ -1909,5 +1909,10 @@ public final class CraftServer implements Server { commandMap.registerServerAliases(); return true; } @@ -35,5 +35,5 @@ index 5bbb09c9d..5c36e7373 100644 // Paper end } -- -2.14.2 +2.15.0 diff --git a/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch index 56c7b3f3c4..bd9519fb1a 100644 --- a/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -1,4 +1,4 @@ -From 27b8e8006467d688fc595a134d1c96611e6b35e0 Mon Sep 17 00:00:00 2001 +From 299cd31c9f50d9193d79effc7c0cad2ab7fe3c4c 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 @@ -304,7 +304,7 @@ index b8a0b67a9..ebca377e5 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 5c36e7373..cb4b78e0e 100644 +index 3cdce9d03..106dc7b29 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; @@ -315,7 +315,7 @@ index 5c36e7373..cb4b78e0e 100644 import org.apache.commons.lang.StringUtils; import org.bukkit.NamespacedKey; import org.bukkit.craftbukkit.util.CraftNamespacedKey; -@@ -1097,9 +1096,13 @@ public final class CraftServer implements Server { +@@ -1095,9 +1094,13 @@ public final class CraftServer implements Server { return logger; } diff --git a/Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch index 8b3cf528d2..e900011530 100644 --- a/Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch +++ b/Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch @@ -1,11 +1,11 @@ -From 5b2ed90994ae4807e6bebb72d1743bc11004989c Mon Sep 17 00:00:00 2001 +From 2780e985421f6fdeab70e6a8f2e5c4a07a6a3d04 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 cb4b78e0e..b42f4e9ee 100644 +index 106dc7b29..aa098172f 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; @@ -16,7 +16,7 @@ index cb4b78e0e..b42f4e9ee 100644 import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.player.PlayerChatTabCompleteEvent; import org.bukkit.event.server.BroadcastMessageEvent; -@@ -678,7 +679,13 @@ public final class CraftServer implements Server { +@@ -676,7 +677,13 @@ public final class CraftServer implements Server { // Spigot start if (StringUtils.isNotEmpty(org.spigotmc.SpigotConfig.unknownCommandMessage)) { @@ -32,5 +32,5 @@ index cb4b78e0e..b42f4e9ee 100644 // Spigot end -- -2.14.2 +2.15.0 diff --git a/Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch index 4322a009b5..8e05856bbb 100644 --- a/Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch +++ b/Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch @@ -1,4 +1,4 @@ -From fd50e8c234f34928d2926eb6f8afb399d8846b27 Mon Sep 17 00:00:00 2001 +From bcf1547ff23132599a6a275ded14ae88c49823a6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 15:18:30 -0400 Subject: [PATCH] Shoulder Entities Release API @@ -62,10 +62,10 @@ index a8f5117bc..e9f48ecad 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 90df0ae1c..4cce0920e 100644 +index c6f219a4f..ee925cae1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -@@ -441,6 +441,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { +@@ -444,6 +444,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { getHandle().getCooldownTracker().a(CraftMagicNumbers.getItem(material), ticks); } @@ -99,5 +99,5 @@ index 90df0ae1c..4cce0920e 100644 public org.bukkit.entity.Entity getShoulderEntityLeft() { if (!getHandle().getShoulderEntityLeft().isEmpty()) { -- -2.14.2 +2.15.0 diff --git a/work/Bukkit b/work/Bukkit index dceaeb8e5f..6198e69596 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit dceaeb8e5f0abe7095262066c2bd9837dbafe61e +Subproject commit 6198e695966d0552ccf57d3ab6dcae2e19813de4 diff --git a/work/CraftBukkit b/work/CraftBukkit index c15d869440..dccd2763bd 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit c15d8694401f4982c69c5762852210255ee9703a +Subproject commit dccd2763bdc357d2b5f6e9d59729e6ac7e99135f diff --git a/work/Spigot b/work/Spigot index 7129aebca8..3d850ecdfb 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 7129aebca83ef1d79bb2d026da0b00649b3fc722 +Subproject commit 3d850ecdfb011d0315b6d0d506e4149c6da8233d