From ae98591b8cb6174ba52b4ba6bcdec0dfd264061b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 17 Feb 2017 20:03:38 -0600 Subject: [PATCH] Update upstream B/CB/S --- Spigot-API-Patches/0003-Timings-v2.patch | 72 +++++++++---------- .../0004-Player-affects-spawning-API.patch | 6 +- .../0010-Add-player-view-distance-API.patch | 8 +-- ...cord-chat-API-from-spigot-subclasses.patch | 10 +-- .../0017-Player-Tab-List-and-Title-APIs.patch | 6 +- ...t-sendMessage-methods-to-CommandSend.patch | 8 +-- .../0022-Complete-resource-pack-API.patch | 8 +-- ...0043-Add-String-based-Action-Bar-API.patch | 12 ++-- Spigot-Server-Patches/0005-Timings-v2.patch | 68 +++++++++--------- .../0016-Player-affects-spawning-API.patch | 8 +-- ...021-Only-refresh-abilities-if-needed.patch | 6 +- .../0036-Add-player-view-distance-API.patch | 12 ++-- .../0056-Player-Tab-List-and-Title-APIs.patch | 8 +-- ...x-inter-world-teleportation-glitches.patch | 6 +- .../0066-Complete-resource-pack-API.patch | 10 +-- ...074-Handle-Item-Meta-Inconsistencies.patch | 29 ++++---- ...th-absorb-values-and-repair-bad-data.patch | 10 +-- .../0087-Don-t-teleport-dead-entities.patch | 6 +- ...nd-for-setting-passengers-on-players.patch | 6 +- ...20-Implement-PlayerLocaleChangeEvent.patch | 8 +-- ...38-Optional-old-TNT-cannon-behaviors.patch | 8 +-- .../0191-String-based-Action-Bar-API.patch | 10 +-- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 25 files changed, 165 insertions(+), 166 deletions(-) diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch index f239a4fc9b..fb22847ba7 100644 --- a/Spigot-API-Patches/0003-Timings-v2.patch +++ b/Spigot-API-Patches/0003-Timings-v2.patch @@ -1,4 +1,4 @@ -From 4f781ea0e66da6e77e8b22812bc9f480bb17f356 Mon Sep 17 00:00:00 2001 +From 6591bfa4e3eae377117aedd3105c793e13a268a9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 @@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2 diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java new file mode 100644 -index 00000000..4d8b633e +index 0000000..4d8b633 --- /dev/null +++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java @@ -0,0 +1,82 @@ @@ -94,7 +94,7 @@ index 00000000..4d8b633e +} diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java new file mode 100644 -index 00000000..8c43e206 +index 0000000..8c43e20 --- /dev/null +++ b/src/main/java/co/aikar/timings/NullTimingHandler.java @@ -0,0 +1,61 @@ @@ -161,7 +161,7 @@ index 00000000..8c43e206 +} diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java new file mode 100644 -index 00000000..96057fc7 +index 0000000..96057fc --- /dev/null +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java @@ -0,0 +1,81 @@ @@ -248,7 +248,7 @@ index 00000000..96057fc7 +} diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java new file mode 100644 -index 00000000..8b2d1b82 +index 0000000..8b2d1b8 --- /dev/null +++ b/src/main/java/co/aikar/timings/Timing.java @@ -0,0 +1,72 @@ @@ -326,7 +326,7 @@ index 00000000..8b2d1b82 +} diff --git a/src/main/java/co/aikar/timings/TimingData.java b/src/main/java/co/aikar/timings/TimingData.java new file mode 100644 -index 00000000..f222d6b7 +index 0000000..f222d6b --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingData.java @@ -0,0 +1,120 @@ @@ -452,7 +452,7 @@ index 00000000..f222d6b7 +} diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java new file mode 100644 -index 00000000..916b6f9d +index 0000000..916b6f9 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingHandler.java @@ -0,0 +1,209 @@ @@ -667,7 +667,7 @@ index 00000000..916b6f9d +} diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java new file mode 100644 -index 00000000..389875b3 +index 0000000..389875b --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingHistory.java @@ -0,0 +1,342 @@ @@ -1015,7 +1015,7 @@ index 00000000..389875b3 +} diff --git a/src/main/java/co/aikar/timings/TimingHistoryEntry.java b/src/main/java/co/aikar/timings/TimingHistoryEntry.java new file mode 100644 -index 00000000..0e114eb3 +index 0000000..0e114eb --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java @@ -0,0 +1,55 @@ @@ -1076,7 +1076,7 @@ index 00000000..0e114eb3 +} diff --git a/src/main/java/co/aikar/timings/TimingIdentifier.java b/src/main/java/co/aikar/timings/TimingIdentifier.java new file mode 100644 -index 00000000..623dda49 +index 0000000..623dda4 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingIdentifier.java @@ -0,0 +1,102 @@ @@ -1184,7 +1184,7 @@ index 00000000..623dda49 +} diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java new file mode 100644 -index 00000000..0571c9e7 +index 0000000..0571c9e --- /dev/null +++ b/src/main/java/co/aikar/timings/Timings.java @@ -0,0 +1,284 @@ @@ -1474,7 +1474,7 @@ index 00000000..0571c9e7 +} diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java new file mode 100644 -index 00000000..56b10e89 +index 0000000..56b10e8 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsCommand.java @@ -0,0 +1,119 @@ @@ -1599,7 +1599,7 @@ index 00000000..56b10e89 +} diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java new file mode 100644 -index 00000000..df7f4259 +index 0000000..df7f425 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -0,0 +1,342 @@ @@ -1947,7 +1947,7 @@ index 00000000..df7f4259 +} diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java new file mode 100644 -index 00000000..58ed35e0 +index 0000000..58ed35e --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsManager.java @@ -0,0 +1,196 @@ @@ -2149,7 +2149,7 @@ index 00000000..58ed35e0 +} diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java new file mode 100644 -index 00000000..e7c389c0 +index 0000000..e7c389c --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsReportListener.java @@ -0,0 +1,72 @@ @@ -2227,7 +2227,7 @@ index 00000000..e7c389c0 +} diff --git a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java new file mode 100644 -index 00000000..5edaba12 +index 0000000..5edaba1 --- /dev/null +++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java @@ -0,0 +1,51 @@ @@ -2284,7 +2284,7 @@ index 00000000..5edaba12 +} diff --git a/src/main/java/co/aikar/util/JSONUtil.java b/src/main/java/co/aikar/util/JSONUtil.java new file mode 100644 -index 00000000..5fdf7c4c +index 0000000..5fdf7c4 --- /dev/null +++ b/src/main/java/co/aikar/util/JSONUtil.java @@ -0,0 +1,123 @@ @@ -2413,7 +2413,7 @@ index 00000000..5fdf7c4c +} diff --git a/src/main/java/co/aikar/util/LoadingIntMap.java b/src/main/java/co/aikar/util/LoadingIntMap.java new file mode 100644 -index 00000000..79fa9d52 +index 0000000..79fa9d5 --- /dev/null +++ b/src/main/java/co/aikar/util/LoadingIntMap.java @@ -0,0 +1,70 @@ @@ -2489,7 +2489,7 @@ index 00000000..79fa9d52 +} diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java new file mode 100644 -index 00000000..a9f29199 +index 0000000..a9f2919 --- /dev/null +++ b/src/main/java/co/aikar/util/LoadingMap.java @@ -0,0 +1,332 @@ @@ -2827,7 +2827,7 @@ index 00000000..a9f29199 +} diff --git a/src/main/java/co/aikar/util/MRUMapCache.java b/src/main/java/co/aikar/util/MRUMapCache.java new file mode 100644 -index 00000000..3a288d2a +index 0000000..3a288d2 --- /dev/null +++ b/src/main/java/co/aikar/util/MRUMapCache.java @@ -0,0 +1,100 @@ @@ -2932,7 +2932,7 @@ index 00000000..3a288d2a + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 5b6413be..7fd544eb 100644 +index 5b6413b..7fd544e 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -538,7 +538,6 @@ public final class Bukkit { @@ -2944,7 +2944,7 @@ index 5b6413be..7fd544eb 100644 /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 120dba25..77cfe561 100644 +index 120dba2..77cfe56 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -943,12 +943,27 @@ public interface Server extends PluginMessageRecipient { @@ -2978,7 +2978,7 @@ index 120dba25..77cfe561 100644 * diff --git a/src/main/java/org/bukkit/command/BufferedCommandSender.java b/src/main/java/org/bukkit/command/BufferedCommandSender.java new file mode 100644 -index 00000000..fd452bce +index 0000000..fd452bc --- /dev/null +++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java @@ -0,0 +1,18 @@ @@ -3001,7 +3001,7 @@ index 00000000..fd452bce + } +} diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java -index 08a9739f..347d2189 100644 +index 08a9739..347d218 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java @@ -32,7 +32,8 @@ public abstract class Command { @@ -3031,7 +3031,7 @@ index 08a9739f..347d2189 100644 return true; } diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java -index 3f07d7f4..f89ad075 100644 +index 3f07d7f..f89ad07 100644 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java @@ -14,6 +14,7 @@ public class FormattedCommandAlias extends Command { @@ -3054,7 +3054,7 @@ index 3f07d7f4..f89ad075 100644 } diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java new file mode 100644 -index 00000000..66232339 +index 0000000..6623233 --- /dev/null +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java @@ -0,0 +1,99 @@ @@ -3158,7 +3158,7 @@ index 00000000..66232339 + } +} diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index 5965514a..466757b9 100644 +index 5965514..466757b 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -31,7 +31,7 @@ public class SimpleCommandMap implements CommandMap { @@ -3193,7 +3193,7 @@ index 5965514a..466757b9 100644 // Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false) diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java deleted file mode 100644 -index a8f61f2d..00000000 +index a8f61f2..0000000 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java +++ /dev/null @@ -1,253 +0,0 @@ @@ -3451,10 +3451,10 @@ index a8f61f2d..00000000 - // Spigot end -} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 5a2dc327..5fbad9f5 100644 +index 9ce3a5e..ee88f26 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1443,6 +1443,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1491,6 +1491,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); } @@ -3467,7 +3467,7 @@ index 5a2dc327..5fbad9f5 100644 Spigot spigot(); diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 10561864..4ee123e4 100644 +index 1056186..4ee123e 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -295,7 +295,6 @@ public final class SimplePluginManager implements PluginManager { @@ -3524,7 +3524,7 @@ index 10561864..4ee123e4 100644 } } diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 80c6a72e..759c4617 100644 +index 80c6a72..759c461 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -40,7 +40,6 @@ import org.bukkit.plugin.PluginLoader; @@ -3573,7 +3573,7 @@ index 80c6a72e..759c4617 100644 eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); } else { diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index 4cffa137..b2cbf9e4 100644 +index 4cffa13..b2cbf9e 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -15,7 +15,8 @@ import org.bukkit.plugin.PluginDescriptionFile; @@ -3587,7 +3587,7 @@ index 4cffa137..b2cbf9e4 100644 private final Map> classes = new java.util.concurrent.ConcurrentHashMap>(); // Spigot private final PluginDescriptionFile description; diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java -index 5ca863b3..04804706 100644 +index 5ca863b..0480470 100644 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java @@ -12,4 +12,6 @@ import org.bukkit.event.server.ServerListPingEvent; @@ -3599,7 +3599,7 @@ index 5ca863b3..04804706 100644 + public String getData(); // Spigot +} diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java -index 8d982974..7e89b97b 100644 +index 8d98297..7e89b97 100644 --- a/src/main/java/org/spigotmc/CustomTimingsHandler.java +++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java @@ -1,165 +1,76 @@ @@ -3829,5 +3829,5 @@ index 8d982974..7e89b97b 100644 - } } -- -2.11.0 +2.9.3 diff --git a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch index bdd8d4c231..5a93e900ec 100644 --- a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch +++ b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch @@ -1,14 +1,14 @@ -From 080e5d215fc7add653dfa942b37b83683798f474 Mon Sep 17 00:00:00 2001 +From 018db8157353aedb75b2ee059924eff54229fbaa Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Mon, 29 Feb 2016 17:22:34 -0600 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 5fbad9f..366d1ae 100644 +index ee88f26..98d3520 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1332,6 +1332,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1380,6 +1380,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data); diff --git a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch index 4d8ac9cba7..0dc97bde45 100644 --- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch +++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch @@ -1,14 +1,14 @@ -From 87d8e5e8a31d66af1e7ff8eaa2655fbeed5e0f47 Mon Sep 17 00:00:00 2001 +From 9c22321ff1ec4a12a4d82957cc689f8493cb99cc Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:05:37 -0600 Subject: [PATCH] Add player view distance API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 366d1ae8..6f9836cd 100644 +index 98d3520..845fa88 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1346,6 +1346,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1394,6 +1394,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void setAffectsSpawning(boolean affects); @@ -30,5 +30,5 @@ index 366d1ae8..6f9836cd 100644 public class Spigot extends Entity.Spigot { -- -2.11.0.windows.3 +2.9.3 diff --git a/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index 28fa2c91fa..9c872d12f6 100644 --- a/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -1,4 +1,4 @@ -From ec0213d43bbad628561225629bda86b4cd9dc489 Mon Sep 17 00:00:00 2001 +From e9c8c871a51d7563489fbdf662d5cbee08a51372 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 19:54:32 -0600 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses @@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses Change Javadoc to be accurate diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 9b310d8..87648ae 100644 +index 07077ec..a2a8698 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -293,6 +293,26 @@ public final class Bukkit { @@ -37,7 +37,7 @@ index 9b310d8..87648ae 100644 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index eea7239..915d8a5 100644 +index 4463ab3..0cc64b7 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -239,6 +239,26 @@ public interface Server extends PluginMessageRecipient { @@ -68,10 +68,10 @@ index eea7239..915d8a5 100644 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index ebe727a..5f74d9d 100644 +index 845fa88..91c46aa 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -390,6 +390,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -391,6 +391,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void sendMap(MapView map); diff --git a/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch index 6812579abf..b67e669f31 100644 --- a/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From fa2d6467d3483f75538099c4ce6cff68bd0a5c93 Mon Sep 17 00:00:00 2001 +From 469214d9ec6d79d3bd1d160d51fb9658a45fa86a Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 29 Feb 2016 20:02:40 -0600 Subject: [PATCH] Player Tab List and Title APIs @@ -369,7 +369,7 @@ index 0000000..e1ecd44 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 5f74d9d..8641bb9 100644 +index 91c46aa..78218af 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -2,6 +2,7 @@ package org.bukkit.entity; @@ -380,7 +380,7 @@ index 5f74d9d..8641bb9 100644 import org.bukkit.Achievement; import org.bukkit.ChatColor; import org.bukkit.Effect; -@@ -418,6 +419,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -419,6 +420,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { spigot().sendMessage(position, components); } diff --git a/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch index 90aaa70f96..1b4d35f189 100644 --- a/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch +++ b/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch @@ -1,4 +1,4 @@ -From f48b3a42b4d30b888395ba3c184dcd9cf7cfd55c Mon Sep 17 00:00:00 2001 +From db8e2244dc858395a100b8eab73990d0f88d642f Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 13:05:59 -0800 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender @@ -40,10 +40,10 @@ index 148756b..4ad0028 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 8641bb9..0a11a51 100644 +index 78218af..46353e4 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -397,6 +397,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -398,6 +398,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * * @param component the components to send */ @@ -51,7 +51,7 @@ index 8641bb9..0a11a51 100644 public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) { spigot().sendMessage(component); } -@@ -406,6 +407,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -407,6 +408,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * * @param components the components to send */ diff --git a/Spigot-API-Patches/0022-Complete-resource-pack-API.patch b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch index 2353f7d5d8..af807d94a6 100644 --- a/Spigot-API-Patches/0022-Complete-resource-pack-API.patch +++ b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch @@ -1,14 +1,14 @@ -From 4f89f8b6c53cce94668af8f2b14a5378c72af8d4 Mon Sep 17 00:00:00 2001 +From 80c9067e28d8125c8fb63cf7442b3c2965ff29ea Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 22:59:54 -0400 Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 4b10b63..360da61 100644 +index 46353e4..08a05f5 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1160,7 +1160,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1171,7 +1171,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * @throws IllegalArgumentException Thrown if the URL is null. * @throws IllegalArgumentException Thrown if the URL is too long. The * length restriction is an implementation specific arbitrary value. @@ -18,7 +18,7 @@ index 4b10b63..360da61 100644 public void setResourcePack(String url); /** -@@ -1503,6 +1505,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1551,6 +1553,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void setViewDistance(int viewDistance); diff --git a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch index 4a784ebade..19281ea00d 100644 --- a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch +++ b/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch @@ -1,14 +1,14 @@ -From 35949ac22a7da304864f0d3cfdb3fbb3331dbe4d Mon Sep 17 00:00:00 2001 +From e4ec5de4fd5d705722e0927a63201271ace12877 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:55:55 -0500 Subject: [PATCH] Add String based Action Bar API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 360da61..daab479 100644 +index 08a05f5..29a8ec0 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -392,6 +392,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -393,6 +393,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline public void sendMap(MapView map); // Paper start @@ -35,7 +35,7 @@ index 360da61..daab479 100644 /** * Sends the component to the player * -@@ -415,9 +435,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -416,9 +436,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline /** * Sends an array of components as a single message to the specified screen position of this player * @@ -47,7 +47,7 @@ index 360da61..daab479 100644 public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { spigot().sendMessage(position, components); } -@@ -1651,9 +1673,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1699,9 +1721,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline /** * Sends the component to the specified screen position of this player * @@ -59,7 +59,7 @@ index 360da61..daab479 100644 public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent component) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -1661,9 +1685,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1709,9 +1733,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline /** * Sends an array of components as a single message to the specified screen position of this player * diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch index 150bf1fef9..cc804e7cd6 100644 --- a/Spigot-Server-Patches/0005-Timings-v2.patch +++ b/Spigot-Server-Patches/0005-Timings-v2.patch @@ -1,11 +1,11 @@ -From 8e2978c9da9da635806aab35b1f33c44c7999312 Mon Sep 17 00:00:00 2001 +From 825072f7c8654c5bc9803075a03873afc787eaa9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 diff --git a/pom.xml b/pom.xml -index 8b96966d8..8d1e8680b 100644 +index 8b96966..8d1e868 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,12 @@ @@ -23,7 +23,7 @@ index 8b96966d8..8d1e8680b 100644 3.0.3 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java new file mode 100644 -index 000000000..4b4b77a5c +index 0000000..4b4b77a --- /dev/null +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -0,0 +1,124 @@ @@ -153,7 +153,7 @@ index 000000000..4b4b77a5c +} diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java new file mode 100644 -index 000000000..b79f1be7a +index 0000000..b79f1be --- /dev/null +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java @@ -0,0 +1,126 @@ @@ -285,7 +285,7 @@ index 000000000..b79f1be7a +} diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java new file mode 100644 -index 000000000..e7789117b +index 0000000..e778911 --- /dev/null +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java @@ -0,0 +1,101 @@ @@ -391,7 +391,7 @@ index 000000000..e7789117b + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index c009c5f12..e67989083 100644 +index c009c5f..e679890 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit; @@ -435,7 +435,7 @@ index c009c5f12..e67989083 100644 + } } diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index e8511ac9a..d3f1a4ac0 100644 +index e8511ac..d3f1a4a 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -35,6 +35,15 @@ public class Block { @@ -455,7 +455,7 @@ index e8511ac9a..d3f1a4ac0 100644 public static int getId(Block block) { return Block.REGISTRY.a(block); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 81fc04ed3..bd3b16025 100644 +index 81fc04e..bd3b160 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -900,7 +900,7 @@ public class Chunk { @@ -503,7 +503,7 @@ index 81fc04ed3..bd3b16025 100644 private void z() { diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index daf2c0a67..3ba489d4f 100644 +index daf2c0a..3ba489d 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -195,7 +195,7 @@ public class ChunkProviderServer implements IChunkProvider { @@ -525,7 +525,7 @@ index daf2c0a67..3ba489d4f 100644 this.chunkLoader.a(this.world, chunk); } catch (IOException ioexception) { diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index a97e7d3c2..4890023d7 100644 +index a97e7d3..4890023 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -402,7 +402,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -565,7 +565,7 @@ index a97e7d3c2..4890023d7 100644 // return chunk; // CraftBukkit } diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index cb83e4f56..e6819139f 100644 +index cb83e4f..e681913 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -23,7 +23,7 @@ import java.io.PrintStream; @@ -618,7 +618,7 @@ index cb83e4f56..e6819139f 100644 return waitable.get(); } catch (java.util.concurrent.ExecutionException e) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e7b1ebbe3..05312c6ac 100644 +index 2797392..8fd8843 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace; @@ -657,7 +657,7 @@ index e7b1ebbe3..05312c6ac 100644 public void recalcPosition() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 318d57e57..955e1f7a7 100644 +index 318d57e..955e1f7 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -728,7 +728,7 @@ index 318d57e57..955e1f7a7 100644 } diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java -index 347a2b671..aceb08ce1 100644 +index 347a2b6..aceb08c 100644 --- a/src/main/java/net/minecraft/server/EntityTracker.java +++ b/src/main/java/net/minecraft/server/EntityTracker.java @@ -175,7 +175,7 @@ public class EntityTracker { @@ -759,7 +759,7 @@ index 347a2b671..aceb08ce1 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d1b488e8f..8f7b148a1 100644 +index d1b488e..8f7b148 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -47,8 +47,8 @@ import org.bukkit.Bukkit; @@ -900,7 +900,7 @@ index d1b488e8f..8f7b148a1 100644 this.methodProfiler.b(); } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 703d5813d..021dfba14 100644 +index 703d581..021dfba 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,5 +1,6 @@ @@ -1000,7 +1000,7 @@ index 703d5813d..021dfba14 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index dc630c536..12486135d 100644 +index dc630c5..1248613 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -1048,7 +1048,7 @@ index dc630c536..12486135d 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java -index f74b06794..1fc632e0c 100644 +index f74b067..1fc632e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java @@ -1,15 +1,21 @@ @@ -1078,7 +1078,7 @@ index f74b06794..1fc632e0c 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index c0af82b48..676cc3f3e 100644 +index c0af82b..676cc3f 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1,5 +1,6 @@ @@ -1102,7 +1102,7 @@ index c0af82b48..676cc3f3e 100644 public void addWhitelist(GameProfile gameprofile) { diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java -index f1f206501..fb350c408 100644 +index f1f2065..fb350c4 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -1,5 +1,7 @@ @@ -1144,7 +1144,7 @@ index f1f206501..fb350c408 100644 return flag; } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 6958a2e0f..b3d3df4cf 100644 +index 6958a2e..b3d3df4 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -4,12 +4,13 @@ import javax.annotation.Nullable; @@ -1164,7 +1164,7 @@ index 6958a2e0f..b3d3df4cf 100644 private static final RegistryMaterials> f = new RegistryMaterials(); protected World world; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b29375a0c..c2326cd8e 100644 +index b29375a..c2326cd 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -18,11 +18,11 @@ import com.google.common.collect.Maps; @@ -1270,7 +1270,7 @@ index b29375a0c..c2326cd8e 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 391a09c52..966938997 100644 +index 391a09c..9669389 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -247,13 +247,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -1403,7 +1403,7 @@ index 391a09c52..966938997 100644 // CraftBukkit start diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 791383fb3..38ce05828 100644 +index 791383f..38ce058 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1737,6 +1737,7 @@ public final class CraftServer implements Server { @@ -1441,7 +1441,7 @@ index 791383fb3..38ce05828 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java deleted file mode 100644 -index 41d2d87ee..000000000 +index 41d2d87..0000000 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java +++ /dev/null @@ -1,173 +0,0 @@ @@ -1619,7 +1619,7 @@ index 41d2d87ee..000000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java -index 3a95b4465..b5efb9c3f 100644 +index 3a95b44..b5efb9c 100644 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java @@ -1,6 +1,8 @@ @@ -1663,10 +1663,10 @@ index 3a95b4465..b5efb9c3f 100644 public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d057cce36..877a0c88d 100644 +index ed2ccdd..08f3b08 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -37,15 +37,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; +@@ -39,15 +39,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; import org.bukkit.conversations.Conversation; import org.bukkit.conversations.ConversationAbandonedEvent; import org.bukkit.conversations.ManuallyAbandonedConversationCanceller; @@ -1683,7 +1683,7 @@ index d057cce36..877a0c88d 100644 import org.bukkit.craftbukkit.map.CraftMapView; import org.bukkit.craftbukkit.map.RenderData; import org.bukkit.craftbukkit.scoreboard.CraftScoreboard; -@@ -1594,6 +1588,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1605,6 +1599,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { packet.components = components; getHandle().playerConnection.sendPacket(packet); } @@ -1697,7 +1697,7 @@ index d057cce36..877a0c88d 100644 public Player.Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 92d217bce..9952b64be 100644 +index 92d217b..9952b64 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; @@ -1773,7 +1773,7 @@ index 92d217bce..9952b64be 100644 private boolean isReady(final int currentTick) { diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java -index 220e39abe..afc6c17e6 100644 +index 220e39a..afc6c17 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java @@ -1,8 +1,8 @@ @@ -1855,7 +1855,7 @@ index 220e39abe..afc6c17e6 100644 - // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java -index e52ef47b7..3d90b3426 100644 +index e52ef47..3d90b34 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon; @@ -1867,7 +1867,7 @@ index e52ef47b7..3d90b3426 100644 this.value = value; } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index c32d44df0..5c2fb0058 100644 +index c32d44d..5c2fb00 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -29,7 +29,7 @@ import net.minecraft.server.EntityWither; @@ -1929,5 +1929,5 @@ index c32d44df0..5c2fb0058 100644 } } -- -2.11.0 +2.9.3 diff --git a/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch index ee87c7cc3c..6c3cbd6035 100644 --- a/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From 2541e7a0b8cc0b9af75632151f1b327f6288e18e Mon Sep 17 00:00:00 2001 +From 3f3590bd24fd8de0aea64160d530aa3e8676089d Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 14:47:52 -0600 Subject: [PATCH] Player affects spawning API @@ -57,7 +57,7 @@ index 17bf3e4..a05fad5 100644 j = MathHelper.floor(entityhuman.locZ / 16.0D); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b9b13c7..688f405 100644 +index 8265e3e..dd5fe02 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2719,7 +2719,7 @@ public abstract class World implements IBlockAccess { @@ -70,10 +70,10 @@ index b9b13c7..688f405 100644 if (d3 < 0.0D || d4 < d3 * d3) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 877a0c8..5e9834c 100644 +index 08f3b08..b6cfd0d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1457,6 +1457,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1468,6 +1468,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } diff --git a/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch index 9d95de3b1d..bcbcd272a7 100644 --- a/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch @@ -1,14 +1,14 @@ -From 33fa09857751646136abb45542df2edc1238be2a Mon Sep 17 00:00:00 2001 +From fbe89b0b1b40c6d612c1fc3269642590a04ef205 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:12:03 -0600 Subject: [PATCH] Only refresh abilities if needed diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5e9834c..3e4e080 100644 +index b6cfd0d..7212238 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1173,12 +1173,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1184,12 +1184,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void setFlying(boolean value) { diff --git a/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch index 3de799d8a6..96847f8f8a 100644 --- a/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch +++ b/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch @@ -1,11 +1,11 @@ -From a836b78f0e2b4d5e81479f6a776c06ab7fd40e91 Mon Sep 17 00:00:00 2001 +From e4e006c25737184e22f276fed4881156b3d373d4 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 14:35:27 -0600 Subject: [PATCH] Add player view distance API diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 6a26569b9..1b8be825d 100644 +index 6a26569..1b8be82 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -57,6 +57,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -25,7 +25,7 @@ index 6a26569b9..1b8be825d 100644 // CraftBukkit start public String displayName; diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 021dfba14..9012a63a0 100644 +index 021dfba..9012a63 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -47,7 +47,7 @@ public class PlayerChunkMap { @@ -194,10 +194,10 @@ index 021dfba14..9012a63a0 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3e4e0801c..318b4608e 100644 +index 7212238..0bf3429 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1468,6 +1468,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1479,6 +1479,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.getHandle().affectsSpawning; } @@ -215,5 +215,5 @@ index 3e4e0801c..318b4608e 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.11.0.windows.3 +2.9.3 diff --git a/Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch index f6f17eb50e..51283730a9 100644 --- a/Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From acfd952de5edfc46ee5f7933a12ec1dde9ff5def Mon Sep 17 00:00:00 2001 +From dd279236b6887fe946ef41564b45801b2ba9edb1 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 02:32:10 -0600 Subject: [PATCH] Player Tab List and Title APIs @@ -78,7 +78,7 @@ index 7bcafa8..4f6c1c2 100644 if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 318b460..b597ae2 100644 +index 0bf3429..0e6e416 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,6 @@ @@ -87,8 +87,8 @@ index 318b460..b597ae2 100644 +import com.destroystokyo.paper.Title; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; - import com.mojang.authlib.GameProfile; -@@ -156,6 +157,85 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + import com.google.common.io.BaseEncoding; +@@ -158,6 +159,85 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } } diff --git a/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch index b0ad7d0dbb..ce8e1e9b1d 100644 --- a/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch +++ b/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch @@ -1,4 +1,4 @@ -From 1e37ab83bd78027f61a60f51dd2dc6207ffc0ca7 Mon Sep 17 00:00:00 2001 +From 01b233180cee83148ca5bcd419a4e0834d7ddb86 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Thu, 3 Mar 2016 02:50:31 -0600 Subject: [PATCH] Fix inter-world teleportation glitches @@ -25,10 +25,10 @@ index ed63854..7005d69 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b597ae2..44d2698 100644 +index 0e6e416..a1e46ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -577,7 +577,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -579,7 +579,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { if (fromWorld == toWorld) { entity.playerConnection.teleport(to); } else { diff --git a/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch index d6d023a16f..9c6d26d205 100644 --- a/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch @@ -1,11 +1,11 @@ -From b3c68d4badf919471ce40ff937ec2d383419c167 Mon Sep 17 00:00:00 2001 +From f723b9fa6313d76c8e15f7d597be8e3c0bcac1ae Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 23:17:52 -0400 Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 4d8c88a..b42c0be 100644 +index 2fb1a3d..87e0707 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1019,7 +1019,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -24,10 +24,10 @@ index 4d8c88a..b42c0be 100644 // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 44d2698..7a6609f 100644 +index a1e46ef..15da24d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -72,6 +72,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -74,6 +74,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { private double health = 20; private boolean scaledHealth = false; private double healthScale = 20; @@ -38,7 +38,7 @@ index 44d2698..7a6609f 100644 public CraftPlayer(CraftServer server, EntityPlayer entity) { super(server, entity); -@@ -1559,6 +1563,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1570,6 +1574,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { ((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance); } diff --git a/Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch index 87722b37a4..35a886a926 100644 --- a/Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch +++ b/Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch @@ -1,4 +1,4 @@ -From 950fd04d7cd809ac9cd4db82e4367e1859ebd3f7 Mon Sep 17 00:00:00 2001 +From 833390e11f3e2fe2e7d751e14e41fd1b335f0d69 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 May 2015 23:00:19 -0400 Subject: [PATCH] Handle Item Meta Inconsistencies @@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the ItemMeta API equivalents, and should deprecate the old API's. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 6adbbd4ac..bd3dc027f 100644 +index 6adbbd4..bd3dc02 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -4,6 +4,7 @@ import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS; @@ -144,7 +144,7 @@ index 6adbbd4ac..bd3dc027f 100644 static Map getEnchantments(net.minecraft.server.ItemStack item) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 6422b626e..59bd3995f 100644 +index ec56806..9e7f9c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -6,13 +6,8 @@ import java.lang.annotation.RetentionPolicy; @@ -162,7 +162,7 @@ index 6422b626e..59bd3995f 100644 import net.minecraft.server.NBTBase; import net.minecraft.server.NBTTagCompound; import net.minecraft.server.NBTTagList; -@@ -37,11 +32,18 @@ import com.google.common.collect.Sets; +@@ -37,10 +32,18 @@ import com.google.common.collect.Sets; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -173,7 +173,6 @@ index 6422b626e..59bd3995f 100644 import java.util.EnumSet; +import java.util.HashMap; import java.util.HashSet; --import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; @@ -182,16 +181,16 @@ index 6422b626e..59bd3995f 100644 import java.util.logging.Level; import java.util.logging.Logger; import net.minecraft.server.NBTCompressedStreamTools; -@@ -223,7 +225,7 @@ class CraftMetaItem implements ItemMeta, Repairable { - +@@ -224,7 +227,7 @@ class CraftMetaItem implements ItemMeta, Repairable { private String displayName; + private String locName; private List lore; - private Map enchantments; + private EnchantmentMap enchantments; // Paper private int repairCost; private int hideFlag; private boolean unbreakable; -@@ -231,7 +233,7 @@ class CraftMetaItem implements ItemMeta, Repairable { +@@ -232,7 +235,7 @@ class CraftMetaItem implements ItemMeta, Repairable { private static final Set HANDLED_TAGS = Sets.newHashSet(); private NBTTagCompound internalTag; @@ -200,7 +199,7 @@ index 6422b626e..59bd3995f 100644 CraftMetaItem(CraftMetaItem meta) { if (meta == null) { -@@ -245,7 +247,7 @@ class CraftMetaItem implements ItemMeta, Repairable { +@@ -247,7 +250,7 @@ class CraftMetaItem implements ItemMeta, Repairable { } if (meta.enchantments != null) { // Spigot @@ -209,7 +208,7 @@ index 6422b626e..59bd3995f 100644 } this.repairCost = meta.repairCost; -@@ -462,13 +464,13 @@ class CraftMetaItem implements ItemMeta, Repairable { +@@ -468,13 +471,13 @@ class CraftMetaItem implements ItemMeta, Repairable { } } @@ -225,7 +224,7 @@ index 6422b626e..59bd3995f 100644 for (int i = 0; i < ench.size(); i++) { int id = 0xffff & ((NBTTagCompound) ench.get(i)).getShort(ENCHANTMENTS_ID.NBT); -@@ -538,13 +540,13 @@ class CraftMetaItem implements ItemMeta, Repairable { +@@ -545,13 +548,13 @@ class CraftMetaItem implements ItemMeta, Repairable { void deserializeInternal(NBTTagCompound tag) { } @@ -241,7 +240,7 @@ index 6422b626e..59bd3995f 100644 for (Map.Entry entry : ench.entrySet()) { Enchantment enchantment = Enchantment.getByName(entry.getKey().toString()); -@@ -670,12 +672,12 @@ class CraftMetaItem implements ItemMeta, Repairable { +@@ -695,12 +698,12 @@ class CraftMetaItem implements ItemMeta, Repairable { } public Map getEnchants() { @@ -256,7 +255,7 @@ index 6422b626e..59bd3995f 100644 } if (ignoreRestrictions || level >= ench.getStartLevel() && level <= ench.getMaxLevel()) { -@@ -843,7 +845,7 @@ class CraftMetaItem implements ItemMeta, Repairable { +@@ -870,7 +873,7 @@ class CraftMetaItem implements ItemMeta, Repairable { clone.lore = new ArrayList(this.lore); } if (this.enchantments != null) { @@ -265,7 +264,7 @@ index 6422b626e..59bd3995f 100644 } clone.hideFlag = this.hideFlag; clone.unbreakable = this.unbreakable; -@@ -997,6 +999,28 @@ class CraftMetaItem implements ItemMeta, Repairable { +@@ -1027,6 +1030,28 @@ class CraftMetaItem implements ItemMeta, Repairable { } } @@ -295,5 +294,5 @@ index 6422b626e..59bd3995f 100644 private final Spigot spigot = new Spigot() { -- -2.11.0 +2.9.3 diff --git a/Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch index 10c799fa8b..864eba92e6 100644 --- a/Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,11 +1,11 @@ -From 0f23b2d280563bf9fa7982032727db75585a6e5a Mon Sep 17 00:00:00 2001 +From 77eab3f73c96150488b72d734b82099d469c279b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 27 Sep 2015 01:18:02 -0400 Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 21603953c..f57a1106a 100644 +index e8efb18..3f315d0 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -481,7 +481,13 @@ public abstract class EntityLiving extends Entity { @@ -44,10 +44,10 @@ index 21603953c..f57a1106a 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7a6609f09..1ea595dd4 100644 +index 15da24d..de8952e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1397,6 +1397,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1408,6 +1408,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } public void setRealHealth(double health) { @@ -56,5 +56,5 @@ index 7a6609f09..1ea595dd4 100644 } -- -2.11.0 +2.9.3 diff --git a/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch index dff5ddcc9b..f06768043c 100644 --- a/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch +++ b/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch @@ -1,4 +1,4 @@ -From 953598e8f144a0fe01042ac29cfe4a9b5e914616 Mon Sep 17 00:00:00 2001 +From ecc1080893b27f56397aa89f5bf4dc5db3eefd5e Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:55:23 -0400 Subject: [PATCH] Don't teleport dead entities @@ -7,10 +7,10 @@ Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e16a4d2..a853156 100644 +index 35afebd..a2814e1 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -2268,7 +2268,7 @@ public abstract class Entity implements ICommandListener { +@@ -2269,7 +2269,7 @@ public abstract class Entity implements ICommandListener { } public Entity teleportTo(Location exit, boolean portal) { diff --git a/Spigot-Server-Patches/0111-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0111-Workaround-for-setting-passengers-on-players.patch index 5ee602a018..d9fa401b7c 100644 --- a/Spigot-Server-Patches/0111-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0111-Workaround-for-setting-passengers-on-players.patch @@ -1,4 +1,4 @@ -From bfcdb392ed8a6a5002d63ec51086b250ae5bd5a9 Mon Sep 17 00:00:00 2001 +From 608037c24e940c8fa6bb3e41abbca82cd46555a8 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 10 Apr 2016 03:23:32 -0500 Subject: [PATCH] Workaround for setting passengers on players @@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players SPIGOT-1915 & GH-114 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1ea595d..eaf7954 100644 +index de8952e..3b91e46 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -587,6 +587,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -589,6 +589,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return true; } diff --git a/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch index 4839ad9255..5760651e16 100644 --- a/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch @@ -1,11 +1,11 @@ -From 681b5bbd1941e58fa30fb659b4be06197672428b Mon Sep 17 00:00:00 2001 +From e3f54d74fe213cbfb28b5e180693369a4ab8c634 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index e3a3ed4..548fa97 100644 +index 29ad8e2..f07c3de 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -29,7 +29,7 @@ import org.bukkit.inventory.MainHand; @@ -34,10 +34,10 @@ index e3a3ed4..548fa97 100644 this.ch = packetplayinsettings.d(); this.getDataWatcher().set(EntityPlayer.bq, Byte.valueOf((byte) packetplayinsettings.e())); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index eaf7954..3edeb49 100644 +index 3b91e46..84b2e54 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1690,7 +1690,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1701,7 +1701,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public String getLocale() { diff --git a/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch index fa0dd9881a..cf774df45e 100644 --- a/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch +++ b/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch @@ -1,4 +1,4 @@ -From 7136c91dd498d1b5e956f2fdf7c53b7abfc1b924 Mon Sep 17 00:00:00 2001 +From fe215de8c00b2141d540df98b2253ef58d903221 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 22 May 2016 20:20:55 -0500 Subject: [PATCH] Optional old TNT cannon behaviors @@ -190,7 +190,7 @@ index 6b6aa89..5cec416 100644 world.addEntity(entitytntprimed); world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gV, SoundCategory.BLOCKS, 1.0F, 1.0F); diff --git a/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java -index dbfb8ab..537408a 100644 +index 2762806..fcc3d10 100644 --- a/src/main/java/net/minecraft/server/DispenserRegistry.java +++ b/src/main/java/net/minecraft/server/DispenserRegistry.java @@ -481,7 +481,11 @@ public class DispenserRegistry { @@ -207,7 +207,7 @@ index dbfb8ab..537408a 100644 world.getServer().getPluginManager().callEvent(event); } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 340c24b..b2234d9 100644 +index 47227ea..40a7df1 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1041,6 +1041,12 @@ public abstract class Entity implements ICommandListener { @@ -248,7 +248,7 @@ index 340c24b..b2234d9 100644 this.motX += d0; this.motY += d1; this.motZ += d2; -@@ -2456,6 +2473,12 @@ public abstract class Entity implements ICommandListener { +@@ -2457,6 +2474,12 @@ public abstract class Entity implements ICommandListener { } public boolean bg() { diff --git a/Spigot-Server-Patches/0191-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0191-String-based-Action-Bar-API.patch index a64bb03a60..d984f12a1c 100644 --- a/Spigot-Server-Patches/0191-String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/0191-String-based-Action-Bar-API.patch @@ -1,11 +1,11 @@ -From 199a8c759491c9d4891263cecd97c65c097002c0 Mon Sep 17 00:00:00 2001 +From 346c2e08ae20b6e9c24f10ccb78f6c8a4a095c94 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Dec 2016 15:02:42 -0500 Subject: [PATCH] String based Action Bar API diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 1159eea1a..38359517c 100644 +index 1159eea..3835951 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -1,10 +1,13 @@ @@ -62,10 +62,10 @@ index 1159eea1a..38359517c 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3edeb4910..26b89799e 100644 +index 84b2e54..62e70a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -163,6 +163,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -165,6 +165,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { // Paper start @Override @@ -85,5 +85,5 @@ index 3edeb4910..26b89799e 100644 PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter(); packet.header = header; -- -2.11.0 +2.9.3 diff --git a/work/Bukkit b/work/Bukkit index 1861013a8c..c0827f5df7 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 1861013a8c070400d70d3b9703e1c9afcce0be80 +Subproject commit c0827f5df70b84ed701663598a2c4accc4bbf075 diff --git a/work/CraftBukkit b/work/CraftBukkit index a552117725..4448a7efa4 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit a552117725a316dbae014fb85e431e5264e631d4 +Subproject commit 4448a7efa4bc1c4db669bc0a9019a3f96a524426 diff --git a/work/Spigot b/work/Spigot index 65a0347010..d4f98a3918 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 65a03470106fdceec943006e8b9b1cb3f5b89235 +Subproject commit d4f98a3918e69673b2c0486b5651c5fe912b3c8d