diff --git a/Spigot-API-Patches/0004-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch index d100df35d1..8a06fc5125 100644 --- a/Spigot-API-Patches/0004-Timings-v2.patch +++ b/Spigot-API-Patches/0004-Timings-v2.patch @@ -1,4 +1,4 @@ -From 338c6106a61ac84d108916a674b637d4731b29b2 Mon Sep 17 00:00:00 2001 +From feeed52905ed00fbf0ee435848cb45c003b61aaf 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..64531fcc +index 000000000..64531fcce --- /dev/null +++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java @@ -0,0 +1,84 @@ @@ -96,7 +96,7 @@ index 00000000..64531fcc +} 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..9b45ce88 +index 000000000..9b45ce887 --- /dev/null +++ b/src/main/java/co/aikar/timings/NullTimingHandler.java @@ -0,0 +1,68 @@ @@ -170,7 +170,7 @@ index 00000000..9b45ce88 +} 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..933ecf9b +index 000000000..933ecf9bd --- /dev/null +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java @@ -0,0 +1,83 @@ @@ -259,7 +259,7 @@ index 00000000..933ecf9b +} 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..a21e5ead +index 000000000..a21e5ead5 --- /dev/null +++ b/src/main/java/co/aikar/timings/Timing.java @@ -0,0 +1,83 @@ @@ -348,7 +348,7 @@ index 00000000..a21e5ead +} 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..a5d13a1e +index 000000000..a5d13a1e4 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingData.java @@ -0,0 +1,122 @@ @@ -476,7 +476,7 @@ index 00000000..a5d13a1e +} 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..cc0390c0 +index 000000000..cc0390c06 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingHandler.java @@ -0,0 +1,227 @@ @@ -709,7 +709,7 @@ index 00000000..cc0390c0 +} 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..ddaed812 +index 000000000..ddaed8127 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingHistory.java @@ -0,0 +1,354 @@ @@ -1069,7 +1069,7 @@ index 00000000..ddaed812 +} 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..86d5ac6b +index 000000000..86d5ac6bd --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java @@ -0,0 +1,58 @@ @@ -1133,7 +1133,7 @@ index 00000000..86d5ac6b +} 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..df142a89 +index 000000000..df142a89b --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingIdentifier.java @@ -0,0 +1,116 @@ @@ -1255,7 +1255,7 @@ index 00000000..df142a89 +} 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..0b34e0d0 +index 000000000..0b34e0d01 --- /dev/null +++ b/src/main/java/co/aikar/timings/Timings.java @@ -0,0 +1,293 @@ @@ -1554,7 +1554,7 @@ index 00000000..0b34e0d0 +} 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..c0d8f201 +index 000000000..c0d8f2016 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsCommand.java @@ -0,0 +1,122 @@ @@ -1682,7 +1682,7 @@ index 00000000..c0d8f201 +} 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..93d5a3f9 +index 000000000..93d5a3f97 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -0,0 +1,355 @@ @@ -2043,7 +2043,7 @@ index 00000000..93d5a3f9 +} 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..ef824d70 +index 000000000..ef824d701 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsManager.java @@ -0,0 +1,188 @@ @@ -2237,7 +2237,7 @@ index 00000000..ef824d70 +} 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..bf3e059f +index 000000000..bf3e059fe --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsReportListener.java @@ -0,0 +1,75 @@ @@ -2318,7 +2318,7 @@ index 00000000..bf3e059f +} 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..632c4961 +index 000000000..632c49615 --- /dev/null +++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java @@ -0,0 +1,53 @@ @@ -2377,7 +2377,7 @@ index 00000000..632c4961 +} diff --git a/src/main/java/co/aikar/util/Counter.java b/src/main/java/co/aikar/util/Counter.java new file mode 100644 -index 00000000..80155072 +index 000000000..80155072d --- /dev/null +++ b/src/main/java/co/aikar/util/Counter.java @@ -0,0 +1,38 @@ @@ -2421,7 +2421,7 @@ index 00000000..80155072 +} 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..190bf059 +index 000000000..190bf0598 --- /dev/null +++ b/src/main/java/co/aikar/util/JSONUtil.java @@ -0,0 +1,140 @@ @@ -2567,7 +2567,7 @@ index 00000000..190bf059 +} 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..63a899c7 +index 000000000..63a899c7d --- /dev/null +++ b/src/main/java/co/aikar/util/LoadingIntMap.java @@ -0,0 +1,76 @@ @@ -2649,7 +2649,7 @@ index 00000000..63a899c7 +} 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..aedbb033 +index 000000000..aedbb0332 --- /dev/null +++ b/src/main/java/co/aikar/util/LoadingMap.java @@ -0,0 +1,368 @@ @@ -3023,7 +3023,7 @@ index 00000000..aedbb033 +} 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..5989ee21 +index 000000000..5989ee212 --- /dev/null +++ b/src/main/java/co/aikar/util/MRUMapCache.java @@ -0,0 +1,111 @@ @@ -3139,10 +3139,10 @@ index 00000000..5989ee21 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 82bc43aa..279236a4 100644 +index ae21e0f97..755869366 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -574,7 +574,6 @@ public final class Bukkit { +@@ -618,7 +618,6 @@ public final class Bukkit { */ public static void reload() { server.reload(); @@ -3151,10 +3151,10 @@ index 82bc43aa..279236a4 100644 /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 83ce6a86..d00a289d 100644 +index f6fb72fab..fad4e9292 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1260,6 +1260,26 @@ public interface Server extends PluginMessageRecipient { +@@ -1300,6 +1300,26 @@ public interface Server extends PluginMessageRecipient { throw new UnsupportedOperationException("Not supported yet."); } @@ -3182,7 +3182,7 @@ index 83ce6a86..d00a289d 100644 * Sends the component to the player * diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 247d194f..72c5501e 100644 +index 247d194f8..72c5501e8 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -69,4 +69,12 @@ public interface UnsafeValues { @@ -3200,7 +3200,7 @@ index 247d194f..72c5501e 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..f9a00aec +index 000000000..f9a00aecc --- /dev/null +++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java @@ -0,0 +1,21 @@ @@ -3226,7 +3226,7 @@ index 00000000..f9a00aec + } +} diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java -index 4bfc2146..03bdc162 100644 +index 4bfc21468..03bdc1622 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java @@ -33,7 +33,8 @@ public abstract class Command { @@ -3256,7 +3256,7 @@ index 4bfc2146..03bdc162 100644 return true; } diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java -index d6c8938b..a6ad94ef 100644 +index d6c8938b1..a6ad94ef9 100644 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java @@ -9,6 +9,7 @@ public class FormattedCommandAlias extends Command { @@ -3280,7 +3280,7 @@ index d6c8938b..a6ad94ef 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..ca1893e9 +index 000000000..ca1893e9f --- /dev/null +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java @@ -0,0 +1,114 @@ @@ -3399,7 +3399,7 @@ index 00000000..ca1893e9 + +} diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index 81e4fa57..f020cb04 100644 +index 81e4fa573..f020cb04e 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -15,7 +15,6 @@ import org.bukkit.command.defaults.BukkitCommand; @@ -3456,7 +3456,7 @@ index 81e4fa57..f020cb04 100644 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 2a145d85..00000000 +index 2a145d851..000000000 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java +++ /dev/null @@ -1,250 +0,0 @@ @@ -3711,7 +3711,7 @@ index 2a145d85..00000000 - // Spigot end -} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9b0153f7..9d82a691 100644 +index 9b0153f7d..9d82a691a 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1573,6 +1573,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -3727,7 +3727,7 @@ index 9b0153f7..9d82a691 100644 @NotNull diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 180794eb..b9ce12ff 100644 +index 180794eb4..b9ce12ff9 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -313,7 +313,6 @@ public final class SimplePluginManager implements PluginManager { @@ -3784,7 +3784,7 @@ index 180794eb..b9ce12ff 100644 } } diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index df8a5dcb..50a51394 100644 +index df8a5dcbe..50a51394f 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -53,7 +53,6 @@ public final class JavaPluginLoader implements PluginLoader { @@ -3827,7 +3827,7 @@ index df8a5dcb..50a51394 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 5830e8b9..36f542a8 100644 +index 5830e8b9b..36f542a85 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -28,7 +28,8 @@ import org.jetbrains.annotations.Nullable; @@ -3841,7 +3841,7 @@ index 5830e8b9..36f542a8 100644 private final Map> classes = new ConcurrentHashMap>(); 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..612958a3 100644 +index 5ca863b36..612958a33 100644 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java @@ -2,6 +2,7 @@ package org.bukkit.util; @@ -3864,7 +3864,7 @@ index 5ca863b3..612958a3 100644 + +} diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java -index 44badfed..3cbe5c2b 100644 +index 44badfedc..3cbe5c2bb 100644 --- a/src/main/java/org/spigotmc/CustomTimingsHandler.java +++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java @@ -1,3 +1,26 @@ diff --git a/Spigot-API-Patches/0006-Add-getTPS-method.patch b/Spigot-API-Patches/0006-Add-getTPS-method.patch index ac9c4d847d..317857cfc7 100644 --- a/Spigot-API-Patches/0006-Add-getTPS-method.patch +++ b/Spigot-API-Patches/0006-Add-getTPS-method.patch @@ -1,14 +1,14 @@ -From 9a5fb9b80a46a450067b0620831174013dd92ad1 Mon Sep 17 00:00:00 2001 +From 627f5e579e6923c6f7297db05160264f9dfa66f5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:24:57 -0600 Subject: [PATCH] Add getTPS method diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 279236a45..3faccfea7 100644 +index 755869366..6c3aa4185 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1325,6 +1325,17 @@ public final class Bukkit { +@@ -1369,6 +1369,17 @@ public final class Bukkit { return server.getEntity(uuid); } @@ -27,10 +27,10 @@ index 279236a45..3faccfea7 100644 * Get the advancement specified by this key. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index d00a289de..51efc5f71 100644 +index fad4e9292..f0dba56dc 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1108,6 +1108,16 @@ public interface Server extends PluginMessageRecipient { +@@ -1148,6 +1148,16 @@ public interface Server extends PluginMessageRecipient { @Nullable Entity getEntity(@NotNull UUID uuid); diff --git a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch index d63fc9d09c..6b1e7616c8 100644 --- a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch +++ b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch @@ -1,14 +1,14 @@ -From e4691bd2dccf7c9841bb40ec8aa4ee86fc6f81b7 Mon Sep 17 00:00:00 2001 +From b8c5b1d14ba84e8fb7b5dc2dbd7058d46f0a359a Mon Sep 17 00:00:00 2001 From: kashike Date: Mon, 29 Feb 2016 19:48:59 -0600 Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 3faccfea7..c9f473641 100644 +index 6c3aa4185..6b951d5ad 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1499,6 +1499,19 @@ public final class Bukkit { +@@ -1543,6 +1543,19 @@ public final class Bukkit { return server.getUnsafe(); } @@ -29,10 +29,10 @@ index 3faccfea7..c9f473641 100644 public static Server.Spigot spigot() { return server.spigot(); diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 51efc5f71..121367cd0 100644 +index f0dba56dc..af21bb1aa 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1118,6 +1118,15 @@ public interface Server extends PluginMessageRecipient { +@@ -1158,6 +1158,15 @@ public interface Server extends PluginMessageRecipient { public double[] getTPS(); // Paper end diff --git a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch index 7710af886a..7c8ef50b06 100644 --- a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch +++ b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch @@ -1,4 +1,4 @@ -From 8eab30f6cf58217f754d15de6e771436218a5c35 Mon Sep 17 00:00:00 2001 +From ae45a92f46cd6e9b264fe7853162bfeb87a112e3 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:28:07 -0400 Subject: [PATCH] Add command to reload permissions.yml and require confirm to @@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 348e5411f..8f5aa9068 100644 +index 39423f3a6..423fecf54 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1530,6 +1530,13 @@ public final class Bukkit { +@@ -1574,6 +1574,13 @@ public final class Bukkit { public static org.bukkit.command.CommandMap getCommandMap() { return server.getCommandMap(); } @@ -24,10 +24,10 @@ index 348e5411f..8f5aa9068 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 743dbfe89..88306726c 100644 +index b09d01085..38d7da737 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1348,4 +1348,6 @@ public interface Server extends PluginMessageRecipient { +@@ -1388,4 +1388,6 @@ public interface Server extends PluginMessageRecipient { @NotNull Spigot spigot(); // Spigot end diff --git a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch index 7afb73c504..05e536824e 100644 --- a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From 8204b1c42ea2dd1e6159e94f54bd6993c0d8281b Mon Sep 17 00:00:00 2001 +From b603b131d3e8a465c227a072486f9121832fa5f0 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:16:39 -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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 8f5aa9068..52599c907 100644 +index 423fecf54..0ec517701 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1537,6 +1537,15 @@ public final class Bukkit { +@@ -1581,6 +1581,15 @@ public final class Bukkit { public static void reloadPermissions() { server.reloadPermissions(); } @@ -26,10 +26,10 @@ index 8f5aa9068..52599c907 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 88306726c..b68098b6d 100644 +index 38d7da737..93bb91fad 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1350,4 +1350,6 @@ public interface Server extends PluginMessageRecipient { +@@ -1390,4 +1390,6 @@ public interface Server extends PluginMessageRecipient { // Spigot end void reloadPermissions(); // Paper diff --git a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch index 15cf6a9a8a..99e93c1ab4 100644 --- a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From 1255c19720c7ce036ff87708f203d015b8230830 Mon Sep 17 00:00:00 2001 +From 955026063b2174e79c657fa323591c79101d1cf8 Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 9 Jun 2017 07:24:24 -0700 Subject: [PATCH] Add configuration option to prevent player names from being @@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 52599c907..d0119b3b7 100644 +index 0ec517701..ded9df9a3 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1546,6 +1546,16 @@ public final class Bukkit { +@@ -1590,6 +1590,16 @@ public final class Bukkit { public static boolean reloadCommandAliases() { return server.reloadCommandAliases(); } @@ -27,10 +27,10 @@ index 52599c907..d0119b3b7 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index b68098b6d..403a1e17d 100644 +index 93bb91fad..112098f9b 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1352,4 +1352,14 @@ public interface Server extends PluginMessageRecipient { +@@ -1392,4 +1392,14 @@ public interface Server extends PluginMessageRecipient { void reloadPermissions(); // Paper boolean reloadCommandAliases(); // Paper diff --git a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch index b7ea291ee7..ab5caf9a68 100644 --- a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch +++ b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch @@ -1,4 +1,4 @@ -From f59dbb5b5ae31181c9724d9ed31160fd81126570 Mon Sep 17 00:00:00 2001 +From abe7f7270eb38d816f1093e87ba77028afe49098 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 @@ -6,10 +6,10 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 709f3999..da9f234d 100644 +index e2f0dc77e..bc1b8f120 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1910,6 +1910,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2008,6 +2008,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()} @@ -17,7 +17,7 @@ index 709f3999..da9f234d 100644 */ public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data); -@@ -1926,6 +1927,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2024,6 +2025,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()} @@ -25,7 +25,7 @@ index 709f3999..da9f234d 100644 */ public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data); -@@ -1976,6 +1978,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2074,6 +2076,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()} @@ -33,7 +33,7 @@ index 709f3999..da9f234d 100644 */ public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data); -@@ -1996,6 +1999,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2094,6 +2097,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()} @@ -41,7 +41,7 @@ index 709f3999..da9f234d 100644 */ public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data); -@@ -2052,6 +2056,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2150,6 +2154,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()} @@ -49,7 +49,7 @@ index 709f3999..da9f234d 100644 */ public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data); -@@ -2074,6 +2079,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2172,6 +2177,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()} @@ -57,7 +57,7 @@ index 709f3999..da9f234d 100644 */ public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data); -@@ -2097,6 +2103,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2195,6 +2201,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param force whether to send the particle to players within an extended * range and encourage their client to render it regardless of * settings @@ -65,7 +65,7 @@ index 709f3999..da9f234d 100644 */ public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force); -@@ -2122,6 +2129,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2220,6 +2227,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param force whether to send the particle to players within an extended * range and encourage their client to render it regardless of * settings @@ -74,7 +74,7 @@ index 709f3999..da9f234d 100644 public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force); diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java -index c2096b53..bca9d365 100644 +index c2096b534..bca9d3659 100644 --- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java +++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java @@ -142,6 +142,7 @@ public interface AreaEffectCloud extends Entity { @@ -86,7 +86,7 @@ index c2096b53..bca9d365 100644 void setParticle(@NotNull Particle particle, @Nullable T data); diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 58a6795d..f10ef7ae 100644 +index 58a6795df..f10ef7ae7 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -459,7 +459,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -179,7 +179,7 @@ index 58a6795d..f10ef7ae 100644 public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data); diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java -index 1b2267f4..1a58734d 100644 +index 1b2267f4e..1a58734d9 100644 --- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java @@ -78,7 +78,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable { diff --git a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch index 5c70781529..c195839e42 100644 --- a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch +++ b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 59ebf71478418359fd0f3967e2394f6148f5a5de Mon Sep 17 00:00:00 2001 +From 1713c641bba9f7f2a2a9f8e15d3c3460b63c75e9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 21:46:46 -0500 Subject: [PATCH] Basic PlayerProfile API @@ -235,10 +235,10 @@ index 000000000..7b3b6ef53 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index d0119b3b7..c1f96b46f 100644 +index ded9df9a3..5d4fb5b9d 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1556,6 +1556,40 @@ public final class Bukkit { +@@ -1600,6 +1600,40 @@ public final class Bukkit { public static boolean suggestPlayerNamesWhenNullTabCompletions() { return server.suggestPlayerNamesWhenNullTabCompletions(); } @@ -280,10 +280,10 @@ index d0119b3b7..c1f96b46f 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 403a1e17d..a5e87a4ab 100644 +index 112098f9b..6778ac8e5 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1361,5 +1361,33 @@ public interface Server extends PluginMessageRecipient { +@@ -1401,5 +1401,33 @@ public interface Server extends PluginMessageRecipient { * @return true if player names should be suggested */ boolean suggestPlayerNamesWhenNullTabCompletions(); diff --git a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch index d254c3c5a0..743bd867a6 100644 --- a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch +++ b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 3e7b82aceada63cd39219c5a3fdda878a4be6399 Mon Sep 17 00:00:00 2001 +From 9dcbe2f6b819b55841e1ebb138516d7a281377cc Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:39:28 -0400 Subject: [PATCH] getPlayerUniqueId API @@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 161a714e..0c519c41 100644 +index 5d4fb5b9d..f5fac807c 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -423,6 +423,20 @@ public final class Bukkit { +@@ -467,6 +467,20 @@ public final class Bukkit { return server.getPlayer(id); } @@ -34,10 +34,10 @@ index 161a714e..0c519c41 100644 * Gets the plugin manager for interfacing with plugins. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 463724e4..8a76df52 100644 +index 6778ac8e5..11fffc514 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -356,6 +356,18 @@ public interface Server extends PluginMessageRecipient { +@@ -396,6 +396,18 @@ public interface Server extends PluginMessageRecipient { @Nullable public Player getPlayer(@NotNull UUID id); @@ -57,5 +57,5 @@ index 463724e4..8a76df52 100644 * Gets the plugin manager for interfacing with plugins. * -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch index ba3efb19fc..2bd7ee4526 100644 --- a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From 2ca6fb7ec06fa0341101144a5f314075154d200b Mon Sep 17 00:00:00 2001 +From e08846314e171a7110f2be9645ea6f132e2c23e9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 29 Aug 2017 23:58:48 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder @@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java new file mode 100644 -index 00000000..06f1602f +index 000000000..06f1602f5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java @@ -0,0 +1,478 @@ @@ -493,7 +493,7 @@ index 00000000..06f1602f + } +} diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java -index 49467ac7..d2ceb07c 100644 +index 49467ac70..d2ceb07c7 100644 --- a/src/main/java/org/bukkit/Particle.java +++ b/src/main/java/org/bukkit/Particle.java @@ -96,6 +96,17 @@ public enum Particle { @@ -515,10 +515,10 @@ index 49467ac7..d2ceb07c 100644 * Options which can be applied to redstone dust particles - a particle * color and size. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index ab2ddc05..54d86a76 100644 +index 2dcab309f..b72f7b4b8 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -2334,7 +2334,57 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2432,7 +2432,57 @@ public interface World extends PluginMessageRecipient, Metadatable { * the type of this depends on {@link Particle#getDataType()} * @param Type */ diff --git a/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch b/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch index 8d228b9927..262e4c84e0 100644 --- a/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch +++ b/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch @@ -1,14 +1,14 @@ -From d679f9f4ab62f832886c60b2d24f66d3674b98ba Mon Sep 17 00:00:00 2001 +From 18d4ca1294ed2c87e7bb040dcecdebabd6bfc4a6 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 19:44:54 +0000 Subject: [PATCH] Make the default permission message configurable diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 95b8f4cf3..389180290 100644 +index f5fac807c..e83f0852d 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1571,6 +1571,15 @@ public final class Bukkit { +@@ -1615,6 +1615,15 @@ public final class Bukkit { return server.suggestPlayerNamesWhenNullTabCompletions(); } @@ -25,10 +25,10 @@ index 95b8f4cf3..389180290 100644 * Creates a PlayerProfile for the specified uuid, with name as null * @param uuid UUID to create profile for diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 6ad677bda..fbb21b4a3 100644 +index 11fffc514..fa855cace 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1374,6 +1374,13 @@ public interface Server extends PluginMessageRecipient { +@@ -1414,6 +1414,13 @@ public interface Server extends PluginMessageRecipient { */ boolean suggestPlayerNamesWhenNullTabCompletions(); diff --git a/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch b/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch index eda132fc76..acfa8cefbc 100644 --- a/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch +++ b/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch @@ -1,4 +1,4 @@ -From 150224b84389e4e41390bb346b9789e8f8a6152f Mon Sep 17 00:00:00 2001 +From 6fadd84858ccbd8bd4a4416fb45fd4a3b4ba8fc3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:39:01 -0400 Subject: [PATCH] Flip some Spigot API null annotations @@ -9,10 +9,10 @@ a ton of noise to plugin developers. These do not help plugin developers if they bring moise noise than value. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 389180290..93de987d5 100644 +index e83f0852d..6658c12b8 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1167,7 +1167,7 @@ public final class Bukkit { +@@ -1211,7 +1211,7 @@ public final class Bukkit { * * @return the scoreboard manager or null if no worlds are loaded. */ @@ -21,7 +21,7 @@ index 389180290..93de987d5 100644 public static ScoreboardManager getScoreboardManager() { return server.getScoreboardManager(); } -@@ -1464,7 +1464,7 @@ public final class Bukkit { +@@ -1508,7 +1508,7 @@ public final class Bukkit { * @param clazz the class of the tag entries * @return the tag or null */ @@ -62,10 +62,10 @@ index 6e1a1124a..77d9cd0a1 100644 if (this.world == null) { return null; diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index fbb21b4a3..2733793a5 100644 +index fa855cace..df37b9ee5 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -974,7 +974,7 @@ public interface Server extends PluginMessageRecipient { +@@ -1014,7 +1014,7 @@ public interface Server extends PluginMessageRecipient { * * @return the scoreboard manager or null if no worlds are loaded. */ @@ -74,7 +74,7 @@ index fbb21b4a3..2733793a5 100644 ScoreboardManager getScoreboardManager(); /** -@@ -1244,7 +1244,7 @@ public interface Server extends PluginMessageRecipient { +@@ -1284,7 +1284,7 @@ public interface Server extends PluginMessageRecipient { * @param clazz the class of the tag entries * @return the tag or null */ diff --git a/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch b/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch index 275ae1d06e..b415f2618e 100644 --- a/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch +++ b/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch @@ -1,14 +1,14 @@ -From a4dde4633566bd37253986617541e91a46ac204f Mon Sep 17 00:00:00 2001 +From 569ba281bef21cef40ff1faad235ab965fc48522 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 20 Apr 2019 19:47:29 -0500 Subject: [PATCH] Expose the internal current tick diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 93de987d5..355bd2e22 100644 +index 6658c12b8..b99734068 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1613,6 +1613,10 @@ public final class Bukkit { +@@ -1657,6 +1657,10 @@ public final class Bukkit { public static com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name) { return server.createProfile(uuid, name); } @@ -20,10 +20,10 @@ index 93de987d5..355bd2e22 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 2733793a5..98e7ba900 100644 +index df37b9ee5..80f9abdca 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1408,5 +1408,12 @@ public interface Server extends PluginMessageRecipient { +@@ -1448,5 +1448,12 @@ public interface Server extends PluginMessageRecipient { */ @NotNull com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name); diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch index 37be6f9088..54c86e7f1d 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -1,4 +1,4 @@ -From 8e5b8c219622b92757c01e0ae591b206e8512802 Mon Sep 17 00:00:00 2001 +From b6108d5414d5d24bb0d9a9aa9284e3f9c58ae743 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 21:02:09 -0600 Subject: [PATCH] Paper config files @@ -541,7 +541,7 @@ index 136d1b50f..9eed98e37 100644 this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals); this.setSpawnNPCs(dedicatedserverproperties.spawnNpcs); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index f14b37e51..34cb00b0b 100644 +index 4b90ee6ef..8789191fe 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -135,9 +135,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener { @@ -581,10 +581,10 @@ index ddca89a13..f937b7294 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index cdd254a7e..f0deeb3d2 100644 +index 487346ce8..177e2af68 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -68,6 +68,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -70,6 +70,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public boolean populating; public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot @@ -593,7 +593,7 @@ index cdd254a7e..f0deeb3d2 100644 public final SpigotTimings.WorldTimingsHandler timings; // Spigot public static BlockPosition lastPhysicsProblem; // Spigot private org.spigotmc.TickLimiter entityLimiter; -@@ -88,6 +90,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -90,6 +92,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) { this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot @@ -602,10 +602,10 @@ index cdd254a7e..f0deeb3d2 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 5a6142eb7..0c9d5d231 100644 +index 02364e3c3..8d1f066f0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -759,6 +759,7 @@ public final class CraftServer implements Server { +@@ -769,6 +769,7 @@ public final class CraftServer implements Server { } org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot @@ -613,15 +613,15 @@ index 5a6142eb7..0c9d5d231 100644 for (WorldServer world : console.getWorlds()) { world.worldData.setDifficulty(config.difficulty); world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals); -@@ -774,6 +775,7 @@ public final class CraftServer implements Server { - world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns(); +@@ -796,6 +797,7 @@ public final class CraftServer implements Server { + world.ticksPerAmbientSpawns = this.getTicksPerAmbientSpawns(); } world.spigotConfig.init(); // Spigot + world.paperConfig.init(); // Paper } pluginManager.clearPlugins(); -@@ -781,6 +783,7 @@ public final class CraftServer implements Server { +@@ -803,6 +805,7 @@ public final class CraftServer implements Server { resetRecipes(); reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot @@ -629,7 +629,7 @@ index 5a6142eb7..0c9d5d231 100644 overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*"); ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -1978,4 +1981,35 @@ public final class CraftServer implements Server { +@@ -2000,4 +2003,35 @@ public final class CraftServer implements Server { { return spigot; } @@ -666,7 +666,7 @@ index 5a6142eb7..0c9d5d231 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 766e0f6b1..3a0c01852 100644 +index 7d9a1851d..0d8668d34 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -129,6 +129,14 @@ public class Main { diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch index a7aeaacb39..54f3332d1d 100644 --- a/Spigot-Server-Patches/0004-MC-Utils.patch +++ b/Spigot-Server-Patches/0004-MC-Utils.patch @@ -1,4 +1,4 @@ -From 93be2b61c1b9b98a298c8a7f61a0743ca0d2e578 Mon Sep 17 00:00:00 2001 +From 9dddbd86ae3f6a9a51b05a9a406e1a33c0d5839e Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:55:47 -0400 Subject: [PATCH] MC Utils @@ -1851,7 +1851,7 @@ index 260644bf0..f2a19acd8 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 43d0776f8..f558ae441 100644 +index 41eac3588..a5f2468a6 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -23,7 +23,7 @@ public class ChunkProviderServer extends IChunkProvider { @@ -3153,7 +3153,7 @@ index 7b92ecfff..7e224ebef 100644 public static long getTimeMillis() { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index f0deeb3d2..304dfac06 100644 +index 177e2af68..6861711c2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -22,6 +22,7 @@ import org.bukkit.craftbukkit.SpigotTimings; // Spigot @@ -3164,7 +3164,7 @@ index f0deeb3d2..304dfac06 100644 import org.bukkit.craftbukkit.block.data.CraftBlockData; import org.bukkit.event.block.BlockPhysicsEvent; // CraftBukkit end -@@ -179,6 +180,39 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -183,6 +184,39 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return (Chunk) this.getChunkAt(i, j, ChunkStatus.FULL); } @@ -3204,7 +3204,7 @@ index f0deeb3d2..304dfac06 100644 @Override public IChunkAccess getChunkAt(int i, int j, ChunkStatus chunkstatus, boolean flag) { IChunkAccess ichunkaccess = this.chunkProvider.getChunkAt(i, j, chunkstatus, flag); -@@ -330,8 +364,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -334,8 +368,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public void a(BlockPosition blockposition, IBlockData iblockdata, IBlockData iblockdata1) {} diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index fc8e416d27..54059a3dbc 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -1,4 +1,4 @@ -From 9aca88887465870a1089eb904cb3aaefd7cbf0d4 Mon Sep 17 00:00:00 2001 +From 5e3f0af8030d2a96e8e22faf1b883b719c7fe1da Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2 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 0000000000..69e26a8267 +index 000000000..69e26a826 --- /dev/null +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -0,0 +1,141 @@ @@ -153,7 +153,7 @@ index 0000000000..69e26a8267 +} 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 0000000000..e41083f14c +index 000000000..e41083f14 --- /dev/null +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java @@ -0,0 +1,128 @@ @@ -286,7 +286,7 @@ index 0000000000..e41083f14c + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index b6d470e594..f402a29b09 100644 +index b6d470e59..f402a29b0 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; @@ -333,7 +333,7 @@ index b6d470e594..f402a29b09 100644 + } } diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index cd72a9c845..5de881371a 100644 +index cd72a9c84..5de881371 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -31,6 +31,15 @@ public class Block implements IMaterial { @@ -353,7 +353,7 @@ index cd72a9c845..5de881371a 100644 private final float frictionFactor; private final float f; diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index e58dd3e6df..0b32179b79 100644 +index e58dd3e6d..0b32179b7 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -576,6 +576,7 @@ public class Chunk implements IChunkAccess { @@ -373,7 +373,7 @@ index e58dd3e6df..0b32179b79 100644 } } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index f558ae4417..63cb0019b1 100644 +index a5f2468a6..a3d150a13 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -227,11 +227,13 @@ public class ChunkProviderServer extends IChunkProvider { @@ -412,8 +412,8 @@ index f558ae4417..63cb0019b1 100644 this.world.timings.doChunkUnload.startTiming(); // Spigot this.world.getMethodProfiler().exitEnter("unload"); this.playerChunkMap.unloadChunks(booleansupplier); -@@ -486,10 +492,12 @@ public class ChunkProviderServer extends IChunkProvider { - boolean flag2 = world.ticksPerAnimalSpawns != 0L && worlddata.getTime() % world.ticksPerAnimalSpawns == 0L; // CraftBukkit // PAIL: TODO monster ticks +@@ -492,10 +498,12 @@ public class ChunkProviderServer extends IChunkProvider { + // CraftBukkit end this.world.getMethodProfiler().enter("naturalSpawnCount"); + this.world.timings.countNaturalMobs.startTiming(); // Paper - timings @@ -425,7 +425,7 @@ index f558ae4417..63cb0019b1 100644 this.world.getMethodProfiler().exit(); this.playerChunkMap.f().forEach((playerchunk) -> { Optional optional = ((Either) playerchunk.b().getNow(PlayerChunk.UNLOADED_CHUNK)).left(); -@@ -498,11 +506,15 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -504,11 +512,15 @@ public class ChunkProviderServer extends IChunkProvider { Chunk chunk = (Chunk) optional.get(); this.world.getMethodProfiler().enter("broadcast"); @@ -441,7 +441,7 @@ index f558ae4417..63cb0019b1 100644 chunk.setInhabitedTime(chunk.getInhabitedTime() + j); if (flag1 && (this.allowMonsters || this.allowAnimals) && this.world.getWorldBorder().isInBounds(chunk.getPos()) && !this.playerChunkMap.isOutsideOfRange(chunkcoordintpair, true)) { // Spigot this.world.getMethodProfiler().enter("spawner"); -@@ -548,24 +560,25 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -559,24 +571,25 @@ public class ChunkProviderServer extends IChunkProvider { this.world.getMethodProfiler().exit(); } @@ -472,7 +472,7 @@ index f558ae4417..63cb0019b1 100644 @Override diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index e16d30f2ca..4af5a230ba 100644 +index e16d30f2c..4af5a230b 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -1,5 +1,6 @@ @@ -510,7 +510,7 @@ index e16d30f2ca..4af5a230ba 100644 } diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java -index 8d7a6d2403..707bd2600d 100644 +index 8d7a6d240..707bd2600 100644 --- a/src/main/java/net/minecraft/server/CustomFunction.java +++ b/src/main/java/net/minecraft/server/CustomFunction.java @@ -13,12 +13,22 @@ public class CustomFunction { @@ -537,7 +537,7 @@ index 8d7a6d2403..707bd2600d 100644 return this.b; } diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java -index ba40d5fbb5..ee42e1dfa4 100644 +index ba40d5fbb..ee42e1dfa 100644 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java @@ -103,7 +103,7 @@ public class CustomFunctionData implements IResourcePackListener { @@ -550,7 +550,7 @@ index ba40d5fbb5..ee42e1dfa4 100644 int k = 0; CustomFunction.c[] acustomfunction_c = customfunction.b(); diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 9eed98e379..d6646d7e61 100644 +index 9eed98e37..d6646d7e6 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -20,6 +20,8 @@ import java.util.List; @@ -638,7 +638,7 @@ index 9eed98e379..d6646d7e61 100644 } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index d2cfc65513..74a4bf9c5c 100644 +index d2cfc6551..74a4bf9c5 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender; @@ -677,7 +677,7 @@ index d2cfc65513..74a4bf9c5c 100644 protected BlockPosition ag() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 1f350e3352..35e3f1c78d 100644 +index 1f350e335..35e3f1c78 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -37,7 +37,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -753,7 +753,7 @@ index 1f350e3352..35e3f1c78d 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b4a0bd7951..4dc6917759 100644 +index b4a0bd795..4dc691775 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -63,7 +63,7 @@ import org.bukkit.craftbukkit.CraftServer; @@ -929,7 +929,7 @@ index b4a0bd7951..4dc6917759 100644 this.methodProfiler.exit(); } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 93d838ec2d..2a6955f855 100644 +index 93d838ec2..2a6955f85 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,7 +1,9 @@ @@ -1012,7 +1012,7 @@ index 93d838ec2d..2a6955f855 100644 protected void broadcast(Entity entity, Packet packet) { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6a681d694e..914366afcd 100644 +index 6a681d694..914366afc 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -1067,7 +1067,7 @@ index 6a681d694e..914366afcd 100644 // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s); // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java -index 2c671629a4..eb3269e0ea 100644 +index 2c671629a..eb3269e0e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java @@ -2,6 +2,8 @@ package net.minecraft.server; @@ -1094,7 +1094,7 @@ index 2c671629a4..eb3269e0ea 100644 PlayerConnectionUtils.LOGGER.debug("Ignoring packet due to disconnection: " + packet); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 0694f4563e..1652a57e25 100644 +index 0694f4563..1652a57e2 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1,5 +1,6 @@ @@ -1118,7 +1118,7 @@ index 0694f4563e..1652a57e25 100644 public WhiteList getWhitelist() { diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java -index 00bbd34b6a..f533860bbe 100644 +index 00bbd34b6..f533860bb 100644 --- a/src/main/java/net/minecraft/server/TickListServer.java +++ b/src/main/java/net/minecraft/server/TickListServer.java @@ -28,13 +28,18 @@ public class TickListServer implements TickList { @@ -1168,7 +1168,7 @@ index 00bbd34b6a..f533860bbe 100644 this.g.clear(); } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 820180ab3f..fa6400dccd 100644 +index 820180ab3..fa6400dcc 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -9,11 +9,12 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer; @@ -1187,7 +1187,7 @@ index 820180ab3f..fa6400dccd 100644 private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry(); public CraftPersistentDataContainer persistentDataContainer; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 304dfac061..da3eb20d45 100644 +index 6861711c2..132c08dd1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1,5 +1,7 @@ @@ -1207,7 +1207,7 @@ index 304dfac061..da3eb20d45 100644 import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.block.CapturedBlockState; -@@ -71,7 +73,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -73,7 +75,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper @@ -1216,7 +1216,7 @@ index 304dfac061..da3eb20d45 100644 public static BlockPosition lastPhysicsProblem; // Spigot private org.spigotmc.TickLimiter entityLimiter; private org.spigotmc.TickLimiter tileLimiter; -@@ -134,7 +136,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -138,7 +140,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public void c(WorldBorder worldborder, double d0) {} }); // CraftBukkit end @@ -1225,7 +1225,7 @@ index 304dfac061..da3eb20d45 100644 this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime); this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); } -@@ -716,15 +718,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -720,15 +722,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { } timings.tileEntityPending.stopTiming(); // Spigot @@ -1243,7 +1243,7 @@ index 304dfac061..da3eb20d45 100644 CrashReport crashreport = CrashReport.a(throwable, "Ticking entity"); CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked"); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 8a5ac6f69b..069898bad7 100644 +index 8a5ac6f69..069898bad 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1,6 +1,8 @@ @@ -1368,10 +1368,10 @@ index 8a5ac6f69b..069898bad7 100644 // CraftBukkit start - moved from MinecraftServer.saveChunks diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0c9d5d2314..49be263aea 100644 +index 8d1f066f0..f3eacb181 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1951,12 +1951,31 @@ public final class CraftServer implements Server { +@@ -1973,12 +1973,31 @@ public final class CraftServer implements Server { private final Spigot spigot = new Spigot() { @@ -1405,7 +1405,7 @@ index 0c9d5d2314..49be263aea 100644 org.spigotmc.RestartCommand.restart(); 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 2bd22a3698..0000000000 +index 2bd22a369..000000000 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java +++ /dev/null @@ -1,162 +0,0 @@ @@ -1572,7 +1572,7 @@ index 2bd22a3698..0000000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 9eba8449e4..1094190fd9 100644 +index 9eba8449e..1094190fd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1753,6 +1753,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1591,7 +1591,7 @@ index 9eba8449e4..1094190fd9 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 b90979c7ba..8823f94f7b 100644 +index b90979c7b..8823f94f7 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -1,5 +1,6 @@ @@ -1657,7 +1657,7 @@ index b90979c7ba..8823f94f7b 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 3f55381c15..0d9a466809 100644 +index 3f55381c1..0d9a46680 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java @@ -1,9 +1,11 @@ @@ -1742,7 +1742,7 @@ index 3f55381c15..0d9a466809 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 e52ef47b78..3d90b34268 100644 +index e52ef47b7..3d90b3426 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; @@ -1754,7 +1754,7 @@ index e52ef47b78..3d90b34268 100644 this.value = value; } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 68728b4d86..02f3300533 100644 +index 68728b4d8..02f330053 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -298,6 +298,13 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -1772,7 +1772,7 @@ index 68728b4d86..02f3300533 100644 * This helper class represents the different NBT Tags. *

diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index ca7789b5e0..4423839697 100644 +index ca7789b5e..442383969 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -31,7 +31,7 @@ import net.minecraft.server.EntityWither; diff --git a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch index 87cb94f667..cccd0e8276 100644 --- a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch +++ b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch @@ -1,11 +1,11 @@ -From a1b740262a5cde6f25349879fad15a4c26e450c0 Mon Sep 17 00:00:00 2001 +From 4ccd62f295eda1fe1536551f4630024575784324 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 3 Mar 2016 03:53:43 -0600 Subject: [PATCH] Allow for toggling of spawn chunks diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 2845686411..8ee2b9bb1b 100644 +index 284568641..8ee2b9bb1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -113,4 +113,10 @@ public class PaperWorldConfig { @@ -20,10 +20,10 @@ index 2845686411..8ee2b9bb1b 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index da3eb20d45..dfca06cf7c 100644 +index 132c08dd1..7d668759f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -137,6 +137,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -141,6 +141,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { }); // CraftBukkit end timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings diff --git a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch index 91edc61afc..505b33410e 100644 --- a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From a4b1083f69dd3c49e34f3c05d70e300f1dcc451c Mon Sep 17 00:00:00 2001 +From 681bdfdef2c555527c463424e57dc22a563177d1 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 @@ -140,10 +140,10 @@ index 2b3844ae5..7b8c523e6 100644 if (this.T) { this.T = false; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 03ad9e005..88bd1ff20 100644 +index 99a6b3d44..e3939387e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1948,6 +1948,17 @@ public final class CraftServer implements Server { +@@ -1970,6 +1970,17 @@ public final class CraftServer implements Server { return CraftMagicNumbers.INSTANCE; } diff --git a/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch index a6a877efad..06b5a84495 100644 --- a/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch +++ b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch @@ -1,11 +1,11 @@ -From f52fb22b301460d966ba0fce4f61a16411181bc0 Mon Sep 17 00:00:00 2001 +From be08284655bd9a8090127ef2f899eb75b8e770da Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:52:34 -0600 Subject: [PATCH] Prevent tile entity and entity crashes diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index fa6400dccd..e2f3cec742 100644 +index fa6400dcc..e2f3cec74 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -194,7 +194,12 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -23,10 +23,10 @@ index fa6400dccd..e2f3cec742 100644 } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index dfca06cf7c..a7eb3e54e9 100644 +index 7d668759f..84d777022 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -658,11 +658,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -662,11 +662,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { gameprofilerfiller.exit(); } catch (Throwable throwable) { @@ -45,7 +45,7 @@ index dfca06cf7c..a7eb3e54e9 100644 } // Spigot start finally { -@@ -728,11 +730,12 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -732,11 +734,12 @@ public abstract class World implements GeneratorAccess, AutoCloseable { try { consumer.accept(entity); } catch (Throwable throwable) { diff --git a/Spigot-Server-Patches/0032-Optimize-explosions.patch b/Spigot-Server-Patches/0032-Optimize-explosions.patch index b7bf4e8362..0760d390b2 100644 --- a/Spigot-Server-Patches/0032-Optimize-explosions.patch +++ b/Spigot-Server-Patches/0032-Optimize-explosions.patch @@ -1,4 +1,4 @@ -From f29befd27959d00e4d67f2056b2a97458291ffab Mon Sep 17 00:00:00 2001 +From 8e215ed62552a6272e098b2e13450e36c6025b23 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 11:59:48 -0600 Subject: [PATCH] Optimize explosions @@ -10,7 +10,7 @@ This patch adds a per-tick cache that is used for storing and retrieving an entity's exposure during an explosion. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 50dec5cb5e..f038d3f7dc 100644 +index 50dec5cb5..f038d3f7d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -150,4 +150,10 @@ public class PaperWorldConfig { @@ -25,7 +25,7 @@ index 50dec5cb5e..f038d3f7dc 100644 + } } diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index a063d1bfaa..5583860f15 100644 +index a063d1bfa..5583860f1 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -177,7 +177,7 @@ public class Explosion { @@ -123,7 +123,7 @@ index a063d1bfaa..5583860f15 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7b8c523e6d..3d580a666b 100644 +index 7b8c523e6..3d580a666 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1176,6 +1176,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 2 Mar 2016 23:45:17 -0600 Subject: [PATCH] Disable spigot tick limiters diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ea86476ea5..ef00928466 100644 +index 7c95fd664..389fadf92 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -628,9 +628,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -632,9 +632,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { // Spigot start // Iterator iterator = this.tileEntityListTick.iterator(); int tilesThisCycle = 0; diff --git a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch index 778d37e637..a7c6934e78 100644 --- a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch +++ b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch @@ -1,4 +1,4 @@ -From f5b16a53f760891bfab7e4951725a6fff547c044 Mon Sep 17 00:00:00 2001 +From 8611dc3d7c2d3cdc9187a2121c5805bc22b123e0 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 914366afc..5e8739462 100644 } else if (this.player.getChatFlags() == 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 88bd1ff20..50deb7187 100644 +index e3939387e..f7c29e372 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -710,6 +710,29 @@ public final class CraftServer implements Server { +@@ -720,6 +720,29 @@ public final class CraftServer implements Server { Validate.notNull(commandLine, "CommandLine cannot be null"); org.spigotmc.AsyncCatcher.catchOp("command dispatch"); // Spigot diff --git a/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch index d21dd3218a..cfc4842f00 100644 --- a/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch +++ b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch @@ -1,14 +1,14 @@ -From 9a80933d548ed314930de177c6c441af7cdb69bf Mon Sep 17 00:00:00 2001 +From 06c67e735b044dcf1d59d1352f235be1201f51df 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 50deb7187..37d3e2c80 100644 +index f7c29e372..6107070b3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1607,6 +1607,7 @@ public final class CraftServer implements Server { +@@ -1629,6 +1629,7 @@ public final class CraftServer implements Server { return helpMap; } diff --git a/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch index 391e06c70b..52ba3fa469 100644 --- a/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From ad137e8e3c6ec5c46cd87caa10e2c1056439bfef Mon Sep 17 00:00:00 2001 +From 9c2e2bd4f00ba7db7f39ce492e6d875e89ca2480 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 03:15:41 -0600 Subject: [PATCH] Add exception reporting event @@ -80,7 +80,7 @@ index 9adb21279..f3d20f214 100644 } } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index b09868e2d..1d789b668 100644 +index a3d150a13..c83e0cd4e 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -15,6 +15,9 @@ import java.util.function.BooleanSupplier; @@ -121,7 +121,7 @@ index c9c2b0025..1422503e1 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index b2260498c..c575ff57d 100644 +index 3dd72e084..291c2a17b 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -727,6 +727,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -209,7 +209,7 @@ index d5e9bae70..1bcf01c09 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index caead09a6..bf20ce934 100644 +index 74be3e40d..6e68c013a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2,6 +2,9 @@ package net.minecraft.server; @@ -222,7 +222,7 @@ index caead09a6..bf20ce934 100644 import com.google.common.collect.Lists; import java.io.IOException; import java.util.Collection; -@@ -658,8 +661,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -662,8 +665,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { gameprofilerfiller.exit(); } catch (Throwable throwable) { // Paper start - Prevent tile entity and entity crashes @@ -235,7 +235,7 @@ index caead09a6..bf20ce934 100644 tilesThisCycle--; this.tileEntityListTick.remove(tileTickPosition--); continue; -@@ -730,8 +736,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -734,8 +740,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable { consumer.accept(entity); } catch (Throwable throwable) { // Paper start - Prevent tile entity and entity crashes diff --git a/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch index 6d53d8342d..8eebaa1144 100644 --- a/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch @@ -1,4 +1,4 @@ -From a958059458de755538ab3105bd1360b2c5803d21 Mon Sep 17 00:00:00 2001 +From 1053c2b77c943e8f935e414456ecfa157c5e9e7b 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 9c9f7cee6..117b349c0 100644 +index 30286a50d..c65e6256b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2067,5 +2067,23 @@ public final class CraftServer implements Server { +@@ -2089,5 +2089,23 @@ public final class CraftServer implements Server { return null; } } diff --git a/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch index 0e7f4a4166..8bc24fcde7 100644 --- a/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch +++ b/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch @@ -1,4 +1,4 @@ -From b098719121fc98fcaf4d0640e38972bd497722e7 Mon Sep 17 00:00:00 2001 +From 2e850c1d5043b2035d22ef12a6d140b59c0fb0e0 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 117b349c0..1cfdfcdd3 100644 +index c65e6256b..cf0733baf 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -803,8 +803,18 @@ public final class CraftServer implements Server { +@@ -825,8 +825,18 @@ public final class CraftServer implements Server { world.paperConfig.init(); // Paper } diff --git a/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch index a984d47385..6ff30a8554 100644 --- a/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch +++ b/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch @@ -1,4 +1,4 @@ -From 51f19a3999d3395db37833951feac5620f9ee18d Mon Sep 17 00:00:00 2001 +From 02692be9ad22aecba400483042971666046d8af9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 20:16:03 -0400 Subject: [PATCH] Add World Util Methods @@ -6,10 +6,10 @@ Subject: [PATCH] Add World Util Methods Methods that can be used for other patches to help improve logic. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bf20ce9341..0d403ec707 100644 +index 6e68c013a..c2039d0e4 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -218,6 +218,18 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -222,6 +222,18 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return chunk == null ? null : chunk.getFluid(blockposition); } @@ -29,7 +29,7 @@ index bf20ce9341..0d403ec707 100644 @Override diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java -index 020e5c171a..4ee13ac454 100644 +index 020e5c171..4ee13ac45 100644 --- a/src/main/java/net/minecraft/server/WorldBorder.java +++ b/src/main/java/net/minecraft/server/WorldBorder.java @@ -19,6 +19,7 @@ public class WorldBorder { diff --git a/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch index 1b36aec32c..3e53aafd1c 100644 --- a/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch +++ b/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch @@ -1,4 +1,4 @@ -From d4364f50671372762e805a576f9d1ac2c43add24 Mon Sep 17 00:00:00 2001 +From ad7babe3efdc1b799a999c0fcf8e4d3f49344752 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 02:07:55 -0600 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling @@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward. Optimize getType and getBlockData to manually inline and optimize the calls diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java -index a3b5793e48..71089442c1 100644 +index a3b5793e4..71089442c 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -13,6 +13,14 @@ public class BaseBlockPosition implements Comparable { @@ -31,7 +31,7 @@ index a3b5793e48..71089442c1 100644 public BaseBlockPosition(int i, int j, int k) { this.a = i; diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 6ed23ea6c8..7033c6e839 100644 +index f3d20f214..ee94f59e6 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -208,12 +208,24 @@ public class Chunk implements IChunkAccess { @@ -64,7 +64,7 @@ index 6ed23ea6c8..7033c6e839 100644 IBlockData iblockdata = null; diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index 652067757a..0d5deee365 100644 +index 652067757..0d5deee36 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -9,7 +9,7 @@ public class ChunkSection { @@ -77,10 +77,10 @@ index 652067757a..0d5deee365 100644 public ChunkSection(int i) { this(i, (short) 0, (short) 0, (short) 0); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0d403ec707..d81178d26d 100644 +index c2039d0e4..502da7f52 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -167,11 +167,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -171,11 +171,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { } public static boolean isValidLocation(BlockPosition blockposition) { diff --git a/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch index 7ec501108d..e5c5f82f05 100644 --- a/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch +++ b/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch @@ -1,4 +1,4 @@ -From bfa1a2ec2f12d7b6b530b3742b20a3f91f02b5db Mon Sep 17 00:00:00 2001 +From 33a190ae43bb39273a3b5ae1a07d6cd7986e3cbf Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 19:55:45 -0400 Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener @@ -6,7 +6,7 @@ Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener Saves on some object allocation and processing when no plugin listens to this diff --git a/src/main/java/net/minecraft/server/BlockPlant.java b/src/main/java/net/minecraft/server/BlockPlant.java -index ed1da4f4ba..a6891b9fa7 100644 +index ed1da4f4b..a6891b9fa 100644 --- a/src/main/java/net/minecraft/server/BlockPlant.java +++ b/src/main/java/net/minecraft/server/BlockPlant.java @@ -16,7 +16,7 @@ public class BlockPlant extends Block { @@ -19,7 +19,7 @@ index ed1da4f4ba..a6891b9fa7 100644 } } diff --git a/src/main/java/net/minecraft/server/BlockTallPlant.java b/src/main/java/net/minecraft/server/BlockTallPlant.java -index 42e86881bd..6cdce11581 100644 +index 42e86881b..6cdce1158 100644 --- a/src/main/java/net/minecraft/server/BlockTallPlant.java +++ b/src/main/java/net/minecraft/server/BlockTallPlant.java @@ -55,7 +55,7 @@ public class BlockTallPlant extends BlockPlant { @@ -32,7 +32,7 @@ index 42e86881bd..6cdce11581 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3d580a666b..3094f763ba 100644 +index 3d580a666..3094f763b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1142,6 +1142,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { return worldserver.getWorldData().getName() + " " + IRegistry.DIMENSION_TYPE.getKey(worldserver.worldProvider.getDimensionManager()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d81178d26d..528e53fc42 100644 +index 502da7f52..83f9ea88f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -363,7 +363,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -367,7 +367,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { // CraftBukkit start iblockdata1.b(this, blockposition, j); // Don't call an event for the old block to limit event spam CraftWorld world = ((WorldServer) this).getWorld(); @@ -56,7 +56,7 @@ index d81178d26d..528e53fc42 100644 BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftBlockData.fromData(iblockdata)); this.getServer().getPluginManager().callEvent(event); -@@ -475,7 +475,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -479,7 +479,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { try { // CraftBukkit start CraftWorld world = ((WorldServer) this).getWorld(); @@ -66,7 +66,7 @@ index d81178d26d..528e53fc42 100644 this.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6c2107bd06..4e29746c14 100644 +index a9631c5d2..b7efcb860 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -75,6 +75,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index b65361b698..53d5f59f31 100644 --- a/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -1,14 +1,14 @@ -From ae6ae40b92f953a6b03d912c7e06595d8b70c437 Mon Sep 17 00:00:00 2001 +From 49d1e2880a86cc29f82af932fefd5f931621652f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 17:48:50 -0400 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 528e53fc42..1323d1959a 100644 +index 83f9ea88f..9672248c7 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -433,6 +433,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -437,6 +437,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public void b(BlockPosition blockposition, IBlockData iblockdata, IBlockData iblockdata1) {} public void applyPhysics(BlockPosition blockposition, Block block) { diff --git a/Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch index a37810e258..ff8f5c4243 100644 --- a/Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch +++ b/Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch @@ -1,4 +1,4 @@ -From 79a49715c5dcc16c725461a67d2c2f3ef2be20d8 Mon Sep 17 00:00:00 2001 +From 05e214f72ca86351ac42b9c56a191fedf7d9e2e4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:25:28 -0400 Subject: [PATCH] Remove unused World Tile Entity List @@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List Massive hit to performance and it is completely unnecessary. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1323d1959a..5a80f35c91 100644 +index 9672248c7..1dccc2e0d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -36,7 +36,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -18,7 +18,7 @@ index 1323d1959a..5a80f35c91 100644 public final List tileEntityListTick = Lists.newArrayList(); protected final List tileEntityListPending = Lists.newArrayList(); protected final java.util.Set tileEntityListUnload = com.google.common.collect.Sets.newHashSet(); -@@ -598,9 +598,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -602,9 +602,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable { }, tileentity::getPosition}); } @@ -30,7 +30,7 @@ index 1323d1959a..5a80f35c91 100644 this.tileEntityListTick.add(tileentity); } -@@ -636,7 +636,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -640,7 +640,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { timings.tileEntityTick.startTiming(); // Spigot if (!this.tileEntityListUnload.isEmpty()) { this.tileEntityListTick.removeAll(this.tileEntityListUnload); @@ -39,7 +39,7 @@ index 1323d1959a..5a80f35c91 100644 this.tileEntityListUnload.clear(); } -@@ -697,7 +697,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -701,7 +701,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { tilesThisCycle--; this.tileEntityListTick.remove(tileTickPosition--); // Spigot end @@ -48,7 +48,7 @@ index 1323d1959a..5a80f35c91 100644 if (this.isLoaded(tileentity.getPosition())) { this.getChunkAtWorldCoords(tileentity.getPosition()).removeTileEntity(tileentity.getPosition()); } -@@ -727,7 +727,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -731,7 +731,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3); // CraftBukkit start // From above, don't screw this up - SPIGOT-1746 @@ -57,7 +57,7 @@ index 1323d1959a..5a80f35c91 100644 this.a(tileentity1); } // CraftBukkit end -@@ -993,7 +993,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -997,7 +997,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { } else { if (tileentity != null) { this.tileEntityListPending.remove(tileentity); @@ -67,7 +67,7 @@ index 1323d1959a..5a80f35c91 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index dac6e10d25..7b3e3487fa 100644 +index 2f1857dbb..92745505a 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1629,7 +1629,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0104-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0104-Faster-redstone-torch-rapid-clock-removal.patch index ee205970b8..32b45556cd 100644 --- a/Spigot-Server-Patches/0104-Faster-redstone-torch-rapid-clock-removal.patch +++ b/Spigot-Server-Patches/0104-Faster-redstone-torch-rapid-clock-removal.patch @@ -1,4 +1,4 @@ -From 3d92fba8c3d4117c565260429c47727bb900de5d Mon Sep 17 00:00:00 2001 +From bc50c0aadcb61ddd8eca71d95c64bea7dc5f06a0 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Mon, 23 May 2016 12:12:37 +0200 Subject: [PATCH] Faster redstone torch rapid clock removal @@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal Only resize the the redstone torch list once, since resizing arrays / lists is costly diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java -index 98a255ae57..4c3062ece9 100644 +index 98a255ae5..4c3062ece 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java @@ -11,7 +11,7 @@ import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit @@ -77,10 +77,10 @@ index 98a255ae57..4c3062ece9 100644 public RedstoneUpdateInfo(BlockPosition blockposition, long i) { this.a = blockposition; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5a80f35c91..3898010774 100644 +index 1dccc2e0d..05ee02c4c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -82,6 +82,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -84,6 +84,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { private org.spigotmc.TickLimiter tileLimiter; private int tileTickPosition; public final Map explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions diff --git a/Spigot-Server-Patches/0112-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0112-Add-setting-for-proxy-online-mode-status.patch index 3061956a69..68b30f3f84 100644 --- a/Spigot-Server-Patches/0112-Add-setting-for-proxy-online-mode-status.patch +++ b/Spigot-Server-Patches/0112-Add-setting-for-proxy-online-mode-status.patch @@ -1,4 +1,4 @@ -From 503fadc7cc634f8a4aac5fd3039066def6718be5 Mon Sep 17 00:00:00 2001 +From d8e75a84e75581970efe872bb085fe0d3d896892 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 @@ -45,10 +45,10 @@ index 1422503e1..d3c2e1bed 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 1cfdfcdd3..6c5a140a8 100644 +index cf0733baf..1c25dc8f3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1377,7 +1377,8 @@ public final class CraftServer implements Server { +@@ -1399,7 +1399,8 @@ public final class CraftServer implements Server { // Spigot Start GameProfile profile = null; // Only fetch an online UUID in online mode diff --git a/Spigot-Server-Patches/0124-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0124-Allow-Reloading-of-Command-Aliases.patch index cf5a628402..67990bf153 100644 --- a/Spigot-Server-Patches/0124-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-Server-Patches/0124-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From dfd88925fe2a40a2bd6189d19d4065eaa8b7d09e Mon Sep 17 00:00:00 2001 +From eb451b071a9d38520822078a59afba37a9c6146c 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 6c5a140a8..c2636df6b 100644 +index 1c25dc8f3..8f7b7e67f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2096,5 +2096,24 @@ public final class CraftServer implements Server { +@@ -2118,5 +2118,24 @@ public final class CraftServer implements Server { DefaultPermissions.registerCorePermissions(); CraftDefaultPermissions.registerCorePermissions(); } diff --git a/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch index a396dd3fb7..39dfb40275 100644 --- a/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch +++ b/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch @@ -1,4 +1,4 @@ -From b8a1a6f9d0ea4937e32897cdd74f09e6e844b8b5 Mon Sep 17 00:00:00 2001 +From dc7eab832d8090ec3ed5654c5f66e7713f6693ba Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Dec 2016 00:11:43 -0500 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z @@ -6,10 +6,10 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z Reduce method invocations for World.isLoaded(BlockPosition)Z diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3898010774..f8b2d3abf9 100644 +index 05ee02c4c..ff14c265b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -220,6 +220,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -224,6 +224,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return chunk == null ? null : chunk.getFluid(blockposition); } diff --git a/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch index 8fffc0d24c..27a33f5e10 100644 --- a/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From 007be296248007d9e800ec40cdb8abdae8de49c5 Mon Sep 17 00:00:00 2001 +From 72467495d3d17355d11889a3c33049bdf745610e 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 5a83fc21c..295b8390c 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c2636df6b..ffead57b5 100644 +index 8f7b7e67f..2e0f443d9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2115,5 +2115,10 @@ public final class CraftServer implements Server { +@@ -2137,5 +2137,10 @@ public final class CraftServer implements Server { commandMap.registerServerAliases(); return true; } diff --git a/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch index 7fe26dd628..67eca632e5 100644 --- a/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -1,4 +1,4 @@ -From bab73747580758ee7e5ffd7b81c24d51f7b04864 Mon Sep 17 00:00:00 2001 +From 315a86ae9cbec64a1333240cb6277631d7547600 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 @@ -258,7 +258,7 @@ index 1eb53f67e..308bc3baf 100644 this.k = new GameProfileBanList(PlayerList.b); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ffead57b5..2b2cacd90 100644 +index 2e0f443d9..742c21480 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -42,7 +42,6 @@ import java.util.logging.Level; @@ -269,7 +269,7 @@ index ffead57b5..2b2cacd90 100644 import net.minecraft.server.Advancement; import net.minecraft.server.ArgumentEntity; import net.minecraft.server.Block; -@@ -1096,9 +1095,13 @@ public final class CraftServer implements Server { +@@ -1118,9 +1117,13 @@ public final class CraftServer implements Server { return logger; } @@ -284,7 +284,7 @@ index ffead57b5..2b2cacd90 100644 @Override public PluginCommand getPluginCommand(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 40e7c895c..d1636ce21 100644 +index 93fcfd5f3..0e76e3466 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -13,7 +13,7 @@ import java.util.logging.Logger; diff --git a/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch index b2f3fd0887..5c2d7e7896 100644 --- a/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch +++ b/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch @@ -1,11 +1,11 @@ -From a8d4ba39f05bceef26afcbc595f109265bb44775 Mon Sep 17 00:00:00 2001 +From ec59488f25be69a5f469dce46fa47018e4355331 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 2b2cacd90..d4d5c66f2 100644 +index 742c21480..1f1af567b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -79,6 +79,7 @@ import net.minecraft.server.WorldServer; @@ -24,7 +24,7 @@ index 2b2cacd90..d4d5c66f2 100644 import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.player.PlayerChatTabCompleteEvent; import org.bukkit.event.server.BroadcastMessageEvent; -@@ -740,7 +742,13 @@ public final class CraftServer implements Server { +@@ -750,7 +752,13 @@ public final class CraftServer implements Server { // Spigot start if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) { diff --git a/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch index b713e2cb25..e4fd570222 100644 --- a/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch +++ b/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 3706499c4b6d89de159fce38463917abc89729f3 Mon Sep 17 00:00:00 2001 +From 026d149a2059a4f00647f08440325276834191a3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 22:11:48 -0500 Subject: [PATCH] Basic PlayerProfile API @@ -486,7 +486,7 @@ index 581199e6d..a072222bc 100644 private UserCacheEntry(GameProfile gameprofile, Date date) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d4d5c66f2..e306c17f2 100644 +index 1f1af567b..8d23eb0e7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -199,6 +199,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; @@ -499,7 +499,7 @@ index d4d5c66f2..e306c17f2 100644 public final class CraftServer implements Server { private final String serverName = "Paper"; // Paper private final String serverVersion; -@@ -2131,5 +2134,24 @@ public final class CraftServer implements Server { +@@ -2153,5 +2156,24 @@ public final class CraftServer implements Server { public boolean suggestPlayerNamesWhenNullTabCompletions() { return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions; } diff --git a/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch index d8b800127d..cd5f184999 100644 --- a/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch +++ b/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch @@ -1,14 +1,14 @@ -From 2a92dde62afcd6886d6ef65f028b9453f8df755d Mon Sep 17 00:00:00 2001 +From a7f54212cb9fc405240c8bd0cb90bcccb0c3ccec Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 9 Aug 2017 17:51:22 -0500 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index f8b2d3abf9..0dd84c0977 100644 +index ff14c265b..bfb682ebb 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -641,7 +641,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -645,7 +645,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { gameprofilerfiller.enter("blockEntities"); timings.tileEntityTick.startTiming(); // Spigot if (!this.tileEntityListUnload.isEmpty()) { diff --git a/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch index a3b4901109..0e500a0e6f 100644 --- a/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch +++ b/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch @@ -1,4 +1,4 @@ -From af2afc1ededb2a1e727251af12bcca4040c46be4 Mon Sep 17 00:00:00 2001 +From 781c4627c43e07dfca1b3c05f1dde05b08fb178f Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 31 Oct 2017 03:26:18 +0100 Subject: [PATCH] Send attack SoundEffects only to players who can see the @@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 3bd5ddba68..c86d22e7ae 100644 +index 3bd5ddba6..c86d22e7a 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1023,6 +1023,15 @@ public abstract class EntityHuman extends EntityLiving { @@ -72,10 +72,10 @@ index 3bd5ddba68..c86d22e7ae 100644 entity.extinguish(); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0dd84c0977..361cc6a92e 100644 +index bfb682ebb..6c3cd19be 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -578,6 +578,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -582,6 +582,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { this.playSound(entityhuman, (double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D, soundeffect, soundcategory, f, f1); } diff --git a/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch index 6c479a7a90..490d02cf15 100644 --- a/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch +++ b/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch @@ -1,4 +1,4 @@ -From f51ba416eefd643136f51b6a65ce5baf51447bbe Mon Sep 17 00:00:00 2001 +From 0a49d9acec9fccf1b2b22b5e6f673dc73c994316 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 16 Nov 2017 12:12:41 +0000 Subject: [PATCH] use CB BlockState implementations for captured blocks @@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping information on restoration when the event is cancelled. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 361cc6a92e..5a237fa1dd 100644 +index 6c3cd19be..f349c7fe2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -66,7 +66,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -30,7 +30,7 @@ index 361cc6a92e..5a237fa1dd 100644 public Map capturedTileEntities = new HashMap<>(); public List captureDrops; public long ticksPerAnimalSpawns; -@@ -253,7 +253,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -257,7 +257,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public boolean setTypeAndData(BlockPosition blockposition, IBlockData iblockdata, int i) { // CraftBukkit start - tree generation if (this.captureTreeGeneration) { @@ -39,7 +39,7 @@ index 361cc6a92e..5a237fa1dd 100644 if (blockstate == null) { blockstate = CapturedBlockState.getTreeBlockState(this, blockposition, i); this.capturedBlockStates.put(blockposition.immutableCopy(), blockstate); -@@ -272,7 +272,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -276,7 +276,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { // CraftBukkit start - capture blockstates if (this.captureBlockStates && !this.capturedBlockStates.containsKey(blockposition)) { @@ -48,7 +48,7 @@ index 361cc6a92e..5a237fa1dd 100644 this.capturedBlockStates.put(blockposition.immutableCopy(), blockstate); } // CraftBukkit end -@@ -539,7 +539,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -543,7 +543,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public IBlockData getType(BlockPosition blockposition) { // CraftBukkit start - tree generation if (captureTreeGeneration) { diff --git a/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch index 885e47fffc..f56dd54075 100644 --- a/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch +++ b/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From e799ffec6d65c2edb85ae38d5729391c7010a9e1 Mon Sep 17 00:00:00 2001 +From fbf5b2aff866d85d2c1744ad445c0aa56a8ee2b0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Nov 2017 13:19:58 -0500 Subject: [PATCH] AsyncTabCompleteEvent @@ -14,7 +14,7 @@ completion, such as offline players. Also adds isCommand and getLocation to the sync TabCompleteEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 9af8e947e..ad2a36627 100644 +index 2a3771d06..64f789d7c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -524,10 +524,10 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -72,10 +72,10 @@ index 9af8e947e..ad2a36627 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e306c17f2..e68b40be6 100644 +index 8d23eb0e7..b7eaa0fef 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1687,7 +1687,7 @@ public final class CraftServer implements Server { +@@ -1709,7 +1709,7 @@ public final class CraftServer implements Server { offers = tabCompleteChat(player, message); } diff --git a/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch index 434362dc07..52db688acf 100644 --- a/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From 4b032c2d960af52e463e60ac5ab539ff4f0a607e Mon Sep 17 00:00:00 2001 +From b918e704817561a55e71d2917d958f4386822126 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:36:02 -0500 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent @@ -9,10 +9,10 @@ from triggering monster spawns on a server. Also a highly more effecient way to blanket block spawns in a world diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 242ff923a0..99a4c0d227 100644 +index c83e0cd4e..71db32bdd 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -502,6 +502,15 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -508,6 +508,15 @@ public class ChunkProviderServer extends IChunkProvider { this.world.timings.countNaturalMobs.stopTiming(); // Paper - timings this.world.getMethodProfiler().exit(); @@ -29,7 +29,7 @@ index 242ff923a0..99a4c0d227 100644 Optional optional = ((Either) playerchunk.b().getNow(PlayerChunk.UNLOADED_CHUNK)).left(); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 1296eb04f0..625b684287 100644 +index 1296eb04f..625b68428 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1,5 +1,6 @@ @@ -48,7 +48,7 @@ index 1296eb04f0..625b684287 100644 public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 936fc4f6b9..fcf229ad5d 100644 +index 936fc4f6b..fcf229ad5 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -881,12 +881,23 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch index 48f02af3da..400126522d 100644 --- a/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch +++ b/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From efb1975e4adc557e74ebf67a23ce8edb8651e459 Mon Sep 17 00:00:00 2001 +From 11f63e76b268644dda2fe2f734dba85352df2a30 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:40:24 -0400 Subject: [PATCH] getPlayerUniqueId API @@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e68b40be6..eecb5353f 100644 +index b7eaa0fef..bc70d0fc7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1380,6 +1380,26 @@ public final class CraftServer implements Server { +@@ -1402,6 +1402,26 @@ public final class CraftServer implements Server { return recipients.size(); } diff --git a/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch index c40fb79b30..145623f009 100644 --- a/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From 4d9578d880588210f742ed2f3fe7a4e0ca0c920b Mon Sep 17 00:00:00 2001 +From c2f678b34e344f93581410c541b1558987a4eb1e Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 15 Aug 2017 22:29:12 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder @@ -43,10 +43,10 @@ index bcb1c924b..c773314cf 100644 if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 462458645..451cc0c2d 100644 +index 8e1057cdc..367da203a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2261,11 +2261,17 @@ public class CraftWorld implements World { +@@ -2281,11 +2281,17 @@ public class CraftWorld implements World { @Override public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) { diff --git a/Spigot-Server-Patches/0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index d5f9efb151..e6908f7883 100644 --- a/Spigot-Server-Patches/0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -1,11 +1,11 @@ -From 9b045e16c6c9e4db7d5a27110f5c9cc5710a0c1a Mon Sep 17 00:00:00 2001 +From 7d627aabb5f289fc6cb4767f06f948cb00ea71f1 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 23 Jul 2018 12:57:39 +0200 Subject: [PATCH] Option to prevent armor stands from doing entity lookups diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 387e0dcb9f..eaaa51e4bf 100644 +index 387e0dcb9..eaaa51e4b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -388,4 +388,9 @@ public class PaperWorldConfig { @@ -19,10 +19,10 @@ index 387e0dcb9f..eaaa51e4bf 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a5af0f9d35..0d12deeb55 100644 +index cab9ec5dd..749915198 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -775,6 +775,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -779,6 +779,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { } } diff --git a/Spigot-Server-Patches/0257-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0257-Vanished-players-don-t-have-rights.patch index 28aa8c00ee..3c4420cf2d 100644 --- a/Spigot-Server-Patches/0257-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0257-Vanished-players-don-t-have-rights.patch @@ -1,11 +1,11 @@ -From 7c3e711274745dd5725d61548466ab75040d6cf6 Mon Sep 17 00:00:00 2001 +From e56e57826ef9eb475aa4e63695ef7c21ee67006c Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 23 Jul 2018 14:22:26 +0200 Subject: [PATCH] Vanished players don't have rights diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5ca3233c00..fcc47182c8 100644 +index 2612d60e3..d8f85eda0 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -98,7 +98,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index 5ca3233c00..fcc47182c8 100644 protected int j; @Nullable diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java -index 3a1ad2346b..9ab57be850 100644 +index 3a1ad2346..9ab57be85 100644 --- a/src/main/java/net/minecraft/server/IBlockData.java +++ b/src/main/java/net/minecraft/server/IBlockData.java @@ -146,6 +146,7 @@ public class IBlockData extends BlockDataAbstract implements @@ -30,7 +30,7 @@ index 3a1ad2346b..9ab57be850 100644 return this.getBlock().b(this, iblockaccess, blockposition, voxelshapecollision); } diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java -index ab875a7365..aed353365b 100644 +index ab875a736..aed353365 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -136,7 +136,8 @@ public class ItemBlock extends Item { @@ -44,7 +44,7 @@ index ab875a7365..aed353365b 100644 BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn); diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java -index 0f64a3c056..0f95bcbccb 100644 +index 0f64a3c05..0f95bcbcc 100644 --- a/src/main/java/net/minecraft/server/VoxelShape.java +++ b/src/main/java/net/minecraft/server/VoxelShape.java @@ -46,6 +46,7 @@ public abstract class VoxelShape { @@ -56,7 +56,7 @@ index 0f64a3c056..0f95bcbccb 100644 return (VoxelShape) (this.isEmpty() ? VoxelShapes.a() : new VoxelShapeArray(this.a, new DoubleListOffset(this.a(EnumDirection.EnumAxis.X), d0), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Y), d1), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Z), d2))); } diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java -index 143be566c6..08c83c62df 100644 +index 143be566c..08c83c62d 100644 --- a/src/main/java/net/minecraft/server/VoxelShapes.java +++ b/src/main/java/net/minecraft/server/VoxelShapes.java @@ -33,6 +33,7 @@ public final class VoxelShapes { @@ -76,10 +76,10 @@ index 143be566c6..08c83c62df 100644 if (operatorboolean.apply(false, false)) { throw (IllegalArgumentException) SystemUtils.c(new IllegalArgumentException()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0d12deeb55..c7b4734e94 100644 +index 749915198..1905aae87 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -148,6 +148,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -152,6 +152,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable { this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); } @@ -127,7 +127,7 @@ index 0d12deeb55..c7b4734e94 100644 public boolean p_() { return this.isClientSide; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f931fa48b4..317a5bf4ef 100644 +index f931fa48b..317a5bf4e 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1171,6 +1171,14 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0273-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0273-Add-Early-Warning-Feature-to-WatchDog.patch index b3bb2b49e5..a6f116b0ee 100644 --- a/Spigot-Server-Patches/0273-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/Spigot-Server-Patches/0273-Add-Early-Warning-Feature-to-WatchDog.patch @@ -1,4 +1,4 @@ -From 39f26f9908b8088f518a3cf39cb65c115fb4df84 Mon Sep 17 00:00:00 2001 +From 70203148ed53ddb0b445550b8dbe08007e4ae1d9 Mon Sep 17 00:00:00 2001 From: miclebrick Date: Wed, 8 Aug 2018 15:30:52 -0400 Subject: [PATCH] Add Early Warning Feature to WatchDog @@ -48,10 +48,10 @@ index 7c268eb54..9e5fe9794 100644 long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop lastTick = start - TICK_TIME; // Paper diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index eecb5353f..986e0ba9b 100644 +index bc70d0fc7..4cf288790 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -760,6 +760,7 @@ public final class CraftServer implements Server { +@@ -770,6 +770,7 @@ public final class CraftServer implements Server { @Override public void reload() { @@ -59,7 +59,7 @@ index eecb5353f..986e0ba9b 100644 reloadCount++; configuration = YamlConfiguration.loadConfiguration(getConfigFile()); commandsConfiguration = YamlConfiguration.loadConfiguration(getCommandsConfigFile()); -@@ -860,6 +861,7 @@ public final class CraftServer implements Server { +@@ -882,6 +883,7 @@ public final class CraftServer implements Server { enablePlugins(PluginLoadOrder.STARTUP); enablePlugins(PluginLoadOrder.POSTWORLD); getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.RELOAD)); diff --git a/Spigot-Server-Patches/0280-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0280-Send-nearby-packets-from-world-player-list-not-serve.patch index d5e680f922..b42ddd3c5e 100644 --- a/Spigot-Server-Patches/0280-Send-nearby-packets-from-world-player-list-not-serve.patch +++ b/Spigot-Server-Patches/0280-Send-nearby-packets-from-world-player-list-not-serve.patch @@ -1,4 +1,4 @@ -From 263663ffc1af517587f7619b6c6f05906fdcbb25 Mon Sep 17 00:00:00 2001 +From 1996f2fcdf1d7446e5a1c91a1dc61786449b116c Mon Sep 17 00:00:00 2001 From: Mystiflow Date: Fri, 6 Jul 2018 13:21:30 +0100 Subject: [PATCH] Send nearby packets from world player list not server list @@ -68,10 +68,10 @@ index 54505e056..a411a23de 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a6a273c31..2b82a9438 100644 +index 326c3564c..fe0912c06 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2096,7 +2096,7 @@ public class CraftWorld implements World { +@@ -2116,7 +2116,7 @@ public class CraftWorld implements World { double z = loc.getZ(); PacketPlayOutCustomSoundEffect packet = new PacketPlayOutCustomSoundEffect(new MinecraftKey(sound), SoundCategory.valueOf(category.name()), new Vec3D(x, y, z), volume, pitch); diff --git a/Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch index 0e14e9d6b3..7b2b9a5ad1 100644 --- a/Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch +++ b/Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch @@ -1,4 +1,4 @@ -From f8a350154eb4d6677dd3763a33010c0c63bd0960 Mon Sep 17 00:00:00 2001 +From e0300bd3374224689c4a9cd454254a19f8f1a1e0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Sep 2018 23:05:31 -0400 Subject: [PATCH] Support Overriding World Seeds @@ -85,10 +85,10 @@ index 561b6d946..95518e54d 100644 String s = nbttagcompound.getString("generatorName"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 986e0ba9b..bd84bc5a1 100644 +index 4cf288790..f36b64246 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -993,7 +993,7 @@ public final class CraftServer implements Server { +@@ -1015,7 +1015,7 @@ public final class CraftServer implements Server { WorldSettings worldSettings; // See MinecraftServer.a(String, String, long, WorldType, JsonElement) if (worlddata == null) { diff --git a/Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch index a5986fb447..1f0bd4544b 100644 --- a/Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch +++ b/Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch @@ -1,4 +1,4 @@ -From fdd50660b76f367a8fb9362b79b151ce94b78730 Mon Sep 17 00:00:00 2001 +From e75865f7fcf2070416e62057ef5a6b8bc66eb190 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 25 Sep 2018 06:53:43 +0200 Subject: [PATCH] Avoid dimension id collisions @@ -8,10 +8,10 @@ we would reuse an existing dimension id, if some other dimension was unloaded before. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index bd84bc5a1..625a00c3d 100644 +index f36b64246..4289d029c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -979,7 +979,7 @@ public final class CraftServer implements Server { +@@ -1001,7 +1001,7 @@ public final class CraftServer implements Server { boolean used = false; do { for (WorldServer server : console.getWorlds()) { diff --git a/Spigot-Server-Patches/0330-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0330-Optimize-redstone-algorithm.patch index 259657c3fe..b7d6f4e1b3 100644 --- a/Spigot-Server-Patches/0330-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0330-Optimize-redstone-algorithm.patch @@ -1,4 +1,4 @@ -From cf388f5b3b29afa40f7eb756e618a883d4da0ac7 Mon Sep 17 00:00:00 2001 +From 688ca6cf90b4945b2162d9317215938b4633b9ab Mon Sep 17 00:00:00 2001 From: theosib Date: Thu, 27 Sep 2018 01:43:35 -0600 Subject: [PATCH] Optimize redstone algorithm @@ -1127,10 +1127,10 @@ index 5bf2fc0b3..52a4982ec 100644 c(iblockdata, world, blockposition); world.a(blockposition, false); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 4ef619118..8f0b516e8 100644 +index 1905aae87..f54743a91 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -516,6 +516,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -520,6 +520,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { } @@ -1138,7 +1138,7 @@ index 4ef619118..8f0b516e8 100644 public void a(BlockPosition blockposition, Block block, BlockPosition blockposition1) { if (!this.isClientSide) { IBlockData iblockdata = this.getType(blockposition); -@@ -1271,6 +1272,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1275,6 +1276,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return this.getBlockFacePower(blockposition.down(), EnumDirection.DOWN) > 0 ? true : (this.getBlockFacePower(blockposition.up(), EnumDirection.UP) > 0 ? true : (this.getBlockFacePower(blockposition.north(), EnumDirection.NORTH) > 0 ? true : (this.getBlockFacePower(blockposition.south(), EnumDirection.SOUTH) > 0 ? true : (this.getBlockFacePower(blockposition.west(), EnumDirection.WEST) > 0 ? true : this.getBlockFacePower(blockposition.east(), EnumDirection.EAST) > 0)))); } diff --git a/Spigot-Server-Patches/0333-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0333-Make-the-default-permission-message-configurable.patch index e378803f5e..cc5a08871e 100644 --- a/Spigot-Server-Patches/0333-Make-the-default-permission-message-configurable.patch +++ b/Spigot-Server-Patches/0333-Make-the-default-permission-message-configurable.patch @@ -1,4 +1,4 @@ -From 1d243236fe21e749143cdef0907a886204199bf8 Mon Sep 17 00:00:00 2001 +From 0005ca24f8b6064a1a076abc22376ddaf06d1384 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 19:49:56 +0000 Subject: [PATCH] Make the default permission message configurable @@ -29,10 +29,10 @@ index 30f35304a..546a1cfe0 100644 private static void savePlayerData() { savePlayerData = getBoolean("settings.save-player-data", savePlayerData); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 55fc1390a..9853bf342 100644 +index fa35b8459..30dd66b81 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2157,6 +2157,11 @@ public final class CraftServer implements Server { +@@ -2179,6 +2179,11 @@ public final class CraftServer implements Server { return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions; } diff --git a/Spigot-Server-Patches/0345-BlockDestroyEvent.patch b/Spigot-Server-Patches/0345-BlockDestroyEvent.patch index b7fe205bfc..0b12556ee5 100644 --- a/Spigot-Server-Patches/0345-BlockDestroyEvent.patch +++ b/Spigot-Server-Patches/0345-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From 914e683bde8be673f9f9066808ea7c734b8fbda9 Mon Sep 17 00:00:00 2001 +From 144a8b4b62fd243e201880b7aa606cf56858865c Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 Feb 2019 00:20:33 -0500 Subject: [PATCH] BlockDestroyEvent @@ -11,10 +11,10 @@ floating in the air. This can replace many uses of BlockPhysicsEvent diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8f0b516e8..69f1494ab 100644 +index f54743a91..67a088f19 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -446,8 +446,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -450,8 +450,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return false; } else { Fluid fluid = this.getFluid(blockposition); diff --git a/Spigot-Server-Patches/0365-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0365-Optimize-Captured-TileEntity-Lookup.patch index 24e9052ccd..13d97174e4 100644 --- a/Spigot-Server-Patches/0365-Optimize-Captured-TileEntity-Lookup.patch +++ b/Spigot-Server-Patches/0365-Optimize-Captured-TileEntity-Lookup.patch @@ -1,4 +1,4 @@ -From aa97aca65d44f7e7f4fbe2bb98478992da47b84b Mon Sep 17 00:00:00 2001 +From 6cbddfcfabc1070347797b56fe31c8ec9deaf793 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 6 Apr 2019 10:16:48 -0400 Subject: [PATCH] Optimize Captured TileEntity Lookup @@ -10,10 +10,10 @@ Optimize to check if the captured list even has values in it, and also to just do a get call since the value can never be null. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 69f1494ab..b506f5871 100644 +index 67a088f19..4aca398f1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -992,12 +992,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -996,12 +996,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return null; } else { // CraftBukkit start diff --git a/Spigot-Server-Patches/0366-Add-Heightmap-API.patch b/Spigot-Server-Patches/0366-Add-Heightmap-API.patch index 179ee0f422..8e2477d89d 100644 --- a/Spigot-Server-Patches/0366-Add-Heightmap-API.patch +++ b/Spigot-Server-Patches/0366-Add-Heightmap-API.patch @@ -1,14 +1,14 @@ -From 6598e3cc8934ed6cbcef393823b7e872f75e2ffc Mon Sep 17 00:00:00 2001 +From 764f34aa28a16bfcdf60719d2b7ee38bdff3be33 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 1 Jan 2019 02:22:01 -0800 Subject: [PATCH] Add Heightmap API diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b506f5871..406e5c60a 100644 +index 4aca398f1..20d9dd839 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -567,8 +567,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -571,8 +571,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { } } @@ -20,7 +20,7 @@ index b506f5871..406e5c60a 100644 if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 323d78b22..27602824a 100644 +index b41404652..d4ccef12f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -335,6 +335,29 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch index 761a0af0f5..a09ffac628 100644 --- a/Spigot-Server-Patches/0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch +++ b/Spigot-Server-Patches/0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch @@ -1,4 +1,4 @@ -From 34378d6190c8595a247722ed00507d61d1fd57c7 Mon Sep 17 00:00:00 2001 +From 032b8101febd00ba44d33cbecf57e57fa0f9e2a9 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 13 May 2019 21:10:59 -0700 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer @@ -29,10 +29,10 @@ index 2801a3ee6..3ede5ce2a 100644 @Deprecated diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9853bf342..5853763f6 100644 +index 30dd66b81..0df49581f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1683,7 +1683,7 @@ public final class CraftServer implements Server { +@@ -1705,7 +1705,7 @@ public final class CraftServer implements Server { @Override public boolean isPrimaryThread() { diff --git a/Spigot-Server-Patches/0376-Fix-some-generation-concurrency-issues.patch b/Spigot-Server-Patches/0376-Fix-some-generation-concurrency-issues.patch index 094bdec8ee..04fa9432bf 100644 --- a/Spigot-Server-Patches/0376-Fix-some-generation-concurrency-issues.patch +++ b/Spigot-Server-Patches/0376-Fix-some-generation-concurrency-issues.patch @@ -1,14 +1,14 @@ -From 98a69f55fab4a1cc510e075671230c441b96d352 Mon Sep 17 00:00:00 2001 +From 40a6743af3f62cee194013e598512f7237ce95fc Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 24 May 2019 07:53:16 +0100 Subject: [PATCH] Fix some generation concurrency issues diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 406e5c60a..e2cac4a92 100644 +index 20d9dd839..18e0ca2c7 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -84,6 +84,23 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -86,6 +86,23 @@ public abstract class World implements GeneratorAccess, AutoCloseable { private int tileTickPosition; public final Map explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions public java.util.ArrayDeque redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here diff --git a/Spigot-Server-Patches/0387-Anti-Xray.patch b/Spigot-Server-Patches/0387-Anti-Xray.patch index de8da88cfe..e8faabc027 100644 --- a/Spigot-Server-Patches/0387-Anti-Xray.patch +++ b/Spigot-Server-Patches/0387-Anti-Xray.patch @@ -1,11 +1,11 @@ -From 47e190d94ebf9a9cbb36580b101ee5871fde5b47 Mon Sep 17 00:00:00 2001 +From e71a54adb072177f2d29ecce8103d76fc78c90d7 Mon Sep 17 00:00:00 2001 From: stonar96 Date: Mon, 20 Aug 2018 03:03:58 +0200 Subject: [PATCH] Anti-Xray diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 4867615215..df24e3297b 100644 +index 486761521..df24e3297 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -1,7 +1,11 @@ @@ -66,7 +66,7 @@ index 4867615215..df24e3297b 100644 } diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java new file mode 100644 -index 0000000000..f7e376ce6a +index 000000000..f7e376ce6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java @@ -0,0 +1,46 @@ @@ -118,7 +118,7 @@ index 0000000000..f7e376ce6a +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java new file mode 100644 -index 0000000000..23626bef3a +index 000000000..23626bef3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java @@ -0,0 +1,782 @@ @@ -906,7 +906,7 @@ index 0000000000..23626bef3a +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java new file mode 100644 -index 0000000000..a68bace353 +index 000000000..a68bace35 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java @@ -0,0 +1,81 @@ @@ -993,7 +993,7 @@ index 0000000000..a68bace353 +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java new file mode 100644 -index 0000000000..067dfb2f14 +index 000000000..067dfb2f1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java @@ -0,0 +1,31 @@ @@ -1030,7 +1030,7 @@ index 0000000000..067dfb2f14 +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java new file mode 100644 -index 0000000000..cc586827aa +index 000000000..cc586827a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java @@ -0,0 +1,56 @@ @@ -1092,7 +1092,7 @@ index 0000000000..cc586827aa +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java new file mode 100644 -index 0000000000..37093419cf +index 000000000..37093419c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java @@ -0,0 +1,84 @@ @@ -1181,7 +1181,7 @@ index 0000000000..37093419cf + } +} diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 4d300699f1..06b4dc6284 100644 +index 4d300699f..06b4dc628 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -320,7 +320,7 @@ public class Chunk implements IChunkAccess { @@ -1194,7 +1194,7 @@ index 4d300699f1..06b4dc6284 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 961228e9df..a950ad801d 100644 +index 961228e9d..a950ad801 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -57,7 +57,7 @@ public class ChunkRegionLoader { @@ -1216,7 +1216,7 @@ index 961228e9df..a950ad801d 100644 protochunk.a(biomestorage); object = protochunk; diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index 0d5deee365..4526527aca 100644 +index 0d5deee36..4526527ac 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -6,21 +6,31 @@ public class ChunkSection { @@ -1255,7 +1255,7 @@ index 0d5deee365..4526527aca 100644 public IBlockData getType(int i, int j, int k) { diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index 2c1d1b1a55..44aed67274 100644 +index 2c1d1b1a5..44aed6727 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -1377,7 +1377,7 @@ index 2c1d1b1a55..44aed67274 100644 if (this.h == this.b) { diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index e156804f7a..96a785af27 100644 +index e156804f7..96a785af2 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -42,7 +42,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -1440,7 +1440,7 @@ index e156804f7a..96a785af27 100644 public void a() { this.o(); diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 47710067a6..ef7ade797b 100644 +index 47710067a..ef7ade797 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -1,5 +1,6 @@ @@ -1533,7 +1533,7 @@ index 47710067a6..ef7ade797b 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 5108d3ee98..b556a8fefa 100644 +index 027a6b0fd..50135446f 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -220,6 +220,11 @@ public class PlayerChunk { @@ -1558,7 +1558,7 @@ index 5108d3ee98..b556a8fefa 100644 this.a(new PacketPlayOutMultiBlockChange(this.dirtyCount, this.dirtyBlocks, chunk), false); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 72ae46eabb..5ef1aedbed 100644 +index 72ae46eab..5ef1aedbe 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -603,7 +603,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -1580,7 +1580,7 @@ index 72ae46eabb..5ef1aedbed 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index e2e5c17c24..ce4340a476 100644 +index e2e5c17c2..ce4340a47 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -264,6 +264,8 @@ public class PlayerInteractManager { @@ -1593,7 +1593,7 @@ index e2e5c17c24..ce4340a476 100644 public void a(BlockPosition blockposition, PacketPlayInBlockDig.EnumPlayerDigType packetplayinblockdig_enumplayerdigtype, String s) { diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java -index 39339fa275..f376e21068 100644 +index 39339fa27..f376e2106 100644 --- a/src/main/java/net/minecraft/server/ProtoChunk.java +++ b/src/main/java/net/minecraft/server/ProtoChunk.java @@ -45,16 +45,28 @@ public class ProtoChunk implements IChunkAccess { @@ -1636,7 +1636,7 @@ index 39339fa275..f376e21068 100644 return this.j[i]; diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java -index f82db93f88..1d1b267f32 100644 +index f82db93f8..1d1b267f3 100644 --- a/src/main/java/net/minecraft/server/TicketType.java +++ b/src/main/java/net/minecraft/server/TicketType.java @@ -21,6 +21,7 @@ public class TicketType { @@ -1648,7 +1648,7 @@ index f82db93f88..1d1b267f32 100644 public static TicketType a(String s, Comparator comparator) { return new TicketType<>(s, comparator, 0L); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e2cac4a926..9d604a758e 100644 +index 18e0ca2c7..75829b4de 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2,6 +2,8 @@ package net.minecraft.server; @@ -1660,7 +1660,7 @@ index e2cac4a926..9d604a758e 100644 import com.destroystokyo.paper.event.server.ServerExceptionEvent; import com.destroystokyo.paper.exception.ServerInternalException; import com.google.common.base.MoreObjects; -@@ -76,6 +78,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -78,6 +80,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper @@ -1668,7 +1668,7 @@ index e2cac4a926..9d604a758e 100644 public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPosition lastPhysicsProblem; // Spigot -@@ -117,6 +120,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -119,6 +122,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) { this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper @@ -1676,7 +1676,7 @@ index e2cac4a926..9d604a758e 100644 this.generator = gen; this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit -@@ -336,6 +340,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -340,6 +344,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { // CraftBukkit end IBlockData iblockdata1 = chunk.setType(blockposition, iblockdata, (i & 64) != 0, (i & 1024) == 0); // CraftBukkit custom NO_PLACE flag @@ -1685,7 +1685,7 @@ index e2cac4a926..9d604a758e 100644 if (iblockdata1 == null) { // CraftBukkit start - remove blockstate if failed diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java -index 8191e7c348..969d548de2 100644 +index 8191e7c34..969d548de 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java @@ -21,9 +21,11 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData { diff --git a/Spigot-Server-Patches/0393-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0393-Asynchronous-chunk-IO-and-loading.patch index 801af3985b..a20f3ca509 100644 --- a/Spigot-Server-Patches/0393-Asynchronous-chunk-IO-and-loading.patch +++ b/Spigot-Server-Patches/0393-Asynchronous-chunk-IO-and-loading.patch @@ -1,4 +1,4 @@ -From 0db490e14e4a9fc3a85019edc67822926ecf9589 Mon Sep 17 00:00:00 2001 +From 789369e56ef95117901c9a73a4ccb28ef4f0d2a1 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 13 Jul 2019 09:23:10 -0700 Subject: [PATCH] Asynchronous chunk IO and loading @@ -2361,7 +2361,7 @@ index 000000000..715a2dd8d + +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index a57371b08..e8166bc81 100644 +index 21498da29..eb9bf1516 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -218,11 +218,137 @@ public class ChunkProviderServer extends IChunkProvider { @@ -2516,7 +2516,7 @@ index a57371b08..e8166bc81 100644 this.world.timings.chunkAwait.stopTiming(); // Paper } // Paper ichunkaccess = (IChunkAccess) ((Either) completablefuture.join()).map((ichunkaccess1) -> { -@@ -745,11 +876,12 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -756,11 +887,12 @@ public class ChunkProviderServer extends IChunkProvider { protected boolean executeNext() { // CraftBukkit start - process pending Chunk loadCallback() and unloadCallback() after each run task try { @@ -4026,7 +4026,7 @@ index 27dcc2528..6506daeec 100644 // CraftBukkit start diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 6204a2207..95a29d1b2 100644 +index 7ae9f8ab5..defee6722 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -550,22 +550,23 @@ public class CraftWorld implements World { @@ -4061,7 +4061,7 @@ index 6204a2207..95a29d1b2 100644 // fall through to load // we do this so we do not re-read the chunk data on disk -@@ -2406,6 +2407,25 @@ public class CraftWorld implements World { +@@ -2426,6 +2427,25 @@ public class CraftWorld implements World { return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList()); } diff --git a/Spigot-Server-Patches/0394-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0394-Use-getChunkIfLoadedImmediately-in-places.patch index 7dafe6755c..61113deab3 100644 --- a/Spigot-Server-Patches/0394-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/Spigot-Server-Patches/0394-Use-getChunkIfLoadedImmediately-in-places.patch @@ -1,4 +1,4 @@ -From a2a9787bedd50b5dfa6ddf5df4e8cd3a3e97eddf Mon Sep 17 00:00:00 2001 +From a080e0b4b69b7358ade2950ccd3638814e1d5095 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 8 Jul 2019 00:13:36 -0700 Subject: [PATCH] Use getChunkIfLoadedImmediately in places @@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk load in that case). diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 4021bb5b88..2c8603e2fc 100644 +index 4021bb5b8..2c8603e2f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -203,7 +203,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -21,7 +21,7 @@ index 4021bb5b88..2c8603e2fc 100644 // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 691331217b..f88bcb29db 100644 +index 691331217..f88bcb29d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -989,7 +989,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -34,10 +34,10 @@ index 691331217b..f88bcb29db 100644 return; } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9d604a758e..bfbbfb1bac 100644 +index 75829b4de..61829b3bf 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -114,8 +114,16 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -116,8 +116,16 @@ public abstract class World implements GeneratorAccess, AutoCloseable { } public Chunk getChunkIfLoaded(int x, int z) { @@ -55,7 +55,7 @@ index 9d604a758e..bfbbfb1bac 100644 protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) { this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot -@@ -1103,14 +1111,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1107,14 +1115,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { } public boolean n(BlockPosition blockposition) { @@ -73,7 +73,7 @@ index 9d604a758e..bfbbfb1bac 100644 return ichunkaccess == null ? false : ichunkaccess.getType(blockposition).a((IBlockAccess) this, blockposition, entity); } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index f86404f83a..92601c581c 100644 +index f86404f83..92601c581 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -143,9 +143,10 @@ public class ActivationRange diff --git a/Spigot-Server-Patches/0395-Reduce-sync-loads.patch b/Spigot-Server-Patches/0395-Reduce-sync-loads.patch index b77e148d8f..71ba960fab 100644 --- a/Spigot-Server-Patches/0395-Reduce-sync-loads.patch +++ b/Spigot-Server-Patches/0395-Reduce-sync-loads.patch @@ -1,4 +1,4 @@ -From 04e43cd09d89b9b8a2a1edb3ecf9b442a446b6e2 Mon Sep 17 00:00:00 2001 +From 64ddb5b4e6486d01bde7a629a97030eb0935c979 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 19 Jul 2019 03:29:14 -0700 Subject: [PATCH] Reduce sync loads @@ -268,7 +268,7 @@ index 000000000..59aec1032 + } +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 2c1937cbe..81d386b4c 100644 +index eb9bf1516..0745ab75a 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -378,6 +378,7 @@ public class ChunkProviderServer extends IChunkProvider { @@ -280,10 +280,10 @@ index 2c1937cbe..81d386b4c 100644 this.serverThreadQueue.awaitTasks(completablefuture::isDone); com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bfbbfb1ba..a2f7c032d 100644 +index 61829b3bf..1cbd50450 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1167,7 +1167,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1171,7 +1171,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { for (int i1 = i; i1 <= j; ++i1) { for (int j1 = k; j1 <= l; ++j1) { @@ -292,7 +292,7 @@ index bfbbfb1ba..a2f7c032d 100644 if (chunk != null) { chunk.a(entity, axisalignedbb, list, predicate); -@@ -1188,7 +1188,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1192,7 +1192,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { for (int i1 = i; i1 < j; ++i1) { for (int j1 = k; j1 < l; ++j1) { @@ -301,7 +301,7 @@ index bfbbfb1ba..a2f7c032d 100644 if (chunk != null) { chunk.a(entitytypes, axisalignedbb, list, predicate); -@@ -1211,7 +1211,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1215,7 +1215,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { for (int i1 = i; i1 < j; ++i1) { for (int j1 = k; j1 < l; ++j1) { diff --git a/Spigot-Server-Patches/0399-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0399-implement-optional-per-player-mob-spawns.patch index 9e2528f809..ff51bb71f8 100644 --- a/Spigot-Server-Patches/0399-implement-optional-per-player-mob-spawns.patch +++ b/Spigot-Server-Patches/0399-implement-optional-per-player-mob-spawns.patch @@ -1,11 +1,11 @@ -From 8b3e0e6199516a840742e4be0f08bde29eaf339a Mon Sep 17 00:00:00 2001 +From 949906ac8db24ae55d0032d299ba21224504ea88 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Mon, 19 Aug 2019 01:27:58 +0500 Subject: [PATCH] implement optional per player mob spawns diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java -index 8a3f30c36f..51281cfa2d 100644 +index 8a3f30c36..51281cfa2 100644 --- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java @@ -61,6 +61,7 @@ public class WorldTimingsHandler { @@ -25,7 +25,7 @@ index 8a3f30c36f..51281cfa2d 100644 poiUnload = Timings.ofSafe(name + "Chunk unload - POI"); chunkUnload = Timings.ofSafe(name + "Chunk unload - Chunk"); diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 9d9260ad07..fd3dbea628 100644 +index 9d9260ad0..fd3dbea62 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -613,4 +613,9 @@ public class PaperWorldConfig { @@ -40,7 +40,7 @@ index 9d9260ad07..fd3dbea628 100644 } diff --git a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java new file mode 100644 -index 0000000000..9ebd7ecb7a +index 000000000..9ebd7ecb7 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java @@ -0,0 +1,253 @@ @@ -299,7 +299,7 @@ index 0000000000..9ebd7ecb7a +} diff --git a/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java b/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java new file mode 100644 -index 0000000000..4f13d3ff83 +index 000000000..4f13d3ff8 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java @@ -0,0 +1,241 @@ @@ -545,10 +545,10 @@ index 0000000000..4f13d3ff83 + } +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 6adb31d854..a0839ac725 100644 +index 0745ab75a..afbe813dd 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -654,7 +654,22 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -660,7 +660,22 @@ public class ChunkProviderServer extends IChunkProvider { this.world.timings.countNaturalMobs.startTiming(); // Paper - timings int l = this.chunkMapDistance.b(); EnumCreatureType[] aenumcreaturetype = EnumCreatureType.values(); @@ -572,7 +572,7 @@ index 6adb31d854..a0839ac725 100644 this.world.timings.countNaturalMobs.stopTiming(); // Paper - timings this.world.getMethodProfiler().exit(); -@@ -718,8 +733,23 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -729,8 +744,23 @@ public class ChunkProviderServer extends IChunkProvider { if (enumcreaturetype != EnumCreatureType.MISC && (!enumcreaturetype.c() || this.allowAnimals) && (enumcreaturetype.c() || this.allowMonsters) && (!enumcreaturetype.d() || flag2)) { int k1 = limit * l / ChunkProviderServer.b; // CraftBukkit - use per-world limits @@ -599,7 +599,7 @@ index 6adb31d854..a0839ac725 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index d00b687d25..07a2310b18 100644 +index d00b687d2..07a2310b1 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -81,6 +81,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -631,7 +631,7 @@ index d00b687d25..07a2310b18 100644 return this.cs; } diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 79f8549660..4100e367a4 100644 +index 79f854966..4100e367a 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -254,6 +254,7 @@ public class EntityTypes { @@ -643,7 +643,7 @@ index 79f8549660..4100e367a4 100644 return this.bb; } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index a3271d6c28..57bea926a6 100644 +index a3271d6c2..57bea926a 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -78,7 +78,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -682,7 +682,7 @@ index a3271d6c28..57bea926a6 100644 private static double a(ChunkCoordIntPair chunkcoordintpair, Entity entity) { diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index fdac5bb3a2..58bbf2f9d2 100644 +index fdac5bb3a..58bbf2f9d 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -755,7 +755,7 @@ index fdac5bb3a2..58bbf2f9d2 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index edffae0558..88cc8763f6 100644 +index edffae055..88cc8763f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1024,7 +1024,20 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0408-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0408-Expose-the-internal-current-tick.patch index 3b75e9662e..20c0ef8044 100644 --- a/Spigot-Server-Patches/0408-Expose-the-internal-current-tick.patch +++ b/Spigot-Server-Patches/0408-Expose-the-internal-current-tick.patch @@ -1,14 +1,14 @@ -From d7bfcf10fbc2f8ea3d6a08d9e9128b1561b34a6a Mon Sep 17 00:00:00 2001 +From f7efd2ca53a4ef65ddc52a39fc6307e3f4cc3cef Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 20 Apr 2019 19:47:34 -0500 Subject: [PATCH] Expose the internal current tick diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5853763f6..b7dfda265 100644 +index 0df49581f..b9a398bc5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2180,5 +2180,10 @@ public final class CraftServer implements Server { +@@ -2202,5 +2202,10 @@ public final class CraftServer implements Server { } return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name); } diff --git a/Spigot-Server-Patches/0432-Seed-based-feature-search.patch b/Spigot-Server-Patches/0432-Seed-based-feature-search.patch index a6607009ff..f4067667de 100644 --- a/Spigot-Server-Patches/0432-Seed-based-feature-search.patch +++ b/Spigot-Server-Patches/0432-Seed-based-feature-search.patch @@ -1,4 +1,4 @@ -From c35fcf7b8dec737a83ef004b3800ea5134d7e619 Mon Sep 17 00:00:00 2001 +From 21baa0110b562162f91c4a88b11fdd7a487a58df Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Mon, 13 Jan 2020 15:40:32 +0100 Subject: [PATCH] Seed based feature search @@ -94,10 +94,10 @@ index e8ce2ecf2..acfe732af 100644 public abstract StructureGenerator.a a(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a2f7c032d..e97b3f103 100644 +index 1cbd50450..803fe43be 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1557,8 +1557,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1561,8 +1561,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return this.methodProfiler; } diff --git a/Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch index 84b105248d..dee72e00f2 100644 --- a/Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch +++ b/Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch @@ -1,4 +1,4 @@ -From 5802854a423626f7ea7cb60a6974997beb999c56 Mon Sep 17 00:00:00 2001 +From 4e3ff53ab84fc803bbbaefde075aed4be4ccf209 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 25 Jan 2020 17:04:35 -0800 Subject: [PATCH] Optimise getChunkAt calls for loaded chunks @@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either, then unwrap it... diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index e5af40e9f..0de82202e 100644 +index afbe813dd..cf9021d60 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -354,6 +354,12 @@ public class ChunkProviderServer extends IChunkProvider { @@ -65,10 +65,10 @@ index e5af40e9f..0de82202e 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e97b3f103..913511388 100644 +index 803fe43be..601a68ad6 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -255,6 +255,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -259,6 +259,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @Override public Chunk getChunkAt(int i, int j) { diff --git a/Spigot-Server-Patches/0438-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0438-Optimise-random-block-ticking.patch index 633124f964..84971b99c7 100644 --- a/Spigot-Server-Patches/0438-Optimise-random-block-ticking.patch +++ b/Spigot-Server-Patches/0438-Optimise-random-block-ticking.patch @@ -1,4 +1,4 @@ -From 4c46bea75ecd08e7ce7b76a555c76a022ebf0791 Mon Sep 17 00:00:00 2001 +From f6c9f7b1ec8b16d0cf55d0356a0ebee43db4a50f Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 27 Jan 2020 21:28:00 -0800 Subject: [PATCH] Optimise random block ticking @@ -20,7 +20,7 @@ remains the same. diff --git a/src/main/java/com/destroystokyo/paper/util/math/ThreadUnsafeRandom.java b/src/main/java/com/destroystokyo/paper/util/math/ThreadUnsafeRandom.java new file mode 100644 -index 0000000000..3edc8e52e0 +index 000000000..3edc8e52e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/math/ThreadUnsafeRandom.java @@ -0,0 +1,46 @@ @@ -71,7 +71,7 @@ index 0000000000..3edc8e52e0 + } +} diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index e29ec958b3..e40375b67a 100644 +index e29ec958b..e40375b67 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -109,8 +109,8 @@ public class Block implements IMaterial { @@ -86,7 +86,7 @@ index e29ec958b3..e40375b67a 100644 } diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java -index 6d351f0979..a44f65f40d 100644 +index 6d351f097..a44f65f40 100644 --- a/src/main/java/net/minecraft/server/BlockFluids.java +++ b/src/main/java/net/minecraft/server/BlockFluids.java @@ -27,7 +27,7 @@ public class BlockFluids extends Block implements IFluidSource { @@ -99,7 +99,7 @@ index 6d351f0979..a44f65f40d 100644 @Override diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index e76528f199..e650a2e48d 100644 +index e76528f19..e650a2e48 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -450,6 +450,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -111,7 +111,7 @@ index e76528f199..e650a2e48d 100644 return this.d(baseblockposition.getX(), baseblockposition.getY(), baseblockposition.getZ()); } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 37b12daff8..2c3ede3fe1 100644 +index fc01aa68e..92065fe02 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -52,6 +52,8 @@ public class Chunk implements IChunkAccess { @@ -154,7 +154,7 @@ index 37b12daff8..2c3ede3fe1 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index 4526527aca..8b28fb5ee1 100644 +index 4526527ac..8b28fb5ee 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -5,12 +5,15 @@ import javax.annotation.Nullable; @@ -259,7 +259,7 @@ index 4526527aca..8b28fb5ee1 100644 } diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java -index f9680b6830..a61cffa3f4 100644 +index f9680b683..a61cffa3f 100644 --- a/src/main/java/net/minecraft/server/DataBits.java +++ b/src/main/java/net/minecraft/server/DataBits.java @@ -127,4 +127,46 @@ public class DataBits { @@ -310,7 +310,7 @@ index f9680b6830..a61cffa3f4 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index 44aed67274..fa664897fb 100644 +index 44aed6727..fa664897f 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -287,6 +287,14 @@ public class DataPaletteBlock implements DataPaletteExpandable { @@ -329,7 +329,7 @@ index 44aed67274..fa664897fb 100644 public interface a { diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index dd02cb34..b24a5100 100644 +index dd02cb348..b24a5100b 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -29,7 +29,7 @@ public class EntityTurtle extends EntityAnimal { @@ -342,7 +342,7 @@ index dd02cb34..b24a5100 100644 public final BlockPosition getHome() { return this.es(); } // Paper - OBFHELPER diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java -index de43881653..e821c236b4 100644 +index de4388165..e821c236b 100644 --- a/src/main/java/net/minecraft/server/IBlockData.java +++ b/src/main/java/net/minecraft/server/IBlockData.java @@ -22,11 +22,15 @@ public class IBlockData extends BlockDataAbstract implements @@ -395,10 +395,10 @@ index de43881653..e821c236b4 100644 public final SoundEffectType getStepSound() { return this.r(); } // Paper - OBFHELPER diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9135113884..3c966b4ab6 100644 +index 601a68ad6..bb34486a3 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1551,10 +1551,19 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1555,10 +1555,19 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public abstract TagRegistry t(); public BlockPosition a(int i, int j, int k, int l) { @@ -420,7 +420,7 @@ index 9135113884..3c966b4ab6 100644 public boolean isSavingDisabled() { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 0fed337130..c74b85917a 100644 +index 0fed33713..c74b85917 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -532,6 +532,11 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0441-fix-blockstate-capture-undoing.patch b/Spigot-Server-Patches/0441-fix-blockstate-capture-undoing.patch index 378b503c99..84ad0b35bb 100644 --- a/Spigot-Server-Patches/0441-fix-blockstate-capture-undoing.patch +++ b/Spigot-Server-Patches/0441-fix-blockstate-capture-undoing.patch @@ -1,14 +1,14 @@ -From a9c21212ccc71c68ef17076e300d53a23a7ed836 Mon Sep 17 00:00:00 2001 +From a9fe517d8e5a270edcdcde47831bd6afac35b995 Mon Sep 17 00:00:00 2001 From: Trigary Date: Mon, 17 Feb 2020 22:53:33 +0100 Subject: [PATCH] fix blockstate capture undoing diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3c966b4ab..baad98517 100644 +index bb34486a3..5117dafbc 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -349,7 +349,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -353,7 +353,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable { Block block = iblockdata.getBlock(); // CraftBukkit start - capture blockstates @@ -18,7 +18,7 @@ index 3c966b4ab..baad98517 100644 CraftBlockState blockstate = (CraftBlockState) world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()).getState(); // Paper - use CB getState to get a suitable snapshot this.capturedBlockStates.put(blockposition.immutableCopy(), blockstate); } -@@ -360,7 +362,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -364,7 +366,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { if (iblockdata1 == null) { // CraftBukkit start - remove blockstate if failed @@ -28,5 +28,5 @@ index 3c966b4ab..baad98517 100644 } // CraftBukkit end -- -2.16.1.windows.4 +2.25.0 diff --git a/work/Bukkit b/work/Bukkit index fd28180e18..6148fca759 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit fd28180e18c7d15a5169943c341765e98fe4c336 +Subproject commit 6148fca75953d5f8f656453848137a018e11a5b3 diff --git a/work/CraftBukkit b/work/CraftBukkit index 7f61a2526e..fc24934098 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 7f61a2526eab7818682ea0761e54f35f80cd2d6a +Subproject commit fc2493409826a7fdcd2d69ab5d25ce8c492eb996 diff --git a/work/Spigot b/work/Spigot index 8faa8b45b4..6de3d4be46 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 8faa8b45b477f6804c52184fe1a6bec9bf1dff65 +Subproject commit 6de3d4be46f609f86c968b58a4e5c12e90779fed