diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 5eae4b7fb4..52950142e8 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From 5f6c18daf8f095f2f60a38998cfcb0ee28d0e8ef Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 00:16:08 +0100 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 186405ba1..9975ba9ae 100644 +index 186405ba1914b2b384896c61770c225b50091401..9975ba9ae19f6217bec206fee247fac1a30d58fc 100644 --- a/pom.xml +++ b/pom.xml @@ -2,34 +2,28 @@ @@ -119,6 +119,3 @@ index 186405ba1..9975ba9ae 100644 true --- -2.26.2 - diff --git a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch index 7c15a34ba4..0f3d5a059a 100644 --- a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch +++ b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch @@ -1,4 +1,4 @@ -From 978cc75c386e674edf105135d3a558803c630393 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 1 Apr 2016 00:02:47 -0400 Subject: [PATCH] Add FastUtil to Bukkit @@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit Doesn't expose to plugins, just allows Paper-API to use it for optimization diff --git a/pom.xml b/pom.xml -index 9975ba9ae..e8d9982bd 100644 +index 9975ba9ae19f6217bec206fee247fac1a30d58fc..e8d9982bdbf9f66a54db16bf920e8106b81b034f 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,12 @@ @@ -22,6 +22,3 @@ index 9975ba9ae..e8d9982bd 100644 commons-lang commons-lang --- -2.26.2 - diff --git a/Spigot-API-Patches/0003-Paper-Utils.patch b/Spigot-API-Patches/0003-Paper-Utils.patch index 1cf1fa6378..a647b698ad 100644 --- a/Spigot-API-Patches/0003-Paper-Utils.patch +++ b/Spigot-API-Patches/0003-Paper-Utils.patch @@ -1,4 +1,4 @@ -From 9941a3d6ebbd8e1c89d8cddc53c81a9e3e14111f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 23 Feb 2019 11:26:21 -0500 Subject: [PATCH] Paper Utils @@ -6,7 +6,7 @@ Subject: [PATCH] Paper Utils diff --git a/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java new file mode 100644 -index 000000000..9db0056ab +index 0000000000000000000000000000000000000000..9db0056ab94145819628b3ad8d8d26130d117fcf --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java @@ -0,0 +1,16 @@ @@ -26,6 +26,3 @@ index 000000000..9db0056ab + } + +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0004-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch index 56a3c36e01..8d67ca4113 100644 --- a/Spigot-API-Patches/0004-Timings-v2.patch +++ b/Spigot-API-Patches/0004-Timings-v2.patch @@ -1,4 +1,4 @@ -From b5043839f6c38e559c6029dd6d47979dfce48d83 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 000000000..64531fcce +index 0000000000000000000000000000000000000000..64531fcce1c8aaa24567c2995c1faac64b88f7d5 --- /dev/null +++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java @@ -0,0 +1,84 @@ @@ -96,7 +96,7 @@ index 000000000..64531fcce +} 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 000000000..9b45ce887 +index 0000000000000000000000000000000000000000..9b45ce887b9172f30302b83fe24b99b76b16dac3 --- /dev/null +++ b/src/main/java/co/aikar/timings/NullTimingHandler.java @@ -0,0 +1,68 @@ @@ -170,7 +170,7 @@ index 000000000..9b45ce887 +} 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 000000000..933ecf9bd +index 0000000000000000000000000000000000000000..933ecf9bd232a376796d0f15babb0725cdeba3c9 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java @@ -0,0 +1,83 @@ @@ -259,7 +259,7 @@ index 000000000..933ecf9bd +} 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 000000000..a21e5ead5 +index 0000000000000000000000000000000000000000..a21e5ead5024fd0058c5e3302d8201dd249d32bc --- /dev/null +++ b/src/main/java/co/aikar/timings/Timing.java @@ -0,0 +1,83 @@ @@ -348,7 +348,7 @@ index 000000000..a21e5ead5 +} 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 000000000..a5d13a1e4 +index 0000000000000000000000000000000000000000..a5d13a1e44edb861f45c83a9b4309fbf799d407d --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingData.java @@ -0,0 +1,122 @@ @@ -476,7 +476,7 @@ index 000000000..a5d13a1e4 +} 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 000000000..cc0390c06 +index 0000000000000000000000000000000000000000..cc0390c061fc367b80063c6de7e45e1be67c0e07 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingHandler.java @@ -0,0 +1,227 @@ @@ -709,7 +709,7 @@ index 000000000..cc0390c06 +} 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 000000000..ddaed8127 +index 0000000000000000000000000000000000000000..ddaed81275fcc12d1671b668697acf318e96888b --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingHistory.java @@ -0,0 +1,354 @@ @@ -1069,7 +1069,7 @@ index 000000000..ddaed8127 +} 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 000000000..86d5ac6bd +index 0000000000000000000000000000000000000000..86d5ac6bd0d7d0003688761aceb3f3343575319f --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java @@ -0,0 +1,58 @@ @@ -1133,7 +1133,7 @@ index 000000000..86d5ac6bd +} 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 000000000..df142a89b +index 0000000000000000000000000000000000000000..df142a89b8c43acb81eb383eac0ef048a1f49a6e --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingIdentifier.java @@ -0,0 +1,116 @@ @@ -1255,7 +1255,7 @@ index 000000000..df142a89b +} 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 000000000..0b34e0d01 +index 0000000000000000000000000000000000000000..0b34e0d0174b7d92a17699538d5f3fe5196f82b9 --- /dev/null +++ b/src/main/java/co/aikar/timings/Timings.java @@ -0,0 +1,293 @@ @@ -1554,7 +1554,7 @@ index 000000000..0b34e0d01 +} 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 000000000..c0d8f2016 +index 0000000000000000000000000000000000000000..c0d8f2016bbc0257c8eb4888508e8f50d7c4790f --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsCommand.java @@ -0,0 +1,122 @@ @@ -1682,7 +1682,7 @@ index 000000000..c0d8f2016 +} 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 000000000..93d5a3f97 +index 0000000000000000000000000000000000000000..93d5a3f97a1b2b3a1cd2731d48e8ebd01d29aa91 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -0,0 +1,355 @@ @@ -2043,7 +2043,7 @@ index 000000000..93d5a3f97 +} 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 000000000..ef824d701 +index 0000000000000000000000000000000000000000..ef824d701c97cad8b31e76ad98c94fc4367a7eda --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsManager.java @@ -0,0 +1,188 @@ @@ -2237,7 +2237,7 @@ index 000000000..ef824d701 +} 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 000000000..bf3e059fe +index 0000000000000000000000000000000000000000..bf3e059fe06aae361b2ded451914ed19b5e970c5 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsReportListener.java @@ -0,0 +1,75 @@ @@ -2318,7 +2318,7 @@ index 000000000..bf3e059fe +} 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 000000000..632c49615 +index 0000000000000000000000000000000000000000..632c4961515f5052551f841cfa840e60bba7a257 --- /dev/null +++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java @@ -0,0 +1,53 @@ @@ -2377,7 +2377,7 @@ index 000000000..632c49615 +} 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 000000000..80155072d +index 0000000000000000000000000000000000000000..80155072d1004e34e04342d434cf7d75f0b7e29d --- /dev/null +++ b/src/main/java/co/aikar/util/Counter.java @@ -0,0 +1,38 @@ @@ -2421,7 +2421,7 @@ index 000000000..80155072d +} 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 000000000..190bf0598 +index 0000000000000000000000000000000000000000..190bf0598442c89c2a1c93ad7c8c1a29797304ae --- /dev/null +++ b/src/main/java/co/aikar/util/JSONUtil.java @@ -0,0 +1,140 @@ @@ -2567,7 +2567,7 @@ index 000000000..190bf0598 +} 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 000000000..63a899c7d +index 0000000000000000000000000000000000000000..63a899c7dbdb69daa4876a2ce2a7dfb734b5af9d --- /dev/null +++ b/src/main/java/co/aikar/util/LoadingIntMap.java @@ -0,0 +1,76 @@ @@ -2649,7 +2649,7 @@ index 000000000..63a899c7d +} 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 000000000..aedbb0332 +index 0000000000000000000000000000000000000000..aedbb03321886cb267879d7994653e447b485f6a --- /dev/null +++ b/src/main/java/co/aikar/util/LoadingMap.java @@ -0,0 +1,368 @@ @@ -3023,7 +3023,7 @@ index 000000000..aedbb0332 +} 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 000000000..5989ee212 +index 0000000000000000000000000000000000000000..5989ee21297935651b0edd44b8239e655eaef1d9 --- /dev/null +++ b/src/main/java/co/aikar/util/MRUMapCache.java @@ -0,0 +1,111 @@ @@ -3139,7 +3139,7 @@ index 000000000..5989ee212 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index ae21e0f97..755869366 100644 +index ae21e0f97d3d078e3b9ce9f60590c20e5012396e..755869366e7546fa8aefe7d7a1a602bab91a458c 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -618,7 +618,6 @@ public final class Bukkit { @@ -3151,7 +3151,7 @@ index ae21e0f97..755869366 100644 /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index f6fb72fab..fad4e9292 100644 +index f6fb72fab398ae8ca8b746154ff3c8fcad378faf..fad4e929264e2be534d3c4a90a5d557fd6c5807b 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1300,6 +1300,26 @@ public interface Server extends PluginMessageRecipient { @@ -3182,7 +3182,7 @@ index f6fb72fab..fad4e9292 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 247d194f8..72c5501e8 100644 +index 247d194f86c00db11acbc58e7d163b2606db4f07..72c5501e8503aa3b5564a0467fde270d7cd93492 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 247d194f8..72c5501e8 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 000000000..f9a00aecc +index 0000000000000000000000000000000000000000..f9a00aecca5ec41b460bf41dfe1c69694768cf98 --- /dev/null +++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java @@ -0,0 +1,21 @@ @@ -3226,7 +3226,7 @@ index 000000000..f9a00aecc + } +} diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java -index 4bfc21468..03bdc1622 100644 +index 4bfc214685164a38ba4261b2bae7faa8a3bd297e..03bdc1622791e1206406c87065978688d602e39e 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 4bfc21468..03bdc1622 100644 return true; } diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java -index d6c8938b1..a6ad94ef9 100644 +index d6c8938b1e13b63116b7b0e074ea8ef5997f8dc3..a6ad94ef98a1df1d2842635d850bc990b0137849 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 d6c8938b1..a6ad94ef9 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 000000000..ca1893e9f +index 0000000000000000000000000000000000000000..ca1893e9fb41baae0d103f1a925e33f3dfa273be --- /dev/null +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java @@ -0,0 +1,114 @@ @@ -3399,7 +3399,7 @@ index 000000000..ca1893e9f + +} diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index 81e4fa573..f020cb04e 100644 +index 81e4fa57337f5a40c4b673136dd5eb595cce4629..f020cb04eba27a2e70fc7cf799ebbfb434b9d974 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 81e4fa573..f020cb04e 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 2a145d851..000000000 +index 2a145d851ce30360aa39549745bd87590c034584..0000000000000000000000000000000000000000 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java +++ /dev/null @@ -1,250 +0,0 @@ @@ -3711,7 +3711,7 @@ index 2a145d851..000000000 - // Spigot end -} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 92bafd636..bfbe775fc 100644 +index 92bafd6365313390326ea12fb815c62463f4d0fc..bfbe775fcd631b12975c0aaae8c82156b81c9614 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1329,6 +1329,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -3727,7 +3727,7 @@ index 92bafd636..bfbe775fc 100644 @NotNull diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index ec77d7be6..c548911c4 100644 +index ec77d7be69a8213c91d05bd3beabdd4fc664afa4..c548911c4b4fad495e4b321ea47455ec65c68255 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -358,7 +358,6 @@ public final class SimplePluginManager implements PluginManager { @@ -3787,7 +3787,7 @@ index ec77d7be6..c548911c4 100644 } } diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index df8a5dcbe..50a51394f 100644 +index df8a5dcbe3345abf7be53d7ebb81d13b33c86511..50a51394f71579b71c3875e4dc8c71abc23ae246 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 { @@ -3830,7 +3830,7 @@ index df8a5dcbe..50a51394f 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 5830e8b9b..36f542a85 100644 +index 5830e8b9b74d6107e54b6e19e03ab0e8c0da2f19..36f542a85e0f16e97c65c0ca64ec660ddf75d63e 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; @@ -3844,7 +3844,7 @@ index 5830e8b9b..36f542a85 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 5ca863b36..612958a33 100644 +index 5ca863b3692b2e1b58e7fb4d82f554a92cc4f01e..612958a331575d1da2715531ebdf6b1168f2e860 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; @@ -3867,7 +3867,7 @@ index 5ca863b36..612958a33 100644 + +} diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java -index 44badfedc..3cbe5c2bb 100644 +index 44badfedcc3fdc26bdc293b85d8c781d6f659faa..3cbe5c2bb55dead7968a6f165ef267e3e2931061 100644 --- a/src/main/java/org/spigotmc/CustomTimingsHandler.java +++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java @@ -1,3 +1,26 @@ @@ -4090,6 +4090,3 @@ index 44badfedc..3cbe5c2bb 100644 + public void stopTiming() { handler.stopTiming(); } + } --- -2.26.2 - diff --git a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch index 9f384b44b9..b086a964bb 100644 --- a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch +++ b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch @@ -1,11 +1,11 @@ -From 57863f551ef2baa2f507d9ab44b321548127e6b4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Mon, 29 Feb 2016 17:22:34 -0600 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index bfbe775fc..41cb8b377 100644 +index bfbe775fcd631b12975c0aaae8c82156b81c9614..41cb8b3770d787eb0e12be191984e7767cc004e1 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1231,6 +1231,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -31,6 +31,3 @@ index bfbe775fc..41cb8b377 100644 /** * Update the list of commands sent to the client. *
--- -2.26.2 - diff --git a/Spigot-API-Patches/0006-Add-getTPS-method.patch b/Spigot-API-Patches/0006-Add-getTPS-method.patch index 3405c5e3de..6dc0d5c200 100644 --- a/Spigot-API-Patches/0006-Add-getTPS-method.patch +++ b/Spigot-API-Patches/0006-Add-getTPS-method.patch @@ -1,11 +1,11 @@ -From 8f5b30551af6b64ae50e49b7c46d754cfc06ffa5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 755869366..6c3aa4185 100644 +index 755869366e7546fa8aefe7d7a1a602bab91a458c..6c3aa418589903925d92d48a79f9f3d2461f78d7 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1369,6 +1369,17 @@ public final class Bukkit { @@ -27,7 +27,7 @@ index 755869366..6c3aa4185 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 fad4e9292..f0dba56dc 100644 +index fad4e929264e2be534d3c4a90a5d557fd6c5807b..f0dba56dcd8adb50725356810d316e74527939d8 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1148,6 +1148,16 @@ public interface Server extends PluginMessageRecipient { @@ -47,6 +47,3 @@ index fad4e9292..f0dba56dc 100644 /** * Get the advancement specified by this key. * --- -2.26.2 - diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch index 6729a0bcf6..4c84cd9ee9 100644 --- a/Spigot-API-Patches/0007-Entity-Origin-API.patch +++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch @@ -1,11 +1,11 @@ -From 0fad6352b060486f735ee07c5d5fc55c2cb67351 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 17:50:31 -0600 Subject: [PATCH] Entity Origin API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 6b550dda2..4e4445d18 100644 +index 6b550dda2a107d08553544261f26c08b6cdfa648..4e4445d186303c06906fea68a867cc7985c69ba2 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -598,4 +598,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @@ -26,7 +26,7 @@ index 6b550dda2..4e4445d18 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java -index 64f9d3fd8..14cb0d770 100644 +index 64f9d3fd870d65afd2ee9a85625b149163eee144..14cb0d770561151570ab4399ca5facff43076819 100644 --- a/src/main/java/org/bukkit/entity/FallingBlock.java +++ b/src/main/java/org/bukkit/entity/FallingBlock.java @@ -54,4 +54,15 @@ public interface FallingBlock extends Entity { @@ -46,7 +46,7 @@ index 64f9d3fd8..14cb0d770 100644 + } } diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java -index 5a8789324..3022b4a27 100644 +index 5a87893248d9cbeb7c431590e726fcb0f69f930d..3022b4a270e66c4654193c96faf35bee817e648a 100644 --- a/src/main/java/org/bukkit/entity/TNTPrimed.java +++ b/src/main/java/org/bukkit/entity/TNTPrimed.java @@ -39,4 +39,15 @@ public interface TNTPrimed extends Explosive { @@ -65,6 +65,3 @@ index 5a8789324..3022b4a27 100644 + return this.getOrigin(); + } } --- -2.26.2 - diff --git a/Spigot-API-Patches/0008-Version-Command-2.0.patch b/Spigot-API-Patches/0008-Version-Command-2.0.patch index 73ab12f9c4..52b45a01fb 100644 --- a/Spigot-API-Patches/0008-Version-Command-2.0.patch +++ b/Spigot-API-Patches/0008-Version-Command-2.0.patch @@ -1,4 +1,4 @@ -From 80c67d85cde46ffd7331e67ea1ccc4697a69d2ce Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 27 May 2019 01:10:06 -0500 Subject: [PATCH] Version Command 2.0 @@ -6,7 +6,7 @@ Subject: [PATCH] Version Command 2.0 diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java new file mode 100644 -index 000000000..2a2651299 +index 0000000000000000000000000000000000000000..2a2651299e8dc631938ba4b4078dc694764d784c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java @@ -0,0 +1,44 @@ @@ -55,7 +55,7 @@ index 000000000..2a2651299 + } +} diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 72c5501e8..c0ff133de 100644 +index 72c5501e8503aa3b5564a0467fde270d7cd93492..c0ff133dece238297bbdf4cb938c9a3070783ec4 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -76,5 +76,12 @@ public interface UnsafeValues { @@ -72,7 +72,7 @@ index 72c5501e8..c0ff133de 100644 // Paper end } diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -index cbce52444..0486abd19 100644 +index cbce524442ca1ab0e2ade966f11b7dfa30a3f569..0486abd193f3b3b07bdda6b791b01badd40395dc 100644 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java @@ -1,5 +1,6 @@ @@ -175,6 +175,3 @@ index cbce52444..0486abd19 100644 private static int getDistance(@NotNull String repo, @NotNull String hash) { try { BufferedReader reader = Resources.asCharSource( --- -2.26.2 - diff --git a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch index 8b42dfa952..10593168ec 100644 --- a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch +++ b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch @@ -1,4 +1,4 @@ -From 643904b85838b4e2467b141e3302e90d8e32d1f4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Mon, 29 Feb 2016 18:02:25 -0600 Subject: [PATCH] Add PlayerLocaleChangeEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerLocaleChangeEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java new file mode 100644 -index 000000000..29dd763a9 +index 0000000000000000000000000000000000000000..29dd763a99ce7c6ecb176b9fb346a400369d48a0 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java @@ -0,0 +1,50 @@ @@ -60,6 +60,3 @@ index 000000000..29dd763a9 + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch index c9282723aa..3df8366b1d 100644 --- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch +++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch @@ -1,11 +1,11 @@ -From f135c9a8ce4932a9e7959e1b37523bb80fe444cc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:05:37 -0600 Subject: [PATCH] Add player view distance API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 41cb8b377..a985431e5 100644 +index 41cb8b3770d787eb0e12be191984e7767cc004e1..a985431e5d69e2837dae5c3284b0252ace04992a 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1245,6 +1245,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -29,6 +29,3 @@ index 41cb8b377..a985431e5 100644 // Paper end /** --- -2.26.2 - diff --git a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch index 7494bc7c25..43af3c3828 100644 --- a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch +++ b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch @@ -1,4 +1,4 @@ -From ad5e2c1dff96cd282de8d908b8d35a90b04daf29 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:09:40 -0600 Subject: [PATCH] Add BeaconEffectEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add BeaconEffectEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java new file mode 100644 -index 000000000..978813b94 +index 0000000000000000000000000000000000000000..978813b94a5eae0afccbd3b38b463091a46b56ac --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java @@ -0,0 +1,86 @@ @@ -96,6 +96,3 @@ index 000000000..978813b94 + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch index a1469f4ec6..c113777bf5 100644 --- a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch @@ -1,4 +1,4 @@ -From 19fc087b4ae7ad9562925fba66a2b5888a8be51e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Mon, 29 Feb 2016 18:13:58 -0600 Subject: [PATCH] Add PlayerInitialSpawnEvent @@ -7,7 +7,7 @@ For modifying a player's initial spawn location as they join the server diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java new file mode 100644 -index 000000000..8b1fdb9d2 +index 0000000000000000000000000000000000000000..8b1fdb9d2869d4c1862d557c91bf8a1d8c537507 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java @@ -0,0 +1,16 @@ @@ -27,6 +27,3 @@ index 000000000..8b1fdb9d2 + super(who, spawnLocation); + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch index 5593dbfed0..ea81806dff 100644 --- a/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch +++ b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch @@ -1,11 +1,11 @@ -From 4d288db916b66cbdea9482b224e4a0e39764765a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 19:45:21 -0600 Subject: [PATCH] Automatically disable plugins that fail to load diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 50a51394f..5cc37eeed 100644 +index 50a51394f71579b71c3875e4dc8c71abc23ae246..5cc37eeedab8437db82791dd95cef4e387c124b3 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -344,6 +344,10 @@ public final class JavaPluginLoader implements PluginLoader { @@ -19,6 +19,3 @@ index 50a51394f..5cc37eeed 100644 } // Perhaps abort here, rather than continue going, but as it stands, --- -2.26.2 - diff --git a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch index 69e7aa0993..64791486f7 100644 --- a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch +++ b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch @@ -1,11 +1,11 @@ -From a8c8b3a84cd77647be69e7621118be44c2d8216a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 6c3aa4185..6b951d5ad 100644 +index 6c3aa418589903925d92d48a79f9f3d2461f78d7..6b951d5adf9a665fd8bf8560a3fd7deb14897b34 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1543,6 +1543,19 @@ public final class Bukkit { @@ -29,7 +29,7 @@ index 6c3aa4185..6b951d5ad 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 f0dba56dc..af21bb1aa 100644 +index f0dba56dcd8adb50725356810d316e74527939d8..af21bb1aa133c6ab119f23c098d17a5bc4e9cd47 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1158,6 +1158,15 @@ public interface Server extends PluginMessageRecipient { @@ -48,6 +48,3 @@ index f0dba56dc..af21bb1aa 100644 /** * Get the advancement specified by this key. * --- -2.26.2 - diff --git a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index ddd0a6f989..d870c5543a 100644 --- a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -1,4 +1,4 @@ -From a5c0d8758c2a44b94be4d8d868c1eac0b2f30e46 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 19:54:32 -0600 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses @@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses Change Javadoc to be accurate diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 6b951d5ad..39423f3a6 100644 +index 6b951d5adf9a665fd8bf8560a3fd7deb14897b34..39423f3a689a69de666537603e97d50244827f64 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -274,6 +274,26 @@ public final class Bukkit { @@ -37,7 +37,7 @@ index 6b951d5ad..39423f3a6 100644 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index af21bb1aa..b09d01085 100644 +index af21bb1aa133c6ab119f23c098d17a5bc4e9cd47..b09d010853a67db16787d9e764f1e2949cb33050 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -225,6 +225,26 @@ public interface Server extends PluginMessageRecipient { @@ -68,7 +68,7 @@ index af21bb1aa..b09d01085 100644 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index a985431e5..dd6adedb6 100644 +index a985431e5d69e2837dae5c3284b0252ace04992a..dd6adedb63c0a51dab92879b199a8d284472f270 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -441,6 +441,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -110,6 +110,3 @@ index a985431e5..dd6adedb6 100644 /** * Forces an update of the player's entire inventory. * --- -2.26.2 - diff --git a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch index e754662463..6fbbfe5eda 100644 --- a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From f6c5314caaf3750d44dd2fa7362118ce38ddf2e9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 29 Feb 2016 20:02:40 -0600 Subject: [PATCH] Player Tab List and Title APIs @@ -6,7 +6,7 @@ Subject: [PATCH] Player Tab List and Title APIs diff --git a/src/main/java/com/destroystokyo/paper/Title.java b/src/main/java/com/destroystokyo/paper/Title.java new file mode 100644 -index 000000000..4fe18540f +index 0000000000000000000000000000000000000000..4fe18540f77143ee7cd7e94d3aa279ae744289e4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/Title.java @@ -0,0 +1,373 @@ @@ -384,7 +384,7 @@ index 000000000..4fe18540f + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index dd6adedb6..3d07467a4 100644 +index dd6adedb63c0a51dab92879b199a8d284472f270..3d07467a4ba39aa7c59abb49d12b094c872251da 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1,6 +1,7 @@ @@ -512,6 +512,3 @@ index dd6adedb6..3d07467a4 100644 // Paper end /** --- -2.26.2 - diff --git a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch index 34986599fe..914766487c 100644 --- a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch +++ b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From d4795bab801af08aaa07c753e5b16fe18401c5f8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:24:35 -0600 Subject: [PATCH] Add exception reporting event @@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java new file mode 100644 -index 000000000..2f573299a +index 0000000000000000000000000000000000000000..2f573299a9a817a98372817a1de8bf641aaca956 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java @@ -0,0 +1,43 @@ @@ -55,7 +55,7 @@ index 000000000..2f573299a +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java new file mode 100644 -index 000000000..6fb39af04 +index 0000000000000000000000000000000000000000..6fb39af0479a818f7f1465bcdfe505ab4ff7da1a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java @@ -0,0 +1,64 @@ @@ -125,7 +125,7 @@ index 000000000..6fb39af04 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java new file mode 100644 -index 000000000..410b24139 +index 0000000000000000000000000000000000000000..410b24139535cd5d8439ad581c43c61b5757fbf6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java @@ -0,0 +1,52 @@ @@ -183,7 +183,7 @@ index 000000000..410b24139 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerException.java new file mode 100644 -index 000000000..c06ea3942 +index 0000000000000000000000000000000000000000..c06ea3942447d4824b83ff839cb449fb818dede1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerException.java @@ -0,0 +1,23 @@ @@ -212,7 +212,7 @@ index 000000000..c06ea3942 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java new file mode 100644 -index 000000000..e762ed0db +index 0000000000000000000000000000000000000000..e762ed0dbad51625e65fef2e1898679108459a36 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java @@ -0,0 +1,35 @@ @@ -253,7 +253,7 @@ index 000000000..e762ed0db +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java new file mode 100644 -index 000000000..f016ba3b1 +index 0000000000000000000000000000000000000000..f016ba3b1b62e554a9bacbb9635f2dbe441b3c4e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java @@ -0,0 +1,20 @@ @@ -280,7 +280,7 @@ index 000000000..f016ba3b1 \ No newline at end of file diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java new file mode 100644 -index 000000000..6defac287 +index 0000000000000000000000000000000000000000..6defac287d0214fdf99418d979144050cc1e53bc --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java @@ -0,0 +1,38 @@ @@ -324,7 +324,7 @@ index 000000000..6defac287 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java new file mode 100644 -index 000000000..89e132525 +index 0000000000000000000000000000000000000000..89e132525cfae0ce979e37b3e2793df781e47227 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java @@ -0,0 +1,64 @@ @@ -394,7 +394,7 @@ index 000000000..89e132525 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java new file mode 100644 -index 000000000..2d0b2d4a9 +index 0000000000000000000000000000000000000000..2d0b2d4a9b3e5bdeec0e4ea7ab69858d86aa3715 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java @@ -0,0 +1,37 @@ @@ -437,7 +437,7 @@ index 000000000..2d0b2d4a9 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java new file mode 100644 -index 000000000..5582999fe +index 0000000000000000000000000000000000000000..5582999fe94c7a3dac655044ccc6d078cd9521a1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java @@ -0,0 +1,22 @@ @@ -464,7 +464,7 @@ index 000000000..5582999fe + } +} diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index f020cb04e..adfc7aae2 100644 +index f020cb04eba27a2e70fc7cf799ebbfb434b9d974..adfc7aae2c0f49bbcdd358e83b04a0cf078a7d52 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -8,6 +8,10 @@ import java.util.HashMap; @@ -506,7 +506,7 @@ index f020cb04e..adfc7aae2 100644 } diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index c548911c4..9a5fe8ca4 100644 +index c548911c4b4fad495e4b321ea47455ec65c68255..9a5fe8ca4ad9415055f3a71b62064d9e79b8e644 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -23,6 +23,10 @@ import java.util.WeakHashMap; @@ -602,6 +602,3 @@ index c548911c4..9a5fe8ca4 100644 } } } --- -2.26.2 - diff --git a/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch b/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch index 2c7a059b1f..87d3369578 100644 --- a/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch +++ b/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch @@ -1,4 +1,4 @@ -From 3162dd0d7459bac922daf980c3da224efdbee977 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 20:26:39 -0600 Subject: [PATCH] Fix ServerListPingEvent flagging as Async @@ -6,7 +6,7 @@ Subject: [PATCH] Fix ServerListPingEvent flagging as Async This event can sometimes fire Async, set the proper boolean diff --git a/src/main/java/org/bukkit/event/server/ServerEvent.java b/src/main/java/org/bukkit/event/server/ServerEvent.java -index 46b119017..05167fb34 100644 +index 46b119017a1e3dfcd9ae5fb91b4fe8c20b0d6b86..05167fb34e4c42edc67af6e6700a2a3cc0f92769 100644 --- a/src/main/java/org/bukkit/event/server/ServerEvent.java +++ b/src/main/java/org/bukkit/event/server/ServerEvent.java @@ -1,5 +1,6 @@ @@ -25,6 +25,3 @@ index 46b119017..05167fb34 100644 } public ServerEvent(boolean isAsync) { --- -2.26.2 - diff --git a/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch index 19afe38773..d0f09691a0 100644 --- a/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch +++ b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch @@ -1,11 +1,11 @@ -From 313da29d469b333104e1e6e5f0053a9f80f5c2d9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 13:05:59 -0800 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java -index a9020ecc7..d3b3a8bf9 100644 +index a9020ecc744514067374bd2b1751251add4d9a78..d3b3a8bf94dac370ea254875e4d4a30894a70c67 100644 --- a/src/main/java/org/bukkit/command/CommandSender.java +++ b/src/main/java/org/bukkit/command/CommandSender.java @@ -61,4 +61,30 @@ public interface CommandSender extends Permissible { @@ -39,6 +39,3 @@ index a9020ecc7..d3b3a8bf9 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 05f5cd79c3..3b095e9b85 100644 --- a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,11 +1,11 @@ -From 33cd6ad8726b16cc04108d438d653657726c03a5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:47:27 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 203d135f1..52541e496 100644 +index 203d135f156aa78f4daf497831399f4fdab41d5f..52541e496bd85e041a96fd5858acbb9bddbb8196 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -531,4 +531,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -28,6 +28,3 @@ index 203d135f1..52541e496 100644 + void setArrowsStuck(int arrows); + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch index 0b894ba91f..0cec19d183 100644 --- a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch +++ b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch @@ -1,11 +1,11 @@ -From 3a2cee7866bd2596f7c7b43bc49f547afb68598c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 22:59:54 -0400 Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 3d07467a4..9e62987cb 100644 +index 3d07467a4ba39aa7c59abb49d12b094c872251da..9e62987cbd36074923ade7c9dea0e418cfb9c2bc 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -981,7 +981,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -82,7 +82,7 @@ index 3d07467a4..9e62987cb 100644 public class Spigot extends Entity.Spigot { diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java -index b98195650..4c2102a11 100644 +index b98195650d49d78ec35970ca0376b6289b861e4b..4c2102a11c3d682d98f0db4ccafa35231e66bcdd 100644 --- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java @@ -11,13 +11,32 @@ import org.jetbrains.annotations.NotNull; @@ -118,6 +118,3 @@ index b98195650..4c2102a11 100644 /** * Gets the status of this pack. * --- -2.26.2 - diff --git a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch index bf100d0e27..65e844a8e6 100644 --- a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch @@ -1,4 +1,4 @@ -From 2224d91ab552d71eb43c7d8c047c8a90d7e5765f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 13:20:33 -0700 Subject: [PATCH] Use ASM for event executors. @@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index e8d9982bd..661d109f7 100644 +index e8d9982bdbf9f66a54db16bf920e8106b81b034f..661d109f7c5b78587c68f32d47029c6d2fe7604d 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,17 @@ @@ -29,7 +29,7 @@ index e8d9982bd..661d109f7 100644 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java new file mode 100644 -index 000000000..5b28e9b1d +index 0000000000000000000000000000000000000000..5b28e9b1daba7834af67dbc193dd656bedd9a994 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java @@ -0,0 +1,42 @@ @@ -77,7 +77,7 @@ index 000000000..5b28e9b1d +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java new file mode 100644 -index 000000000..c83672427 +index 0000000000000000000000000000000000000000..c83672427324bd068ed52916f700b68446a226f6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java @@ -0,0 +1,43 @@ @@ -126,7 +126,7 @@ index 000000000..c83672427 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java new file mode 100644 -index 000000000..b6e7d8ee8 +index 0000000000000000000000000000000000000000..b6e7d8ee8d903ebf975d60bec0e08603d9a49fdb --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java @@ -0,0 +1,47 @@ @@ -179,7 +179,7 @@ index 000000000..b6e7d8ee8 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java new file mode 100644 -index 000000000..beed9e6e0 +index 0000000000000000000000000000000000000000..beed9e6e07a9080f1c059e08220839090553d0a4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java @@ -0,0 +1,35 @@ @@ -220,7 +220,7 @@ index 000000000..beed9e6e0 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java new file mode 100644 -index 000000000..ac99477e9 +index 0000000000000000000000000000000000000000..ac99477e9f2c08041aeff31abc1d1edee58d0a67 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java @@ -0,0 +1,66 @@ @@ -292,7 +292,7 @@ index 000000000..ac99477e9 +} diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java new file mode 100644 -index 000000000..72e48e8ef +index 0000000000000000000000000000000000000000..72e48e8efdf750d77fc1f9d5fa7dc279e88aa9a7 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java @@ -0,0 +1,35 @@ @@ -332,7 +332,7 @@ index 000000000..72e48e8ef + } +} diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java -index a850f0780..9026e108c 100644 +index a850f0780de05463fc0d3f9e15ff7f19d88b2aed..9026e108ccd3a88aee1267ee275137befa646455 100644 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java @@ -5,9 +5,75 @@ import org.bukkit.event.EventException; @@ -412,7 +412,7 @@ index a850f0780..9026e108c 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 5cc37eeed..e72cbde4b 100644 +index 5cc37eeedab8437db82791dd95cef4e387c124b3..e72cbde4b3225cbf17d8a9b275e0ffcaa6d86c19 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -300,21 +300,7 @@ public final class JavaPluginLoader implements PluginLoader { @@ -438,6 +438,3 @@ index 5cc37eeed..e72cbde4b 100644 if (false) { // Spigot - RL handles useTimings check now eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); } else { --- -2.26.2 - diff --git a/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch b/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch index 4ef3c75106..4b287bfa56 100644 --- a/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch +++ b/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch @@ -1,4 +1,4 @@ -From edbedec7fd2d9d2b495d81f52c8662429eb2937d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 May 2013 20:36:58 -0400 Subject: [PATCH] Add a call helper to Event @@ -6,7 +6,7 @@ Subject: [PATCH] Add a call helper to Event Reduces diff in Server patches diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java -index 18d0636b7..8ec56cd6b 100644 +index 18d0636b749913bfdcea8eebc7d0840d192fb071..8ec56cd6b8e0f5c5dd8c7c88b4671e18dcf109d0 100644 --- a/src/main/java/org/bukkit/event/Event.java +++ b/src/main/java/org/bukkit/event/Event.java @@ -35,6 +35,22 @@ public abstract class Event { @@ -32,6 +32,3 @@ index 18d0636b7..8ec56cd6b 100644 /** * Convenience method for providing a user-friendly identifier. By * default, it is the event's class's {@linkplain Class#getSimpleName() --- -2.26.2 - diff --git a/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch b/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch index 2e8131b972..7122fed4a2 100644 --- a/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch +++ b/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch @@ -1,4 +1,4 @@ -From 76eaf0d523ba97558aa23fd1b744d9e70c9978d4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 22 Jul 2015 18:50:41 -0400 Subject: [PATCH] Add sender name to commands.yml replacement @@ -7,7 +7,7 @@ This allows you to use $sender in commands.yml definitions to make commands that auto target self. diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java -index a6ad94ef9..9d4f553c0 100644 +index a6ad94ef98a1df1d2842635d850bc990b0137849..9d4f553c04784cca63901a56a7aea62a5cae1d72 100644 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java @@ -1,6 +1,9 @@ @@ -41,6 +41,3 @@ index a6ad94ef9..9d4f553c0 100644 int index = formatString.indexOf('$'); while (index != -1) { int start = index; --- -2.26.2 - 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 0a0db70f04..b7eafeabd0 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 4397b5e0ac84c2dca83409fb9f989bdc4827d687 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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,7 +6,7 @@ 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 39423f3a6..423fecf54 100644 +index 39423f3a689a69de666537603e97d50244827f64..423fecf5411c05a55f22951437ff77af4bd29318 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1574,6 +1574,13 @@ public final class Bukkit { @@ -24,7 +24,7 @@ index 39423f3a6..423fecf54 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index b09d01085..38d7da737 100644 +index b09d010853a67db16787d9e764f1e2949cb33050..38d7da7378f9dc387ce9b52f1527db929901670e 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1388,4 +1388,6 @@ public interface Server extends PluginMessageRecipient { @@ -35,7 +35,7 @@ index b09d01085..38d7da737 100644 + void reloadPermissions(); // Paper } diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java -index 50cc311be..c62da4131 100644 +index 50cc311be7904cc8fc6070a21c8e4de3a489fd20..c62da4131b17e66892678e8b618fb9ba3de93b56 100644 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java @@ -13,15 +13,35 @@ public class ReloadCommand extends BukkitCommand { @@ -85,7 +85,7 @@ index 50cc311be..c62da4131 100644 } } diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 9a5fe8ca4..8ddaf9c2e 100644 +index 9a5fe8ca4ad9415055f3a71b62064d9e79b8e644..8ddaf9c2e63b382533d7f8929023c364ff3a8f9d 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -894,4 +894,13 @@ public final class SimplePluginManager implements PluginManager { @@ -102,6 +102,3 @@ index 9a5fe8ca4..8ddaf9c2e 100644 + // Paper end + } --- -2.26.2 - diff --git a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch index 81b34adfc4..94ff9d88e2 100644 --- a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch +++ b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch @@ -1,11 +1,11 @@ -From f628305272a0df52727e9e2db61307dc76cf2762 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:05:21 -0400 Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java -index c2793f3ef..373f4b5b5 100644 +index c2793f3ef01c1246c130971c17e1c2bf8f551435..373f4b5b5185aa81ff728da89c9cc4e0ccf87889 100644 --- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java @@ -22,6 +22,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable { @@ -46,6 +46,3 @@ index c2793f3ef..373f4b5b5 100644 @Override public boolean isCancelled() { return this.isCancelled; --- -2.26.2 - diff --git a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch index c3a2245c25..6b76ad6154 100644 --- a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch +++ b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch @@ -1,11 +1,11 @@ -From f83b3e198ebdba89a0ba5c66abf0c46fe2069780 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 20 Mar 2016 06:44:49 -0400 Subject: [PATCH] Access items by EquipmentSlot diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java -index 88ce9dc6b..96916ec95 100644 +index 88ce9dc6b94fec5ffe50866e4b5e0c18021d6158..96916ec95e124b984b51fc60c601274c87dc9447 100644 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java +++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java @@ -215,4 +215,23 @@ public interface PlayerInventory extends Inventory { @@ -32,6 +32,3 @@ index 88ce9dc6b..96916ec95 100644 + void setItem(@NotNull EquipmentSlot slot, @Nullable ItemStack stack); + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch index d242360a28..5dc11c88f8 100644 --- a/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,4 +1,4 @@ -From 2c51cf61112a37b8ac0e8d50d54f097b0ad72924 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:26:34 -0400 Subject: [PATCH] Entity AddTo/RemoveFrom World Events @@ -6,7 +6,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java new file mode 100644 -index 000000000..07660202e +index 0000000000000000000000000000000000000000..07660202e41ee86f1b66bad3335cf6fe126e7f9c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java @@ -0,0 +1,32 @@ @@ -44,7 +44,7 @@ index 000000000..07660202e +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java new file mode 100644 -index 000000000..e5dbbd660 +index 0000000000000000000000000000000000000000..e5dbbd660409bae0d3b96e83390511d3a423a52e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java @@ -0,0 +1,29 @@ @@ -77,6 +77,3 @@ index 000000000..e5dbbd660 + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0029-EntityPathfindEvent.patch b/Spigot-API-Patches/0029-EntityPathfindEvent.patch index 823c22c160..697b76661a 100644 --- a/Spigot-API-Patches/0029-EntityPathfindEvent.patch +++ b/Spigot-API-Patches/0029-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From a8bad8e3690285d16bd45408d20ec035ce9f6aaf Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 21:15:34 -0400 Subject: [PATCH] EntityPathfindEvent @@ -7,7 +7,7 @@ Fires when an Entity decides to start moving to a location. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java new file mode 100644 -index 000000000..63e46b2fb +index 0000000000000000000000000000000000000000..63e46b2fb1b12b36fcb1e98b178cf29dd2e3d1b5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java @@ -0,0 +1,82 @@ @@ -93,6 +93,3 @@ index 000000000..63e46b2fb + cancelled = cancel; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch index 31c70f03fa..d4674ca2f4 100644 --- a/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch +++ b/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch @@ -1,4 +1,4 @@ -From da9edaf6bd9b18c3772b3fda4d338ffbc4453cad Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: crast Date: Sat, 1 Jun 2013 13:52:30 -0600 Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase @@ -8,7 +8,7 @@ limited synchronized portions to allow much higher concurrency in MetadataStore as well as far less locking, especially on reads diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java -index baf850226..d363d517c 100644 +index baf850226aed8545a5794deba6dff9603953b4b2..d363d517c05b3335101d829ce4ec22d049059c24 100644 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java @@ -12,7 +12,7 @@ import org.bukkit.plugin.Plugin; @@ -88,6 +88,3 @@ index baf850226..d363d517c 100644 Validate.notNull(owningPlugin, "Plugin cannot be null"); for (Map values : metadataMap.values()) { if (values.containsKey(owningPlugin)) { --- -2.26.2 - diff --git a/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch index 4d7162d896..d15d19b316 100644 --- a/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch +++ b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch @@ -1,4 +1,4 @@ -From 2b5c599b3684a15bdcd52ec6d182c9f5cef13ca1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 16 Jul 2013 21:26:50 -0400 Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin) @@ -6,7 +6,7 @@ Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin) So that on reload, metadata will be cleared diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java -index d363d517c..abbe545af 100644 +index d363d517c05b3335101d829ce4ec22d049059c24..abbe545af572687a0399c2387434863cd2b70f68 100644 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java @@ -4,6 +4,7 @@ import java.util.ArrayList; @@ -44,6 +44,3 @@ index d363d517c..abbe545af 100644 /** * Creates a unique name for the object receiving metadata by combining * unique data from the subject with a metadataKey. --- -2.26.2 - diff --git a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch index da955c3f24..8fa59475c2 100644 --- a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From d54f8dbd0a40ad129a03b27a1f96d66799559f34 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:08:36 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerUseUnknownEntityEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java new file mode 100644 -index 000000000..09cfdf48e +index 0000000000000000000000000000000000000000..09cfdf48ead8f03f3497646537292174241b0868 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java @@ -0,0 +1,46 @@ @@ -56,6 +56,3 @@ index 000000000..09cfdf48e + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch index 0039380c6f..9163e5813e 100644 --- a/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch +++ b/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch @@ -1,4 +1,4 @@ -From 219ff12a40896c0bd14c1242dab3518e34a95941 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 13 Apr 2016 20:20:18 -0700 Subject: [PATCH] Add handshake event to allow plugins to handle client @@ -7,7 +7,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java new file mode 100644 -index 000000000..f0bb4e31c +index 0000000000000000000000000000000000000000..f0bb4e31cc25eab2359fa9873bbf960346721701 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java @@ -0,0 +1,222 @@ @@ -233,6 +233,3 @@ index 000000000..f0bb4e31c + return HANDLERS; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch index 10910c6280..58a201a567 100644 --- a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch +++ b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch @@ -1,11 +1,11 @@ -From bc0b8a53cb6ce795d2ce85037c432db3c464de4a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 4 Mar 2016 03:13:18 -0500 Subject: [PATCH] Arrow pickup rule API diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java -index 88cebc004..b2bf62a50 100644 +index 88cebc004feeef65a594939a7e865b445432a83e..b2bf62a50177e612369993f8ed340d456c3c2fc8 100644 --- a/src/main/java/org/bukkit/entity/AbstractArrow.java +++ b/src/main/java/org/bukkit/entity/AbstractArrow.java @@ -127,4 +127,38 @@ public interface AbstractArrow extends Projectile { @@ -47,6 +47,3 @@ index 88cebc004..b2bf62a50 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch index e8bb92018d..f06ee13d15 100644 --- a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,11 +1,11 @@ -From 08eb4769f3ce11fe64a2d8863825a28bd9f815cb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java -index 8feb6698f..d51d2ec1d 100644 +index 8feb6698f9630f099be99e52d1149cd6bc615197..d51d2ec1d04d9ea8a25a70d0d856f2355ebfcb4a 100644 --- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java @@ -13,12 +13,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable @@ -40,6 +40,3 @@ index 8feb6698f..d51d2ec1d 100644 /** * Gets the amount of regained health --- -2.26.2 - diff --git a/Spigot-API-Patches/0036-LootTable-API.patch b/Spigot-API-Patches/0036-LootTable-API.patch index 81e5b9640d..07d278e115 100644 --- a/Spigot-API-Patches/0036-LootTable-API.patch +++ b/Spigot-API-Patches/0036-LootTable-API.patch @@ -1,4 +1,4 @@ -From cdc55d7f84c7f4886cf773712bfa3fd73699146d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 15:19:49 -0400 Subject: [PATCH] LootTable API @@ -12,7 +12,7 @@ Provides methods to determine players looted state for an object diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java new file mode 100644 -index 000000000..92d7b853a +index 0000000000000000000000000000000000000000..92d7b853a2ccaae5afa8ac141bead840942944ef --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java @@ -0,0 +1,17 @@ @@ -35,7 +35,7 @@ index 000000000..92d7b853a +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java new file mode 100644 -index 000000000..b387894fe +index 0000000000000000000000000000000000000000..b387894fe8001edb41ad2ad2b70ebabe065b682e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java @@ -0,0 +1,17 @@ @@ -58,7 +58,7 @@ index 000000000..b387894fe +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java new file mode 100644 -index 000000000..97815eeb2 +index 0000000000000000000000000000000000000000..97815eeb231cf0706b34fa47a4f7d1bb786305b4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java @@ -0,0 +1,116 @@ @@ -180,7 +180,7 @@ index 000000000..97815eeb2 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java new file mode 100644 -index 000000000..fd184f13f +index 0000000000000000000000000000000000000000..fd184f13f5e8ee5cf829fff4f44696e1f760430b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java @@ -0,0 +1,45 @@ @@ -230,7 +230,7 @@ index 000000000..fd184f13f + } +} diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java -index c67d71101..a569c7b63 100644 +index c67d711010304d7d2da60a22b845273aa911b5e9..a569c7b630bb0a09303d4e398a9d2a1aa2937dc8 100644 --- a/src/main/java/org/bukkit/block/Chest.java +++ b/src/main/java/org/bukkit/block/Chest.java @@ -1,5 +1,7 @@ @@ -251,7 +251,7 @@ index c67d71101..a569c7b63 100644 /** * Gets the inventory of the chest block represented by this block state. diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java -index 74cd194c9..07af1a3f0 100644 +index 74cd194c9a98245dc52e7e352d7d6c046e1e5cf3..07af1a3f011d4b96275f919d302ac367198e923e 100644 --- a/src/main/java/org/bukkit/block/Dispenser.java +++ b/src/main/java/org/bukkit/block/Dispenser.java @@ -1,5 +1,6 @@ @@ -271,7 +271,7 @@ index 74cd194c9..07af1a3f0 100644 /** * Gets the BlockProjectileSource object for the dispenser. diff --git a/src/main/java/org/bukkit/block/Dropper.java b/src/main/java/org/bukkit/block/Dropper.java -index 424392fb5..c76202321 100644 +index 424392fb5ed4628199b0e73689522aa3c90740cb..c76202321e29ad67597ca3017eb8d9baf6787383 100644 --- a/src/main/java/org/bukkit/block/Dropper.java +++ b/src/main/java/org/bukkit/block/Dropper.java @@ -1,11 +1,12 @@ @@ -289,7 +289,7 @@ index 424392fb5..c76202321 100644 /** * Tries to drop a randomly selected item from the dropper's inventory, diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java -index 58e493099..7ade312f1 100644 +index 58e493099810fb8d4705ecd49b4a5e1e1949b87b..7ade312f180b7e30871d3a3240c76325cc369c26 100644 --- a/src/main/java/org/bukkit/block/Hopper.java +++ b/src/main/java/org/bukkit/block/Hopper.java @@ -1,8 +1,9 @@ @@ -304,7 +304,7 @@ index 58e493099..7ade312f1 100644 -public interface Hopper extends Container, Lootable { } +public interface Hopper extends Container, LootableBlockInventory { } // Paper diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java -index 938f9aead..42f5b4ea3 100644 +index 938f9aead43124ed607db7b423aa3b3a0c59d56d..42f5b4ea38cac418a18c2c8215986f2617a52f3e 100644 --- a/src/main/java/org/bukkit/block/ShulkerBox.java +++ b/src/main/java/org/bukkit/block/ShulkerBox.java @@ -1,5 +1,6 @@ @@ -324,7 +324,7 @@ index 938f9aead..42f5b4ea3 100644 /** * Get the {@link DyeColor} corresponding to this ShulkerBox diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java -index 937b99f87..db69687a7 100644 +index 937b99f8734d71b2ad33af142afbc251b81d9745..db69687a7ad4b18d17ab1677cae5d8dd4dcd3678 100644 --- a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java +++ b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java @@ -1,5 +1,6 @@ @@ -344,7 +344,7 @@ index 937b99f87..db69687a7 100644 /** * Checks whether or not this Minecart will pick up diff --git a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java -index 9ea403e6f..238d118f7 100644 +index 9ea403e6fd8e960d017660e0aec118abeda2c42b..238d118f7788b13cd86b7e9ea3a0fc38e2e09715 100644 --- a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java +++ b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java @@ -1,5 +1,6 @@ @@ -362,7 +362,7 @@ index 9ea403e6f..238d118f7 100644 +public interface StorageMinecart extends Minecart, InventoryHolder, LootableEntityInventory { // Paper } diff --git a/src/main/java/org/bukkit/loot/Lootable.java b/src/main/java/org/bukkit/loot/Lootable.java -index 24a3d989d..901db8524 100644 +index 24a3d989db3bc67e7afe8459a3d4bb132f448ea7..901db852498e0658c79a57582508dab29bf0a798 100644 --- a/src/main/java/org/bukkit/loot/Lootable.java +++ b/src/main/java/org/bukkit/loot/Lootable.java @@ -36,6 +36,34 @@ public interface Lootable { @@ -400,6 +400,3 @@ index 24a3d989d..901db8524 100644 /** * Set the seed used when this Loot Table generates loot. * --- -2.26.2 - diff --git a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch index 3841af2805..41d603f073 100644 --- a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch +++ b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From 8a1e728b8f151cf52deba5f2b7bee3ac0c2123a2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:34 -0700 Subject: [PATCH] Add EntityZapEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityZapEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java new file mode 100644 -index 000000000..3b725a489 +index 0000000000000000000000000000000000000000..3b725a489008d333630af166d2be5fc48168a6b9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java @@ -0,0 +1,65 @@ @@ -76,7 +76,7 @@ index 000000000..3b725a489 + } +} diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java -index 0e0ed93b5..d3949edfc 100644 +index 0e0ed93b568fd2c0d8f6e359c31dc29cb0fa71c2..d3949edfc736b3d67a627ef378748b374769e183 100644 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java @@ -2,6 +2,7 @@ package org.bukkit.event.entity; @@ -121,6 +121,3 @@ index 0e0ed93b5..d3949edfc 100644 + */ + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0038-Misc-Utils.patch b/Spigot-API-Patches/0038-Misc-Utils.patch index 8b8a30608e..fac858b16c 100644 --- a/Spigot-API-Patches/0038-Misc-Utils.patch +++ b/Spigot-API-Patches/0038-Misc-Utils.patch @@ -1,4 +1,4 @@ -From eed23f7813660a542d1e563760e41a1d21e58ed5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 12:53:43 -0500 Subject: [PATCH] Misc Utils @@ -6,7 +6,7 @@ Subject: [PATCH] Misc Utils diff --git a/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java new file mode 100644 -index 000000000..5bb677ce5 +index 0000000000000000000000000000000000000000..5bb677ce585b856b3d3e589e29786a29619c56a7 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java @@ -0,0 +1,34 @@ @@ -44,6 +44,3 @@ index 000000000..5bb677ce5 + return cachedSize.intValue(); + } +} --- -2.26.2 - 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 6025e082cb..a5593ab833 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 dad171c74df2dc24940141bce47acdc433258603 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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,7 +6,7 @@ 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 423fecf54..0ec517701 100644 +index 423fecf5411c05a55f22951437ff77af4bd29318..0ec517701677a844c72b065e0ce453a0408102a5 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1581,6 +1581,15 @@ public final class Bukkit { @@ -26,7 +26,7 @@ index 423fecf54..0ec517701 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 38d7da737..93bb91fad 100644 +index 38d7da7378f9dc387ce9b52f1527db929901670e..93bb91fad3a27632f2d6d02f1e08ddbca6152a43 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1390,4 +1390,6 @@ public interface Server extends PluginMessageRecipient { @@ -37,7 +37,7 @@ index 38d7da737..93bb91fad 100644 + boolean reloadCommandAliases(); // Paper } diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java -index bd2c7a696..864c263bb 100644 +index bd2c7a6964722412148fae39e1b4951fc0002b9b..864c263bbd4dd6dd7c37a74b39b1a40a884d0731 100644 --- a/src/main/java/org/bukkit/command/CommandMap.java +++ b/src/main/java/org/bukkit/command/CommandMap.java @@ -128,4 +128,14 @@ public interface CommandMap { @@ -56,7 +56,7 @@ index bd2c7a696..864c263bb 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index adfc7aae2..460fda05a 100644 +index adfc7aae2c0f49bbcdd358e83b04a0cf078a7d52..460fda05a62b12db2edcfb7ea8b2a5dd8e4b110d 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -297,4 +297,11 @@ public class SimpleCommandMap implements CommandMap { @@ -72,7 +72,7 @@ index adfc7aae2..460fda05a 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java -index c62da4131..0c7ba0718 100644 +index c62da4131b17e66892678e8b618fb9ba3de93b56..0c7ba0718de2b93d013968ca0fec34ffd423990f 100644 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java @@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand { @@ -106,6 +106,3 @@ index c62da4131..0c7ba0718 100644 + return com.google.common.collect.Lists.newArrayList("permissions", "commands"); // Paper } } --- -2.26.2 - diff --git a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch index cc90dc98ac..675b2be839 100644 --- a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch @@ -1,11 +1,11 @@ -From 6d38fdc5d943c374318c7d0d3c008d6b21b5ffdb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:47:08 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent diff --git a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java -index c99c9281e..7c340f539 100644 +index c99c9281e98e4b510dddb711b8785bcd56b3b92f..7c340f539c31a431d7d9204a8135e0bfc31863a8 100644 --- a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java @@ -1,21 +1,43 @@ @@ -52,6 +52,3 @@ index c99c9281e..7c340f539 100644 /** * Get the amount of experience the player will receive * --- -2.26.2 - diff --git a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch index bce9b888fa..a5c9df18df 100644 --- a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch +++ b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From c2bf88392dc9ba74ccce743f0d123b7004a4bd7d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add ProjectileCollideEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java new file mode 100644 -index 000000000..453663893 +index 0000000000000000000000000000000000000000..453663893021768ae21d4980ce17ffba55d9e129 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java @@ -0,0 +1,67 @@ @@ -77,6 +77,3 @@ index 000000000..453663893 + this.cancelled = cancel; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch index 497980245c..c4221d173e 100644 --- a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch +++ b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch @@ -1,11 +1,11 @@ -From 282612278f301da5f16d3002c7d0cd7ecd782c3a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:55:55 -0500 Subject: [PATCH] Add String based Action Bar API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9e62987cb..6f3ab730b 100644 +index 9e62987cbd36074923ade7c9dea0e418cfb9c2bc..6f3ab730b3196ae0cb4b3c2fb8976dcefafc1d4d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -443,6 +443,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -71,6 +71,3 @@ index 9e62987cb..6f3ab730b 100644 public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); } --- -2.26.2 - diff --git a/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch index c8c5127474..2845effc0b 100644 --- a/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,11 +1,11 @@ -From 0c1b09b9ee6b8ba923f4fd36c8f55d3997ecc931 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:47:25 -0600 Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index beeba55d5..6a854d7cf 100644 +index beeba55d53c3f1b268460488d57520db73f78c48..6a854d7cf68553b30e5aceca435c0bec31eb2f7c 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -291,4 +291,22 @@ public interface ArmorStand extends LivingEntity { @@ -31,6 +31,3 @@ index beeba55d5..6a854d7cf 100644 + void setCanMove(boolean move); + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0044-IllegalPacketEvent.patch b/Spigot-API-Patches/0044-IllegalPacketEvent.patch index 725177b9a7..7923b50e08 100644 --- a/Spigot-API-Patches/0044-IllegalPacketEvent.patch +++ b/Spigot-API-Patches/0044-IllegalPacketEvent.patch @@ -1,4 +1,4 @@ -From 1069406de4f5ebc7905a30f3bce3af03fb08560c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 4 Dec 2016 01:19:14 -0500 Subject: [PATCH] IllegalPacketEvent @@ -9,7 +9,7 @@ Lets plugins change the kick message and if it should kick or not. diff --git a/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java new file mode 100644 -index 000000000..37a17f0bb +index 0000000000000000000000000000000000000000..37a17f0bb2b9028cf0d3d320f5528fcb950f0d2c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java @@ -0,0 +1,70 @@ @@ -83,6 +83,3 @@ index 000000000..37a17f0bb + Bukkit.getLogger().severe(player.getName() + "/" + type + ": " + exception.getMessage()); + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0045-Fireworks-API-s.patch b/Spigot-API-Patches/0045-Fireworks-API-s.patch index 965d4db31c..c2de448c1c 100644 --- a/Spigot-API-Patches/0045-Fireworks-API-s.patch +++ b/Spigot-API-Patches/0045-Fireworks-API-s.patch @@ -1,4 +1,4 @@ -From 9189d92918b4203b4ee8a958a6705df801585371 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 28 Dec 2016 01:18:55 -0500 Subject: [PATCH] Fireworks API's @@ -7,7 +7,7 @@ Get the Entity being boosted Get the firework launcher diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java -index f844d5aa9..e8c04c138 100644 +index f844d5aa983f1d4718c9f22da80b0eed113547b1..e8c04c1383ec6dd53f30727db4e910ca17fbae5d 100644 --- a/src/main/java/org/bukkit/entity/Firework.java +++ b/src/main/java/org/bukkit/entity/Firework.java @@ -3,6 +3,9 @@ package org.bukkit.entity; @@ -36,6 +36,3 @@ index f844d5aa9..e8c04c138 100644 + public LivingEntity getBoostedEntity(); + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch index c99680f507..664edd24cd 100644 --- a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 6142445c0581fffa4484fd3ddc164249a3736687 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 31 Dec 2016 20:29:33 -0500 Subject: [PATCH] PlayerTeleportEndGatewayEvent @@ -7,7 +7,7 @@ Allows you to access the Gateway being used in a teleport event diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java new file mode 100644 -index 000000000..b64ab6eec +index 0000000000000000000000000000000000000000..b64ab6eecd8bc4ca9c109b9d83c82861d6260793 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java @@ -0,0 +1,29 @@ @@ -40,6 +40,3 @@ index 000000000..b64ab6eec + return gateway; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch index a16231ad94..a522f45e48 100644 --- a/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From 06a8a84c8126ecf97e19d1d791193145bef997fe Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:23:03 -0500 Subject: [PATCH] Provide E/TE/Chunk count stat methods @@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index cd8a09576..808c3b4a4 100644 +index cd8a09576a99f03f5ef9926d55fa3a1193ba0da6..808c3b4a4f494e05542f29324db655ee6166021e 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -40,6 +40,33 @@ import org.jetbrains.annotations.Nullable; @@ -44,6 +44,3 @@ index cd8a09576..808c3b4a4 100644 /** * Gets the {@link Block} at the given coordinates * --- -2.26.2 - diff --git a/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index fdf9ed2321..5dadaf640f 100644 --- a/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From fa3d1079346548c18f824021facbd8b3be7c1538 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:28:32 -0500 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player @@ -8,7 +8,7 @@ Adds lots of information about why this orb exists. Replaces isFromBottle() with logic that persists entity reloads too. diff --git a/src/main/java/org/bukkit/entity/ExperienceOrb.java b/src/main/java/org/bukkit/entity/ExperienceOrb.java -index c286edfd8..dec70bbfa 100644 +index c286edfd827e185a76e44c44faace19a80325d7a..dec70bbfaf73a9d525b2c45682b804c684e1645b 100644 --- a/src/main/java/org/bukkit/entity/ExperienceOrb.java +++ b/src/main/java/org/bukkit/entity/ExperienceOrb.java @@ -1,5 +1,8 @@ @@ -120,6 +120,3 @@ index c286edfd8..dec70bbfa 100644 + SpawnReason getSpawnReason(); + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch index 1d6c7e41fd..f700226be3 100644 --- a/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch +++ b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch @@ -1,11 +1,11 @@ -From 665f136673ecc680de23316c9d1430607813e6ef Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 21 Jan 2017 17:03:10 -0600 Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java -index 7e8f5649c..afb7b136b 100644 +index 7e8f5649ce0eb0090899514b1e228601eb644613..afb7b136b461202026290624836446cff9f9e45d 100644 --- a/src/main/java/org/bukkit/WorldBorder.java +++ b/src/main/java/org/bukkit/WorldBorder.java @@ -117,4 +117,18 @@ public interface WorldBorder { @@ -27,6 +27,3 @@ index 7e8f5649c..afb7b136b 100644 + } + // Paper end } --- -2.26.2 - 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 1fdd6cbdca..b0c301af1d 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 990bcb6c18176695797928e6300d34a593334e10 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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,7 +6,7 @@ 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 0ec517701..ded9df9a3 100644 +index 0ec517701677a844c72b065e0ce453a0408102a5..ded9df9a31fb9ac847a60b4eba182ac487252aca 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1590,6 +1590,16 @@ public final class Bukkit { @@ -27,7 +27,7 @@ index 0ec517701..ded9df9a3 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 93bb91fad..112098f9b 100644 +index 93bb91fad3a27632f2d6d02f1e08ddbca6152a43..112098f9bab1b091538d74f558113830c8cdce90 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1392,4 +1392,14 @@ public interface Server extends PluginMessageRecipient { @@ -46,7 +46,7 @@ index 93bb91fad..112098f9b 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java -index 7f153000e..1e126487d 100644 +index 7f153000eee0f563ee4f1e3c218aadb5b6a33a97..1e126487de534ddd634d9a87b9c816d6d09fd467 100644 --- a/src/main/java/org/bukkit/command/PluginCommand.java +++ b/src/main/java/org/bukkit/command/PluginCommand.java @@ -151,6 +151,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo @@ -57,6 +57,3 @@ index 7f153000e..1e126487d 100644 return super.tabComplete(sender, alias, args); } return completions; --- -2.26.2 - 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 d689c6e6de..7cb9a9960d 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 3d9d0d5e65508966103b499734e6c63b0a8701d2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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,7 +6,7 @@ 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 808c3b4a4..3b027f67c 100644 +index 808c3b4a4f494e05542f29324db655ee6166021e..3b027f67c1763ee0a4f7b02490d3cee1c3eff369 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -2009,6 +2009,7 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -74,7 +74,7 @@ index 808c3b4a4..3b027f67c 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 c2096b534..bca9d3659 100644 +index c2096b5344d48d855d031538ec32e0154bd9054d..bca9d3659f6fceeca4b7fecbc7034d6fdbc4581e 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 c2096b534..bca9d3659 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 6f3ab730b..cb7d9f055 100644 +index 6f3ab730b3196ae0cb4b3c2fb8976dcefafc1d4d..cb7d9f055193618c8a7e80796c2ba52651baca55 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -458,7 +458,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -179,7 +179,7 @@ index 6f3ab730b..cb7d9f055 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 1b2267f4e..1a58734d9 100644 +index 1b2267f4e8ebded198773ec80e2bff2c861c7084..1a58734d919fae247eeb85dd785fd59990856505 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 { @@ -191,6 +191,3 @@ index 1b2267f4e..1a58734d9 100644 public Location getTo() { return to; } --- -2.26.2 - diff --git a/Spigot-API-Patches/0052-Item-canEntityPickup.patch b/Spigot-API-Patches/0052-Item-canEntityPickup.patch index 3284705429..2b3d47cfb1 100644 --- a/Spigot-API-Patches/0052-Item-canEntityPickup.patch +++ b/Spigot-API-Patches/0052-Item-canEntityPickup.patch @@ -1,11 +1,11 @@ -From 208a37b615ef0eae1a0c61d55c4de61bac73f5c8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 5 May 2017 03:57:08 -0500 Subject: [PATCH] Item#canEntityPickup diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java -index 00c58c1d9..cb9e9f369 100644 +index 00c58c1d94b4822e7e26029cab23cf1964613db5..cb9e9f369e041cd9e5835cac7909db482295083c 100644 --- a/src/main/java/org/bukkit/entity/Item.java +++ b/src/main/java/org/bukkit/entity/Item.java @@ -37,4 +37,20 @@ public interface Item extends Entity { @@ -29,6 +29,3 @@ index 00c58c1d9..cb9e9f369 100644 + public void setCanMobPickup(boolean canMobPickup); + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch index 3aa0ee30cf..353d395911 100644 --- a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,11 +1,11 @@ -From 1a7eb89294acf34a67835dfd7c2d62f638c42e19 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 May 2017 06:26:01 -0500 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java -index 951ea2cc7..18d82c111 100644 +index 951ea2cc763973655beedcba3c75332d3f297313..18d82c111f30e0279c10a174a51bac018185cd38 100644 --- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java @@ -17,6 +17,7 @@ import org.jetbrains.annotations.NotNull; @@ -52,6 +52,3 @@ index 951ea2cc7..18d82c111 100644 } @NotNull --- -2.26.2 - diff --git a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch index 2a7daf288f..9decaf4f3f 100644 --- a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch @@ -1,4 +1,4 @@ -From 5839439f0beb3bc136e34eb0d9c8358ebe74125f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 11 Jun 2017 16:30:37 -0500 Subject: [PATCH] PlayerAttemptPickupItemEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAttemptPickupItemEvent diff --git a/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java new file mode 100644 -index 000000000..fb5cb3dc4 +index 0000000000000000000000000000000000000000..fb5cb3dc489cc8035223fd000aeb231f7bc92ef6 --- /dev/null +++ b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java @@ -0,0 +1,89 @@ @@ -99,6 +99,3 @@ index 000000000..fb5cb3dc4 + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch index 5652cca608..6cb95e95c4 100644 --- a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch +++ b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch @@ -1,4 +1,4 @@ -From d601968fd5d4787245c961ce2abe9eba0803210b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sweepyoface Date: Sat, 17 Jun 2017 18:48:06 -0400 Subject: [PATCH] Add UnknownCommandEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add UnknownCommandEvent diff --git a/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java new file mode 100644 -index 000000000..251342c3c +index 0000000000000000000000000000000000000000..251342c3cc6204f47ef1efb5724302a776359f4d --- /dev/null +++ b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java @@ -0,0 +1,82 @@ @@ -92,6 +92,3 @@ index 000000000..251342c3c + } +} + --- -2.26.2 - diff --git a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch index 07fdb85146..6c970458db 100644 --- a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch +++ b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 64a0d3e11488bbbc2ed7c6ee90d664af630bec8d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 21:46:46 -0500 Subject: [PATCH] Basic PlayerProfile API @@ -7,7 +7,7 @@ Provides basic elements of a PlayerProfile to be used by future API/events diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java new file mode 100644 -index 000000000..476151d2a +index 0000000000000000000000000000000000000000..476151d2a8757b77e677647fe95a0f7f1c873459 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java @@ -0,0 +1,145 @@ @@ -158,7 +158,7 @@ index 000000000..476151d2a +} diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java new file mode 100644 -index 000000000..7b3b6ef53 +index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6b0e0faee --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java @@ -0,0 +1,72 @@ @@ -235,7 +235,7 @@ index 000000000..7b3b6ef53 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index ded9df9a3..5d4fb5b9d 100644 +index ded9df9a31fb9ac847a60b4eba182ac487252aca..5d4fb5b9d55bfbe6bc9a9082b5cb85aa9ee86de2 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1600,6 +1600,40 @@ public final class Bukkit { @@ -280,7 +280,7 @@ index ded9df9a3..5d4fb5b9d 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 112098f9b..6778ac8e5 100644 +index 112098f9bab1b091538d74f558113830c8cdce90..6778ac8e5a16eb20574732acb0cc0038ec286467 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1401,5 +1401,33 @@ public interface Server extends PluginMessageRecipient { @@ -317,6 +317,3 @@ index 112098f9b..6778ac8e5 100644 + com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name); // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch index 60a9c6aa09..859798a0b4 100644 --- a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch +++ b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch @@ -1,11 +1,11 @@ -From cd54dbd0385dc40f13519fcb7dda7d103dd0d6ee Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 15:04:51 -0400 Subject: [PATCH] Shoulder Entities Release API diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index a7f08bb1c..3adff676c 100644 +index a7f08bb1c0778d99f06abfd15bb4a1a8bef6d502..3adff676c85a6648fc85a088e12ea524f4567b12 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -324,6 +324,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @@ -35,6 +35,3 @@ index a7f08bb1c..3adff676c 100644 /** * Gets the current cooldown for a player's attack. * --- -2.26.2 - diff --git a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch index 2d31a37f4d..1cdb35476d 100644 --- a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch +++ b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From 4b6c042da9e923edd76bc5fdc607ed401d4ced08 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 16:30:44 -0400 Subject: [PATCH] Profile Lookup Events @@ -8,7 +8,7 @@ profiles that had to be looked up. diff --git a/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java new file mode 100644 -index 000000000..8df37c07c +index 0000000000000000000000000000000000000000..8df37c07cd55ddf110d1dd68183d7b697f7a6756 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java @@ -0,0 +1,46 @@ @@ -60,7 +60,7 @@ index 000000000..8df37c07c +} diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java new file mode 100644 -index 000000000..4dcf6242c +index 0000000000000000000000000000000000000000..4dcf6242c9acc62d030a94f67b78729ed29f8c85 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java @@ -0,0 +1,108 @@ @@ -172,6 +172,3 @@ index 000000000..4dcf6242c + } + +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch index b04ea686da..5ad75ae831 100644 --- a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch +++ b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch @@ -1,11 +1,11 @@ -From f4dcdb8703168366918c79b871d00e942add7170 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 18 Jun 2017 18:17:05 -0500 Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 4e4445d18..e2952209d 100644 +index 4e4445d186303c06906fea68a867cc7985c69ba2..e2952209d5e98ad507628bed4fbefc3aede6045f 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -609,5 +609,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @@ -21,6 +21,3 @@ index 4e4445d18..e2952209d 100644 + boolean fromMobSpawner(); // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch b/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch index 8a6de80997..85814456bf 100644 --- a/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch +++ b/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch @@ -1,4 +1,4 @@ -From 869f1fac4b79043563dfa4625acdbabc613f7b9b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Dec 2016 16:12:48 -0500 Subject: [PATCH] Improve the Saddle API for Horses @@ -8,7 +8,7 @@ and access their saddle state separately from an interface shared with Armor. diff --git a/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java new file mode 100644 -index 000000000..163ffe8ff +index 0000000000000000000000000000000000000000..163ffe8ff76ded6265d865901d5110fb6a56950d --- /dev/null +++ b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java @@ -0,0 +1,21 @@ @@ -34,7 +34,7 @@ index 000000000..163ffe8ff + void setArmor(@Nullable ItemStack stack); +} diff --git a/src/main/java/org/bukkit/inventory/HorseInventory.java b/src/main/java/org/bukkit/inventory/HorseInventory.java -index 608e99c42..53498debe 100644 +index 608e99c4207405bf9dd88d44ad8e82eefa19e45c..53498debe4cfb80592ef3025270bc8e5df4a5fec 100644 --- a/src/main/java/org/bukkit/inventory/HorseInventory.java +++ b/src/main/java/org/bukkit/inventory/HorseInventory.java @@ -5,20 +5,4 @@ import org.jetbrains.annotations.Nullable; @@ -60,7 +60,7 @@ index 608e99c42..53498debe 100644 -} +public interface HorseInventory extends AbstractHorseInventory, ArmoredHorseInventory {} diff --git a/src/main/java/org/bukkit/inventory/LlamaInventory.java b/src/main/java/org/bukkit/inventory/LlamaInventory.java -index 2fa2c9d07..5ac1afb8a 100644 +index 2fa2c9d07ecbafaf2396d913af90f1f4d432b238..5ac1afb8a213fa0fe344db4730ecbc5de6eed445 100644 --- a/src/main/java/org/bukkit/inventory/LlamaInventory.java +++ b/src/main/java/org/bukkit/inventory/LlamaInventory.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable; @@ -74,13 +74,10 @@ index 2fa2c9d07..5ac1afb8a 100644 * Gets the item in the llama's decor slot. diff --git a/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java new file mode 100644 -index 000000000..7944f26a3 +index 0000000000000000000000000000000000000000..7944f26a3e2a92601c3be0e55c00c39cc16cf177 --- /dev/null +++ b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java @@ -0,0 +1,3 @@ +package org.bukkit.inventory; + +public interface SaddledHorseInventory extends AbstractHorseInventory {} --- -2.26.2 - diff --git a/Spigot-API-Patches/0061-ensureServerConversions-API.patch b/Spigot-API-Patches/0061-ensureServerConversions-API.patch index e9be7570c5..5ecaed96cd 100644 --- a/Spigot-API-Patches/0061-ensureServerConversions-API.patch +++ b/Spigot-API-Patches/0061-ensureServerConversions-API.patch @@ -1,4 +1,4 @@ -From 0a9552614a67b3e8a3b3ef7b58933043fc799766 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:55:48 -0400 Subject: [PATCH] ensureServerConversions API @@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr to ensure it meets latest minecraft expectations. diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 4ff149fd9..bb3f7cdc1 100644 +index 4ff149fd98895dd8ba45939a37c223b1f8d7281f..bb3f7cdc13dc015f88d3eaf5997f391528599d2a 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -141,4 +141,17 @@ public interface ItemFactory { @@ -29,7 +29,7 @@ index 4ff149fd9..bb3f7cdc1 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index f70a6a22b..07aa65d1a 100644 +index f70a6a22b85ff0da76e67e9b223ad4e0b020b5c4..07aa65d1a2056422b7b5ec98be970d5b064f3b81 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -536,7 +536,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -61,6 +61,3 @@ index f70a6a22b..07aa65d1a 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch index 38a24c4ad2..3964a1e0f5 100644 --- a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch +++ b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch @@ -1,4 +1,4 @@ -From b62a22ca13ce778145dbc34dcdffe4813bc30c24 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:55:48 -0400 Subject: [PATCH] Add getI18NDisplayName API @@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this, You must replace the language file embedded in the server jar. diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index bb3f7cdc1..3cada3487 100644 +index bb3f7cdc13dc015f88d3eaf5997f391528599d2a..3cada34873e6da92363c8d920f3bbbd0670a32e0 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -153,5 +153,16 @@ public interface ItemFactory { @@ -29,7 +29,7 @@ index bb3f7cdc1..3cada3487 100644 // Paper end } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 07aa65d1a..e9ba31152 100644 +index 07aa65d1a2056422b7b5ec98be970d5b064f3b81..e9ba311522a50572e6f1cb4554ba8e24a55cbb8a 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -609,5 +609,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -50,6 +50,3 @@ index 07aa65d1a..e9ba31152 100644 + } // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch index af024ee16f..041a3ca81f 100644 --- a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch @@ -1,4 +1,4 @@ -From 92673cadf67817aab73990289c74c27127703771 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Jul 2017 18:11:34 -0500 Subject: [PATCH] ProfileWhitelistVerifyEvent @@ -9,7 +9,7 @@ Allows you to do dynamic whitelisting and change of kick message diff --git a/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java new file mode 100644 -index 000000000..b10176289 +index 0000000000000000000000000000000000000000..b1017628967f40db9766bc7cf85a488535e84b9e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java @@ -0,0 +1,117 @@ @@ -130,6 +130,3 @@ index 000000000..b10176289 + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch index db60a6e1f8..0451f10f27 100644 --- a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch +++ b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch @@ -1,11 +1,11 @@ -From 45ec6aaac291417a79ebfad70ffb2c02b538914f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 02:08:55 -0500 Subject: [PATCH] Make /plugins list alphabetical diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java -index bcb576a42..a1071e317 100644 +index bcb576a4271b1ec7b1cfe6f83cf161b7d89ed2e5..a1071e3178a298f3fc1d6c960f4d8a6d3a3d0277 100644 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java @@ -3,6 +3,9 @@ package org.bukkit.command.defaults; @@ -57,6 +57,3 @@ index bcb576a42..a1071e317 100644 + // Paper end } } --- -2.26.2 - diff --git a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch index 4ca7b9bfa4..12e8f6c347 100644 --- a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch +++ b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch @@ -1,11 +1,11 @@ -From 203d058aa3ed3a1b4217f821bc7c2ee6f6b266e2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:49:43 -0500 Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 52541e496..ae712e76d 100644 +index 52541e496bd85e041a96fd5858acbb9bddbb8196..ae712e76d961137a35b70dd3f3fbb33dddf37f0a 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -250,6 +250,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -24,6 +24,3 @@ index 52541e496..ae712e76d 100644 /** * Adds the given {@link PotionEffect} to the living entity. * --- -2.26.2 - diff --git a/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch index 5aff82faa3..a1273c87c6 100644 --- a/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch +++ b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch @@ -1,4 +1,4 @@ -From e51e0cbb38eebff56b8323f32a2d23b9207e3599 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:14:13 +0200 Subject: [PATCH] Handle plugin prefixes in implementation logging @@ -17,7 +17,7 @@ The implementation should handle plugin prefixes by displaying logger names when appropriate. diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java -index 223190054..bb2e55e97 100644 +index 2231900549607a0917dd04e8b433c027b846cef9..bb2e55e97bf887a28cac7d4f9a0a23960d22cf56 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java @@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase { @@ -39,6 +39,3 @@ index 223190054..bb2e55e97 100644 } /** --- -2.26.2 - diff --git a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch index 8fd49e9ad6..82911ecbf9 100644 --- a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -1,4 +1,4 @@ -From 6d58aa991616435bb4a469b890c068c73d1c0aa4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:12 +0200 Subject: [PATCH] Allow plugins to use SLF4J for logging @@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/pom.xml b/pom.xml -index 661d109f7..20c473f52 100644 +index 661d109f7c5b78587c68f32d47029c6d2fe7604d..20c473f521e50df57065d3644398f9db777c1a24 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,13 @@ @@ -32,7 +32,7 @@ index 661d109f7..20c473f52 100644 junit diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java -index febfec6ef..79890c68f 100644 +index febfec6efafd76bb59b4b43aa223af16f73339b4..79890c68f1ad31f951dfdbd9a16dac500ec58c40 100644 --- a/src/main/java/org/bukkit/plugin/Plugin.java +++ b/src/main/java/org/bukkit/plugin/Plugin.java @@ -166,6 +166,13 @@ public interface Plugin extends TabExecutor { @@ -49,6 +49,3 @@ index febfec6ef..79890c68f 100644 /** * Returns the name of the plugin. *

--- -2.26.2 - diff --git a/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch index 6cbb016a23..ff6a815968 100644 --- a/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch +++ b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch @@ -1,4 +1,4 @@ -From a2d273ffe8bf9ad5b9526c51085a868a9d1099ab Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 19:41:20 +0200 Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin @@ -14,7 +14,7 @@ parent of the plugin logger to avoid this. diff --git a/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java new file mode 100644 -index 000000000..76f2cb9cd +index 0000000000000000000000000000000000000000..76f2cb9cd99cad2a9484eab2becd8c36f1dd91b3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java @@ -0,0 +1,41 @@ @@ -60,7 +60,7 @@ index 000000000..76f2cb9cd + +} diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java -index bb2e55e97..04fa3991f 100644 +index bb2e55e97bf887a28cac7d4f9a0a23960d22cf56..04fa3991f6ce4e9dad804f28fc6c947695857089 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java @@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase { @@ -87,7 +87,7 @@ index bb2e55e97..04fa3991f 100644 /** diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index 36f542a85..3a02dbe9d 100644 +index 36f542a85e0f16e97c65c0ca64ec660ddf75d63e..3a02dbe9d183bc907dcce081d8338d5716ed5242 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -42,6 +42,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot @@ -115,6 +115,3 @@ index 36f542a85..3a02dbe9d 100644 javaPlugin.init(loader, loader.server, description, dataFolder, file, this); } } --- -2.26.2 - diff --git a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch index 73286d00b5..18f2c35b4d 100644 --- a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch +++ b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch @@ -1,4 +1,4 @@ -From 0d1a83fae7d8aa0b04d3fcf518df34570be93c7b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Sep 2017 17:21:32 -0400 Subject: [PATCH] Add PlayerJumpEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerJumpEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java new file mode 100644 -index 000000000..289a0d784 +index 0000000000000000000000000000000000000000..289a0d784a3c74caf8a7231b4dd166096b1849a1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java @@ -0,0 +1,106 @@ @@ -116,6 +116,3 @@ index 000000000..289a0d784 + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch index 78c2535f00..ee3fbafd42 100644 --- a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch @@ -1,4 +1,4 @@ -From 133d45c9d35af37863373b0786ab52a73c1940cb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 10 Oct 2017 18:44:42 +0200 Subject: [PATCH] Expose client protocol version and virtual host @@ -11,7 +11,7 @@ Add a NetworkClient interface that provides access to: diff --git a/src/main/java/com/destroystokyo/paper/network/NetworkClient.java b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java new file mode 100644 -index 000000000..7b2af1bd7 +index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b851aa04f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java @@ -0,0 +1,41 @@ @@ -57,7 +57,7 @@ index 000000000..7b2af1bd7 + +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index cb7d9f055..9398f303f 100644 +index cb7d9f055193618c8a7e80796c2ba52651baca55..9398f303f191c57ee3e2bd33f205a881be6543f4 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable; @@ -69,6 +69,3 @@ index cb7d9f055..9398f303f 100644 /** * Gets the "friendly" name to display of this player. This may include --- -2.26.2 - diff --git a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch index b6956ed4b6..078d15776d 100644 --- a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch @@ -1,4 +1,4 @@ -From 23bde144450fd0412187276dbb2a6d6264f4216b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: pkt77 Date: Fri, 10 Nov 2017 23:45:59 -0500 Subject: [PATCH] Add PlayerArmorChangeEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java new file mode 100644 -index 000000000..2827a1002 +index 0000000000000000000000000000000000000000..2827a100275f8e1316b5d06c14662d41ca1bd5fa --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java @@ -0,0 +1,137 @@ @@ -147,6 +147,3 @@ index 000000000..2827a1002 + } + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch index 84bcaaafec..3fe23df9f4 100644 --- a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From b6e9fd15bac76fd7f37336a860f8139f33491a43 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 6 Nov 2017 21:10:01 -0500 Subject: [PATCH] API to get a BlockState without a snapshot @@ -9,7 +9,7 @@ on the real tile entity. This is useful for where performance is needed diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 8a48572e9..8154093df 100644 +index 8a48572e92e311de8c799ae608c5bee681ac91a5..8154093df6f6d4180485cecf98da3af26219eab8 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -269,6 +269,16 @@ public interface Block extends Metadatable { @@ -29,6 +29,3 @@ index 8a48572e9..8154093df 100644 /** * Returns the biome that this block resides in * --- -2.26.2 - diff --git a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch index 9bb0550eb7..e86dd9b401 100644 --- a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch +++ b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From 52a46f26ad9a823843ef700a61b2c8f0eced2505 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Nov 2017 13:17:09 -0500 Subject: [PATCH] AsyncTabCompleteEvent @@ -13,7 +13,7 @@ completion, such as offline players. diff --git a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java new file mode 100644 -index 000000000..619ed3716 +index 0000000000000000000000000000000000000000..619ed37169c126a8c75d02699a04728bac49d10d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java @@ -0,0 +1,177 @@ @@ -195,7 +195,7 @@ index 000000000..619ed3716 + } +} diff --git a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java -index d1a9956a1..f96c4ba53 100644 +index d1a9956a1573dab54c5ff2e5d67ca86cfe1dc01a..f96c4ba53ab41ea66d4f9a4d54eeabb63f992b58 100644 --- a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java +++ b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java @@ -1,5 +1,6 @@ @@ -264,6 +264,3 @@ index d1a9956a1..f96c4ba53 100644 } @Override --- -2.26.2 - diff --git a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch index f9428f93bf..2b6c78a2c4 100644 --- a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch +++ b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch @@ -1,4 +1,4 @@ -From e04e67172c3c5ae3b4ce5fe1a899ae0f5c538f2a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 9 Dec 2017 12:40:25 -0500 Subject: [PATCH] Display warning on deprecated recipe API @@ -10,7 +10,7 @@ on the players login. Plugin authors need to define a key to keep it consistent between server restarts. diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index d74b3114f..d742c4058 100644 +index d74b3114f535e1e5e36ae007f1fe0522916a0362..d742c4058ba9aed4fbe1591fd755a06608b06e98 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java @@ -25,6 +25,7 @@ public class ShapedRecipe implements Recipe, Keyed { @@ -22,7 +22,7 @@ index d74b3114f..d742c4058 100644 } diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -index 68447fb8c..84062dd71 100644 +index 68447fb8c12356e779b96ec98c54119045046751..84062dd719cb8a6142dc8c806777cb208c6b42b2 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java @@ -26,6 +26,7 @@ public class ShapelessRecipe implements Recipe, Keyed { @@ -33,6 +33,3 @@ index 68447fb8c..84062dd71 100644 this.output = new ItemStack(result); } --- -2.26.2 - diff --git a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch index 9770e8292e..906a8ec7c3 100644 --- a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch +++ b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch @@ -1,4 +1,4 @@ -From 88833a36b967c46876edcd7c827f69d107b0441e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:00:41 -0500 Subject: [PATCH] PlayerPickupExperienceEvent @@ -7,7 +7,7 @@ Allows plugins to cancel a player picking up an experience orb diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java new file mode 100644 -index 000000000..f7beb22d5 +index 0000000000000000000000000000000000000000..f7beb22d5105157940b39efe594ace9d4cb153f5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java @@ -0,0 +1,80 @@ @@ -91,6 +91,3 @@ index 000000000..f7beb22d5 + cancelled = cancel; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch index 0b5fe58ca6..3a4722a776 100644 --- a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch +++ b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From 6aa6f1d8373362d2388f8fd7268c9c69f579ee49 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:56:24 -0500 Subject: [PATCH] ExperienceOrbMergeEvent @@ -9,7 +9,7 @@ metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java new file mode 100644 -index 000000000..0ce3e3977 +index 0000000000000000000000000000000000000000..0ce3e397716c28c30ed05e153babd0bfb9dd354a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java @@ -0,0 +1,87 @@ @@ -100,6 +100,3 @@ index 000000000..0ce3e3977 + cancelled = cancel; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch index cd355c8f0d..ba17eaf22a 100644 --- a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch @@ -1,4 +1,4 @@ -From 79cdeb87be87e51812ecf9302e19d1e247492a34 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 17:38:07 -0500 Subject: [PATCH] Ability to apply mending to XP API @@ -10,7 +10,7 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9398f303f..8a67375de 100644 +index 9398f303f191c57ee3e2bd33f205a881be6543f4..8a67375dedf9ef91216a431d87e1e6a90c6787d8 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -690,12 +690,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -48,6 +48,3 @@ index 9398f303f..8a67375de 100644 /** * Gives the player the amount of experience levels specified. Levels can --- -2.26.2 - diff --git a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch index 3d9eb02267..cb623e42d2 100644 --- a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch +++ b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From b70880b6efa57cdc1bc10a32ff65d2bd8d2a9294 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 16:59:43 -0500 Subject: [PATCH] PreCreatureSpawnEvent @@ -16,7 +16,7 @@ See: https://github.com/PaperMC/Paper/issues/917 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java new file mode 100644 -index 000000000..d5edde9cd +index 0000000000000000000000000000000000000000..d5edde9cd530e9984f4ec4bd67783dfbc9357bad --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java @@ -0,0 +1,104 @@ @@ -124,6 +124,3 @@ index 000000000..d5edde9cd + cancelled = cancel; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch index d2bc4767d7..a6fa8a9b72 100644 --- a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From 4a8edbf79556ad5f288957d8876a9cdb60fb3693 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:31:37 -0500 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent @@ -10,7 +10,7 @@ Also a highly more effecient way to blanket block spawns in a world diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java new file mode 100644 -index 000000000..112a0dbf5 +index 0000000000000000000000000000000000000000..112a0dbf522b8e74ce882678434923814e6b187f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java @@ -0,0 +1,64 @@ @@ -78,6 +78,3 @@ index 000000000..112a0dbf5 + cancelled = cancel; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch index 5758ed7924..f53e543109 100644 --- a/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch @@ -1,4 +1,4 @@ -From 9e8767f0b3b3f8515a1613e9a9bb9618ea430d25 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 19 Jan 2018 00:29:28 -0500 Subject: [PATCH] Add setPlayerProfile API for Skulls @@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo which commonly cause rate limit issues with Mojang API diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java -index 943d751fb..a6914f01e 100644 +index 943d751fb3e48212fbe258845beba03c25fa22d9..a6914f01e01e9103702185f92b0209b3c84c152a 100644 --- a/src/main/java/org/bukkit/block/Skull.java +++ b/src/main/java/org/bukkit/block/Skull.java @@ -7,6 +7,7 @@ import org.bukkit.block.data.BlockData; @@ -40,7 +40,7 @@ index 943d751fb..a6914f01e 100644 * Gets the rotation of the skull in the world (or facing direction if this * is a wall mounted skull). diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java -index 35a392033..8b2465ea2 100644 +index 35a392033eb13ec6788f87dff3e74b434498e2a1..8b2465ea23dd6b0e25f5b6bb5d526e21c7908f09 100644 --- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java @@ -1,9 +1,11 @@ @@ -76,6 +76,3 @@ index 35a392033..8b2465ea2 100644 /** * Gets the owner of the skull. * --- -2.26.2 - diff --git a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch index 32a0f92c95..5511f6449a 100644 --- a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch +++ b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch @@ -1,4 +1,4 @@ -From 9389a54198096a32e5e1ff73b5a0d6effd4eec27 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 2 Jan 2018 00:31:08 -0500 Subject: [PATCH] Fill Profile Property Events @@ -12,7 +12,7 @@ This is useful for implementing a ProfileCache for Player Skulls diff --git a/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java new file mode 100644 -index 000000000..71f36e9ca +index 0000000000000000000000000000000000000000..71f36e9cae209ec6861835a5e76e018de959040a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java @@ -0,0 +1,75 @@ @@ -93,7 +93,7 @@ index 000000000..71f36e9ca +} diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java new file mode 100644 -index 000000000..021bc8631 +index 0000000000000000000000000000000000000000..021bc86310a06f84b39459e0eb8927802726399c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java @@ -0,0 +1,77 @@ @@ -174,6 +174,3 @@ index 000000000..021bc8631 + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch index d5a4dc0a29..5e8eaca58a 100644 --- a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch +++ b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch @@ -1,4 +1,4 @@ -From 34cad9effb5ade48de65055b9afa0eb5aae8848c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Jan 2018 08:15:14 -0600 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAdvancementCriterionGrantEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java new file mode 100644 -index 000000000..bb8d7c959 +index 0000000000000000000000000000000000000000..bb8d7c959cdea4b66455a49e74804ea4b126620d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java @@ -0,0 +1,63 @@ @@ -73,6 +73,3 @@ index 000000000..bb8d7c959 + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch index e4c345ff42..6287ef49e7 100644 --- a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch +++ b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch @@ -1,4 +1,4 @@ -From ab0241468203214f22dbaf2b94d3a2f9a4b3ee30 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 27 Jan 2018 17:06:24 -0500 Subject: [PATCH] Add ArmorStand Item Meta @@ -12,7 +12,7 @@ starting point for future additions in this area. diff --git a/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java new file mode 100644 -index 000000000..7e4acfff1 +index 0000000000000000000000000000000000000000..7e4acfff16db80a75e1ff2fee1972b16955b0918 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java @@ -0,0 +1,78 @@ @@ -94,6 +94,3 @@ index 000000000..7e4acfff1 + */ + void setMarker(boolean marker); +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0084-Optimize-Hoppers.patch b/Spigot-API-Patches/0084-Optimize-Hoppers.patch index bec2f7c73a..79c141af55 100644 --- a/Spigot-API-Patches/0084-Optimize-Hoppers.patch +++ b/Spigot-API-Patches/0084-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From d697214b9114e19f04b5c2169f5d284da5675335 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 18 Jan 2018 01:00:27 -0500 Subject: [PATCH] Optimize Hoppers @@ -7,7 +7,7 @@ Adds data about what Item related methods were used in InventoryMoveItem event so that the server can improve the performance of this event. diff --git a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java -index a8c48f5a4..04d4a83bf 100644 +index a8c48f5a416326e96c431e5fa22edee04825530e..04d4a83bfc4f86341f9d72128458154d08c8ec43 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java @@ -31,6 +31,8 @@ public class InventoryMoveItemEvent extends Event implements Cancellable { @@ -37,6 +37,3 @@ index a8c48f5a4..04d4a83bf 100644 this.itemStack = itemStack.clone(); } --- -2.26.2 - diff --git a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch index 1d9d5bb2df..1f7213f94e 100644 --- a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch +++ b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 0a6d202f31be5d5d2ecc88702363b5a6b662afd4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 24 Feb 2018 00:55:52 -0500 Subject: [PATCH] Tameable#getOwnerUniqueId API @@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java -index 0c066bdfc..957a60167 100644 +index 0c066bdfc9c3e3d56519870e51dfe487d0580414..957a60167215d00e9e0edaf418736f7f24c0a04b 100644 --- a/src/main/java/org/bukkit/entity/Tameable.java +++ b/src/main/java/org/bukkit/entity/Tameable.java @@ -1,5 +1,6 @@ @@ -40,6 +40,3 @@ index 0c066bdfc..957a60167 100644 * @return the owning AnimalTamer, or null if not owned */ @Nullable --- -2.26.2 - diff --git a/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index 5dc206a7f7..8d1bb19eba 100644 --- a/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -1,4 +1,4 @@ -From 713ad4df4e42006bb8e1fa624a12aefab732091a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 11:43:30 -0400 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent This will allow you to change the players name or skin on login. diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -index c8384da69..6c09ea6c6 100644 +index c8384da69af61e1970f254a3a9c206ee81d7a989..6c09ea6c61bdeb6149c8f2f23f15b2abb543e66e 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -2,6 +2,9 @@ package org.bukkit.event.player; @@ -52,6 +52,3 @@ index c8384da69..6c09ea6c6 100644 this.result = Result.ALLOWED; this.message = ""; this.name = name; --- -2.26.2 - diff --git a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch index dfbd4416c7..8199a19db7 100644 --- a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch +++ b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 1f72e6ba6fe22b8a0d93ce86effc67d43320e59f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 15:55:38 +0200 Subject: [PATCH] Add extended PaperServerListPingEvent @@ -8,7 +8,7 @@ and allows full control of the response sent to the client. diff --git a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java new file mode 100644 -index 000000000..0cc5dd573 +index 0000000000000000000000000000000000000000..0cc5dd57342c12c0561c2b6ea0f803efb236855e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java @@ -0,0 +1,323 @@ @@ -337,7 +337,7 @@ index 000000000..0cc5dd573 +} diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java new file mode 100644 -index 000000000..517d15238 +index 0000000000000000000000000000000000000000..517d15238ed117f38bbd39f570874014cecf7bb5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java @@ -0,0 +1,13 @@ @@ -355,7 +355,7 @@ index 000000000..517d15238 + +} diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java -index 612958a33..bb4f7702c 100644 +index 612958a331575d1da2715531ebdf6b1168f2e860..bb4f7702ced0baf0670a7a21d48ad528b7249361 100644 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java @@ -18,4 +18,9 @@ public interface CachedServerIcon { @@ -368,6 +368,3 @@ index 612958a33..bb4f7702c 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch index 6df4fb6178..ba0f7d54f7 100644 --- a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch +++ b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From e790f4bf31e991ec4696ceb8f2b1dc87bedcd903 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 12:28:55 -0400 Subject: [PATCH] Player.setPlayerProfile API @@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API This can be useful for changing name or skins after a player has logged in. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 8a67375de..8fe402336 100644 +index 8a67375dedf9ef91216a431d87e1e6a90c6787d8..8fe402336c2fe8d3f4d803f73b24d4848cdb3c69 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -2,6 +2,7 @@ package org.bukkit.entity; @@ -38,6 +38,3 @@ index 8a67375de..8fe402336 100644 // Paper end // Spigot start --- -2.26.2 - diff --git a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch index 6104598d39..e70a1220e4 100644 --- a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch +++ b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 3a9376909cd6ad2cd30d5f777cddb24a07d2c087 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:39:28 -0400 Subject: [PATCH] getPlayerUniqueId API @@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 5d4fb5b9d..f5fac807c 100644 +index 5d4fb5b9d55bfbe6bc9a9082b5cb85aa9ee86de2..f5fac807cce22819cba5878a6e2664f0f82f1ae3 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -467,6 +467,20 @@ public final class Bukkit { @@ -34,7 +34,7 @@ index 5d4fb5b9d..f5fac807c 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 6778ac8e5..11fffc514 100644 +index 6778ac8e5a16eb20574732acb0cc0038ec286467..11fffc514ed1f0b00b09c0cdb5272ea79340972c 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -396,6 +396,18 @@ public interface Server extends PluginMessageRecipient { @@ -56,6 +56,3 @@ index 6778ac8e5..11fffc514 100644 /** * Gets the plugin manager for interfacing with plugins. * --- -2.26.2 - diff --git a/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch index c5c2fd690e..f21c766148 100644 --- a/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch +++ b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 22c3773a195302a193b2c3d53ca7336ad4a64b4f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 19:30:20 +0200 Subject: [PATCH] Add legacy ping support to PaperServerListPingEvent @@ -8,7 +8,7 @@ client that does not support all of the features provided in the event. diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java -index 517d15238..ffda9f6a8 100644 +index 517d15238ed117f38bbd39f570874014cecf7bb5..ffda9f6a8b094942009aa78b331d22d9dcca2802 100644 --- a/src/main/java/com/destroystokyo/paper/network/StatusClient.java +++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java @@ -10,4 +10,16 @@ import com.destroystokyo.paper.event.server.PaperServerListPingEvent; @@ -28,6 +28,3 @@ index 517d15238..ffda9f6a8 100644 + } + } --- -2.26.2 - diff --git a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch index abda197adb..094aa9960e 100644 --- a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch +++ b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch @@ -1,11 +1,11 @@ -From ff1c8019060044851d060eb90f467f1b68506715 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 1 Apr 2018 02:28:43 +0300 Subject: [PATCH] Add method to open already placed sign diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index 3adff676c..2d413d720 100644 +index 3adff676c85a6648fc85a088e12ea524f4567b12..2d413d720c828c7f334abde7eb02935317e2fd17 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -468,4 +468,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @@ -22,6 +22,3 @@ index 3adff676c..2d413d720 100644 + void openSign(@NotNull org.bukkit.block.Sign sign); + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch index 03675449cc..eaf7e30eb1 100644 --- a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch +++ b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch @@ -1,4 +1,4 @@ -From 2b909f379fdaf8b917ef577b5cf68a1960dd1b80 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 28 Apr 2018 10:28:50 -0400 Subject: [PATCH] Add Ban Methods to Player Objects @@ -8,7 +8,7 @@ Allows a more logical API for banning players. player.banPlayer("Breaking the rules"); diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index 58313929f..6cf05fed7 100644 +index 58313929f81509030216a0e5e3869da63e11108e..6cf05fed701c67a2c797a4e0839c795802a238a1 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -45,6 +45,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio @@ -74,7 +74,7 @@ index 58313929f..6cf05fed7 100644 /** * Checks if this player is whitelisted or not diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 8fe402336..c37d7fca0 100644 +index 8fe402336c2fe8d3f4d803f73b24d4848cdb3c69..c37d7fca014fb0f325574a33ef4ccba67db7fe49 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -3,6 +3,10 @@ package org.bukkit.entity; @@ -251,6 +251,3 @@ index 8fe402336..c37d7fca0 100644 /** * Sends an Action Bar message to the client. --- -2.26.2 - diff --git a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch index feb44170e9..82d22fd0ea 100644 --- a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch +++ b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch @@ -1,4 +1,4 @@ -From de038a5328912aae8d9a936569c84dec095289ca Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:14:30 -0400 Subject: [PATCH] EndermanEscapeEvent @@ -9,7 +9,7 @@ You may cancel this, enabling ranged attacks to damage the enderman for example. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java new file mode 100644 -index 000000000..806112a8b +index 0000000000000000000000000000000000000000..806112a8b5a7ce31166675f5b074ceaf42e364b6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java @@ -0,0 +1,87 @@ @@ -100,6 +100,3 @@ index 000000000..806112a8b + DROWN + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch index 9d6d79ff22..9c226d009c 100644 --- a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch +++ b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch @@ -1,4 +1,4 @@ -From 773bba9d4c6528f8878b14ab85f3f4db73ece4ad Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:29:15 -0400 Subject: [PATCH] Enderman.teleportRandomly() @@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly() Ability to trigger the vanilla "teleport randomly" mechanic of an enderman. diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java -index bb325d9c8..821c690f8 100644 +index bb325d9c802e33431530bbccdcf5de5839e5fe68..821c690f8a32918bdb284ffec4af98f411f76ccc 100644 --- a/src/main/java/org/bukkit/entity/Enderman.java +++ b/src/main/java/org/bukkit/entity/Enderman.java @@ -10,6 +10,17 @@ import org.jetbrains.annotations.Nullable; @@ -27,6 +27,3 @@ index bb325d9c8..821c690f8 100644 /** * Gets the id and data of the block that the Enderman is carrying. * --- -2.26.2 - diff --git a/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch index 344383ab76..8f2e860517 100644 --- a/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch +++ b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch @@ -1,4 +1,4 @@ -From 42a081572a8efbe94ed5f53b9f4f28dd92c9a775 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 17:55:28 -0400 Subject: [PATCH] Additional world.getNearbyEntities API's @@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's Provides more methods to get nearby entities, and filter by types and predicates diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 3b027f67c..fbe7e76c0 100644 +index 3b027f67c1763ee0a4f7b02490d3cee1c3eff369..fbe7e76c0f3122dd47c7ca4562b5ac3577a71ffc 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1,6 +1,9 @@ @@ -277,7 +277,7 @@ index 3b027f67c..fbe7e76c0 100644 * Get a list of all players in this World * diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -index 6c09ea6c6..76c4a1a6e 100644 +index 6c09ea6c61bdeb6149c8f2f23f15b2abb543e66e..76c4a1a6e0c0e72b0f3f75d06f179c07f863e143 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -42,8 +42,7 @@ public class AsyncPlayerPreLoginEvent extends Event { @@ -290,6 +290,3 @@ index 6c09ea6c6..76c4a1a6e 100644 * @param profile The profile to use */ public void setPlayerProfile(@NotNull PlayerProfile profile) { --- -2.26.2 - diff --git a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch index f3e03b7999..1670d20348 100644 --- a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch +++ b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch @@ -1,11 +1,11 @@ -From 350b09c26418358e4b30679f7c35467491fc1dc3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 19:27:31 -0400 Subject: [PATCH] Location.isChunkLoaded() API diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 0939a8070..6c8b8eddc 100644 +index 0939a8070f9cc4f66f1679fef74862debb7d32ae..6c8b8eddcdb81f7151202eb12541308040790d45 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -533,6 +533,7 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -16,6 +16,3 @@ index 0939a8070..6c8b8eddc 100644 @Override public boolean equals(Object obj) { if (obj == null) { --- -2.26.2 - 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 9167860d27..27f7e480ff 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 336ac304c375b8aa1bc686c7594b2b4a39725d30 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 000000000..06f1602f5 +index 0000000000000000000000000000000000000000..06f1602f5b327705f726d0a99dd6b95e1554d382 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java @@ -0,0 +1,478 @@ @@ -493,7 +493,7 @@ index 000000000..06f1602f5 + } +} diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java -index 49467ac70..d2ceb07c7 100644 +index 49467ac70a5ff6e31a8c5c3ec92de3c65fee2284..d2ceb07c727ab898e4ef1b502f9544817ce3bda6 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,7 +515,7 @@ index 49467ac70..d2ceb07c7 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 fbe7e76c0..085c7a42c 100644 +index fbe7e76c0f3122dd47c7ca4562b5ac3577a71ffc..085c7a42c3e758770d5883e3cddf896ac6b7645b 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -2433,7 +2433,57 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -577,6 +577,3 @@ index fbe7e76c0..085c7a42c 100644 /** * Spawns the particle (the number of times specified by count) --- -2.26.2 - diff --git a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch index 3afc53c8d5..9f3e105c9d 100644 --- a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch +++ b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch @@ -1,4 +1,4 @@ -From 3659aee2bdce6ddba260678e1cbd700fc9b11820 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 20:17:44 -0400 Subject: [PATCH] EndermanAttackPlayerEvent @@ -9,7 +9,7 @@ This allows you to override/extend the pumpkin/stare logic. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java new file mode 100644 -index 000000000..f530a3d93 +index 0000000000000000000000000000000000000000..f530a3d9314e17d1da896cac633f6a422258d9a9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java @@ -0,0 +1,101 @@ @@ -114,6 +114,3 @@ index 000000000..f530a3d93 + cancelled = cancel; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch b/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch index b31b181ea0..331239ba2e 100644 --- a/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch +++ b/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch @@ -1,4 +1,4 @@ -From 26a891ffd609b62b8198ff3cfabca35afacf84bb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 21:33:35 -0400 Subject: [PATCH] Close Plugin Class Loaders on Disable @@ -7,7 +7,7 @@ This should close more memory leaks from /reload and disabling plugins, by closing the class loader and the jar file. diff --git a/src/main/java/org/bukkit/plugin/PluginLoader.java b/src/main/java/org/bukkit/plugin/PluginLoader.java -index a88733f1c..6ab9cd821 100644 +index a88733f1cd1ddb5d85ab1b0e6af4fd5b80bbc1c6..6ab9cd8213cbe35943748dcf42948d5fc048c84c 100644 --- a/src/main/java/org/bukkit/plugin/PluginLoader.java +++ b/src/main/java/org/bukkit/plugin/PluginLoader.java @@ -77,4 +77,18 @@ public interface PluginLoader { @@ -30,7 +30,7 @@ index a88733f1c..6ab9cd821 100644 + // Paper end - close Classloader on disable } diff --git a/src/main/java/org/bukkit/plugin/PluginManager.java b/src/main/java/org/bukkit/plugin/PluginManager.java -index 41e26451f..86cc5025a 100644 +index 41e26451fe12d8e6e0ef73c85731b24b4e3f200c..86cc5025ad98f7a752c51713b7cd6a39d5136ecc 100644 --- a/src/main/java/org/bukkit/plugin/PluginManager.java +++ b/src/main/java/org/bukkit/plugin/PluginManager.java @@ -161,6 +161,18 @@ public interface PluginManager { @@ -53,7 +53,7 @@ index 41e26451f..86cc5025a 100644 * Gets a {@link Permission} from its fully qualified name * diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 8ddaf9c2e..8bb24f734 100644 +index 8ddaf9c2e63b382533d7f8929023c364ff3a8f9d..8bb24f734f0bbb5df37dff2f376a450b8be9be28 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -492,17 +492,28 @@ public final class SimplePluginManager implements PluginManager { @@ -97,7 +97,7 @@ index 8ddaf9c2e..8bb24f734 100644 lookupNames.clear(); dependencyGraph = GraphBuilder.directed().build(); diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index e72cbde4b..32ec68b48 100644 +index e72cbde4b3225cbf17d8a9b275e0ffcaa6d86c19..32ec68b489ab1933b4375a339c77c05a3e235202 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -331,7 +331,7 @@ public final class JavaPluginLoader implements PluginLoader { @@ -139,6 +139,3 @@ index e72cbde4b..32ec68b48 100644 } } } --- -2.26.2 - diff --git a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch index b5a6bacaf1..fab6106411 100644 --- a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch +++ b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch @@ -1,4 +1,4 @@ -From 630e23c654223c31b4307999dd467b9ede7f501f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:26:16 -0400 Subject: [PATCH] WitchConsumePotionEvent @@ -7,7 +7,7 @@ Fires when a witch consumes the potion in their hand diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java new file mode 100644 -index 000000000..fbbace36d +index 0000000000000000000000000000000000000000..fbbace36d69373046a7f3618ed5c1c1318b489b9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java @@ -0,0 +1,70 @@ @@ -83,7 +83,7 @@ index 000000000..fbbace36d +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java new file mode 100644 -index 000000000..6ef6367b6 +index 0000000000000000000000000000000000000000..6ef6367b67261c2b653a97322b9703a9409b3499 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java @@ -0,0 +1,33 @@ @@ -120,6 +120,3 @@ index 000000000..6ef6367b6 + cancelled = cancel; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch index 65985c43fc..a5dfe42f35 100644 --- a/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch +++ b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch @@ -1,4 +1,4 @@ -From 8688ccbce452752649c1f63de69d95374523626d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:39:09 -0400 Subject: [PATCH] WitchThrowPotionEvent @@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent Fired when a witch throws a potion at a player diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java -index 6ef6367b6..688a596aa 100644 +index 6ef6367b67261c2b653a97322b9703a9409b3499..688a596aa2b925651a92bf092e1ef4d77a47258c 100644 --- a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java @@ -1,29 +1,77 @@ @@ -91,6 +91,3 @@ index 6ef6367b6..688a596aa 100644 } @Override --- -2.26.2 - diff --git a/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch index a5edfae217..1f3ad622a7 100644 --- a/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch +++ b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch @@ -1,4 +1,4 @@ -From 923c4bb418105067ca2ce1394153b2ff530cafcf Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 24 May 2018 21:01:13 -0400 Subject: [PATCH] Location.toBlockLocation/toCenterLocation() @@ -6,7 +6,7 @@ Subject: [PATCH] Location.toBlockLocation/toCenterLocation() Convert location objects to their block coordinates, or the center of the block diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 6c8b8eddc..f61bf28af 100644 +index 6c8b8eddcdb81f7151202eb12541308040790d45..f61bf28afe99f83cdac6490bcc114509698d0aad 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -534,6 +534,31 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -41,6 +41,3 @@ index 6c8b8eddc..f61bf28af 100644 @Override public boolean equals(Object obj) { if (obj == null) { --- -2.26.2 - diff --git a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch index 7106a63821..7f4e064a78 100644 --- a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch +++ b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch @@ -1,11 +1,11 @@ -From a73327760b67e2aacef48ba2cb03137e1ef14ded Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Jun 2018 04:10:13 -0400 Subject: [PATCH] PotionEffect clone methods diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java -index 60716c627..747677511 100644 +index 60716c627d315b08c3fe03b1a945af60c350711f..74767751199bce03d63f2a9524712656193f850c 100644 --- a/src/main/java/org/bukkit/potion/PotionEffect.java +++ b/src/main/java/org/bukkit/potion/PotionEffect.java @@ -101,6 +101,33 @@ public class PotionEffect implements ConfigurationSerializable { @@ -42,6 +42,3 @@ index 60716c627..747677511 100644 @NotNull private static PotionEffectType getEffectType(@NotNull Map map) { int type = getInt(map, TYPE); --- -2.26.2 - diff --git a/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch index 402f24a729..5722426049 100644 --- a/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch +++ b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch @@ -1,4 +1,4 @@ -From 8c8906518963b84b507c5c2137db31a7b687de9f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:47:08 -0400 Subject: [PATCH] WitchReadyPotionEvent @@ -7,7 +7,7 @@ Control what potion the witch readies to use diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java new file mode 100644 -index 000000000..5351b523d +index 0000000000000000000000000000000000000000..5351b523defa054ba56ae3fb591029283ca7510d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java @@ -0,0 +1,80 @@ @@ -91,6 +91,3 @@ index 000000000..5351b523d + cancelled = cancel; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch index eb838f98ad..f8637b5acb 100644 --- a/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch +++ b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch @@ -1,4 +1,4 @@ -From 67bbdc3978562a2bde35e338a9f0610e7a172898 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:59:50 -0400 Subject: [PATCH] ItemStack#getMaxItemUseDuration @@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration Allows you to determine how long it takes to use a usable/consumable item diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index e9ba31152..125b74dd8 100644 +index e9ba311522a50572e6f1cb4554ba8e24a55cbb8a..125b74dd8263ab04a5df51764726efda15c1fca7 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -621,5 +621,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -23,6 +23,3 @@ index e9ba31152..125b74dd8 100644 + } // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch index e5c48d4087..0422ec9858 100644 --- a/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch +++ b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 6a88e74da088408754dfd5b6e3d59087c944776b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 9 Jun 2018 13:08:21 +0100 Subject: [PATCH] Add EntityTeleportEndGatewayEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityTeleportEndGatewayEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java new file mode 100644 -index 000000000..bfc69a43c +index 0000000000000000000000000000000000000000..bfc69a43c291fbed91b9d0387e4ef18b0ed1b9de --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java @@ -0,0 +1,31 @@ @@ -41,6 +41,3 @@ index 000000000..bfc69a43c + } + +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch index baa31bdd35..031f7f0575 100644 --- a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch @@ -1,11 +1,11 @@ -From 52d0dd030ca757e4e77bc89310a37437bb712058 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 16 Jun 2018 01:17:39 -0500 Subject: [PATCH] Make shield blocking delay configurable diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index ae712e76d..896b1971c 100644 +index ae712e76d961137a35b70dd3f3fbb33dddf37f0a..896b1971c86410ccc62353e44bfe5a449f8a0c97 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -554,5 +554,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -28,6 +28,3 @@ index ae712e76d..896b1971c 100644 + void setShieldBlockingDelay(int delay); // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch index 74d955707a..b8ffc57f65 100644 --- a/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch +++ b/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch @@ -1,4 +1,4 @@ -From 80f0a8045024b522a4a136caaa43d047b16bbd81 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 15 Jun 2013 19:52:04 -0400 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API @@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API Adds ability to get what arrow was shot, and control if it should be consumed. diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java -index 18c5e31ab..37dbc12eb 100644 +index 18c5e31abcdc24320bb6c01e85ba85c848956bd4..37dbc12eb47060ebf0f6a18960d036bd27ce3740 100644 --- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java @@ -2,6 +2,7 @@ package org.bukkit.event.entity; @@ -48,6 +48,3 @@ index 18c5e31ab..37dbc12eb 100644 this.bow = bow; this.projectile = projectile; this.force = force; --- -2.26.2 - diff --git a/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch b/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch index 56cd45e8a7..a362af6260 100644 --- a/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch +++ b/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch @@ -1,11 +1,11 @@ -From 78e9e1179adff0653d6159a7cf76ae8970e298d1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 18 Jun 2018 00:41:46 -0500 Subject: [PATCH] Add "getNearbyXXX" methods to Location diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index f61bf28af..4cf22afc3 100644 +index f61bf28afe99f83cdac6490bcc114509698d0aad..4cf22afc3c1f1cc19b6e5350043431215908a612 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -12,6 +12,15 @@ import org.bukkit.util.Vector; @@ -273,6 +273,3 @@ index f61bf28af..4cf22afc3 100644 // Paper end @Override public boolean equals(Object obj) { --- -2.26.2 - diff --git a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch b/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch index 642dfe2982..7ea1740581 100644 --- a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch +++ b/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch @@ -1,4 +1,4 @@ -From dd28b91b6be56103ed65db1b8169d2f8a8f585f2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 01:09:27 -0400 Subject: [PATCH] PlayerReadyArrowEvent @@ -8,7 +8,7 @@ Plugins can skip selection of certain arrows and control which is used. diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java new file mode 100644 -index 000000000..5d04a22fd +index 0000000000000000000000000000000000000000..5d04a22fd6964d8d44a2aa069c9629722893b1f4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java @@ -0,0 +1,93 @@ @@ -105,6 +105,3 @@ index 000000000..5d04a22fd + cancelled = cancel; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch b/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch index 5934fd4b4d..1620ab68a6 100644 --- a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch +++ b/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From 1f19271ba32e886dbad2f7395d700d65a6b3ac8f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Mon, 18 Jun 2018 15:40:39 +0200 Subject: [PATCH] Add EntityKnockbackByEntityEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityKnockbackByEntityEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java new file mode 100644 -index 000000000..9efecabab +index 0000000000000000000000000000000000000000..9efecabab813f575bb447a356e5e7e952d110f30 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java @@ -0,0 +1,82 @@ @@ -92,6 +92,3 @@ index 000000000..9efecabab + return acceleration; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0112-Expand-Explosions-API.patch b/Spigot-API-Patches/0112-Expand-Explosions-API.patch index aaf556d7b3..0b5880cfd7 100644 --- a/Spigot-API-Patches/0112-Expand-Explosions-API.patch +++ b/Spigot-API-Patches/0112-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From 004f0a6533e7b89cc5fbd24a2dad7caa773bf04b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:24:42 -0500 Subject: [PATCH] Expand Explosions API @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API Add Entity as a Source capability, and add more API choices, and on Location. diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 4cf22afc3..ac3c8eef5 100644 +index 4cf22afc3c1f1cc19b6e5350043431215908a612..ac3c8eef58872c2de840a4b7ba7d77c2e597aee0 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -7,6 +7,7 @@ import java.util.HashMap; @@ -106,7 +106,7 @@ index 4cf22afc3..ac3c8eef5 100644 * Returns a list of entities within a bounding box centered around a Location. * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 085c7a42c..08985f77d 100644 +index 085c7a42c3e758770d5883e3cddf896ac6b7645b..08985f77dce71ebd76510be873043e34ac34a821 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1354,6 +1354,88 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -198,6 +198,3 @@ index 085c7a42c..08985f77d 100644 /** * Creates explosion at given coordinates with given power and optionally * setting blocks on fire or breaking blocks. --- -2.26.2 - diff --git a/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch b/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch index 836fdc1138..418951be55 100644 --- a/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch +++ b/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch @@ -1,11 +1,11 @@ -From 03056ab98781c82b614f33e7c1bdb55c0f28c766 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 22 Jun 2018 22:59:18 -0400 Subject: [PATCH] ItemStack API additions for quantity/flags/lore diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 125b74dd8..4940ba6a9 100644 +index 125b74dd8263ab04a5df51764726efda15c1fca7..4940ba6a979cec5bea0edc24b94149298c256bc3 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -2,7 +2,9 @@ package org.bukkit.inventory; @@ -159,6 +159,3 @@ index 125b74dd8..4940ba6a9 100644 + } // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch index 807eac4579..46d1a43a65 100644 --- a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -1,4 +1,4 @@ -From 5bf82026c695b582aeb438cd65ab64f92ab006c6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Jun 2018 00:19:19 -0400 Subject: [PATCH] LivingEntity Hand Raised/Item Use API @@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 896b1971c..4af8e680d 100644 +index 896b1971c86410ccc62353e44bfe5a449f8a0c97..4af8e680dbcd3e0bc1ed692146b72fecbf7735ba 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -11,6 +11,7 @@ import org.bukkit.attribute.Attributable; @@ -50,6 +50,3 @@ index 896b1971c..4af8e680d 100644 + boolean isHandRaised(); // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0115-RangedEntity-API.patch b/Spigot-API-Patches/0115-RangedEntity-API.patch index 12a67289a9..354c7d670b 100644 --- a/Spigot-API-Patches/0115-RangedEntity-API.patch +++ b/Spigot-API-Patches/0115-RangedEntity-API.patch @@ -1,4 +1,4 @@ -From 92d3c606d3c2a56a6dbaa1f866fa1cef68d3559f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 26 Jun 2018 21:34:40 -0400 Subject: [PATCH] RangedEntity API @@ -8,7 +8,7 @@ and to perform an attack. diff --git a/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java new file mode 100644 -index 000000000..f2e3233a3 +index 0000000000000000000000000000000000000000..f2e3233a3d1744e32fb76d3731b9858ef0067e30 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java @@ -0,0 +1,31 @@ @@ -44,7 +44,7 @@ index 000000000..f2e3233a3 + } +} diff --git a/src/main/java/org/bukkit/entity/Drowned.java b/src/main/java/org/bukkit/entity/Drowned.java -index 1dee177ae..8d1ad9ef7 100644 +index 1dee177ae6e21da000607dc8dd8fd76857f323b9..8d1ad9ef757cb1e8d72b145262df73612a76c746 100644 --- a/src/main/java/org/bukkit/entity/Drowned.java +++ b/src/main/java/org/bukkit/entity/Drowned.java @@ -1,6 +1,8 @@ @@ -58,7 +58,7 @@ index 1dee177ae..8d1ad9ef7 100644 -public interface Drowned extends Zombie { } +public interface Drowned extends Zombie, RangedEntity { } // Paper diff --git a/src/main/java/org/bukkit/entity/Illusioner.java b/src/main/java/org/bukkit/entity/Illusioner.java -index 7c92c431b..14e6c5ee0 100644 +index 7c92c431b32754dca12b4d584bd6fa93ff73badf..14e6c5ee06ece3d1bbc1239afa67c847a479948f 100644 --- a/src/main/java/org/bukkit/entity/Illusioner.java +++ b/src/main/java/org/bukkit/entity/Illusioner.java @@ -1,6 +1,10 @@ @@ -74,7 +74,7 @@ index 7c92c431b..14e6c5ee0 100644 + +} diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java -index c43854298..d23226ccb 100644 +index c43854298548391679c1d280bd42edbeed7759b9..d23226ccb0f6c25028f000ce31346cd0a8898e6a 100644 --- a/src/main/java/org/bukkit/entity/Llama.java +++ b/src/main/java/org/bukkit/entity/Llama.java @@ -1,12 +1,13 @@ @@ -93,7 +93,7 @@ index c43854298..d23226ccb 100644 /** * Represents the base color that the llama has. diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java -index 16b129388..1c367f78e 100644 +index 16b1293887cee2bc5267f3da771fb5a6ece1b4e9..1c367f78eadf24850061a84ce63b950b79d3c435 100644 --- a/src/main/java/org/bukkit/entity/Skeleton.java +++ b/src/main/java/org/bukkit/entity/Skeleton.java @@ -2,11 +2,12 @@ package org.bukkit.entity; @@ -111,7 +111,7 @@ index 16b129388..1c367f78e 100644 /** * Gets the current type of this skeleton. diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java -index 818efe2a4..10f8f6d45 100644 +index 818efe2a4d1ac0c4d8dca6c757850d99cdc2cb4b..10f8f6d45ae9280651c3ebddd1f90acbd7d6ff29 100644 --- a/src/main/java/org/bukkit/entity/Snowman.java +++ b/src/main/java/org/bukkit/entity/Snowman.java @@ -1,9 +1,11 @@ @@ -128,7 +128,7 @@ index 818efe2a4..10f8f6d45 100644 /** * Gets whether this snowman is in "derp mode", meaning it is not wearing a diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java -index b4343903b..aa88aede6 100644 +index b4343903b66a7fb5250c1da2e09c9e5863c20daf..aa88aede6c4e66a608a63d07bc66d60357b0bee9 100644 --- a/src/main/java/org/bukkit/entity/Witch.java +++ b/src/main/java/org/bukkit/entity/Witch.java @@ -1,7 +1,9 @@ @@ -143,7 +143,7 @@ index b4343903b..aa88aede6 100644 +public interface Witch extends Raider, RangedEntity { // Paper } diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java -index 3bc332ee7..426d36933 100644 +index 3bc332ee7f7d428bef6e2566ddded8b941858e2e..426d3693317cd303d35d8203026b528d87e401d5 100644 --- a/src/main/java/org/bukkit/entity/Wither.java +++ b/src/main/java/org/bukkit/entity/Wither.java @@ -1,7 +1,9 @@ @@ -157,6 +157,3 @@ index 3bc332ee7..426d36933 100644 -public interface Wither extends Monster, Boss { +public interface Wither extends Monster, Boss, RangedEntity { // Paper } --- -2.26.2 - diff --git a/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch b/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch index 895f60238c..c8a7bafa4a 100644 --- a/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch +++ b/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch @@ -1,11 +1,11 @@ -From 3f1bf9ea671bbc30d7f5406b64896ffbb25f58ff Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 3 Jul 2018 16:07:16 +0200 Subject: [PATCH] Add World.getEntity(UUID) API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 08985f77d..889756b1c 100644 +index 08985f77dce71ebd76510be873043e34ac34a821..889756b1c8d5e413a6ebe3623e128a737f88d48c 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -914,6 +914,17 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -26,6 +26,3 @@ index 08985f77d..889756b1c 100644 /** * Returns a list of entities within a bounding box centered around a * Location. --- -2.26.2 - diff --git a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch b/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch index 703cdaf4cf..566114944a 100644 --- a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From c7c413ab5b8a9bea7918c7d2b1e309500ecd73a7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:52:52 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index 2d413d720..79569a329 100644 +index 2d413d720c828c7f334abde7eb02935317e2fd17..79569a329aa19ed954b9b65b78ef5d6d313501a1 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -152,6 +152,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @@ -27,7 +27,7 @@ index 2d413d720..79569a329 100644 * Returns the ItemStack currently in your hand, can be empty. * diff --git a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java -index 5861247c1..21ad8888c 100644 +index 5861247c1b8ee4fe2736fd5098e05a2ca9ab78ea..21ad8888c0e403bfc63518502577d651c02dda05 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java @@ -11,9 +11,60 @@ import org.jetbrains.annotations.NotNull; @@ -91,6 +91,3 @@ index 5861247c1..21ad8888c 100644 } /** --- -2.26.2 - diff --git a/Spigot-API-Patches/0118-Entity-getChunk-API.patch b/Spigot-API-Patches/0118-Entity-getChunk-API.patch index 0667d8aec1..ef5187873a 100644 --- a/Spigot-API-Patches/0118-Entity-getChunk-API.patch +++ b/Spigot-API-Patches/0118-Entity-getChunk-API.patch @@ -1,4 +1,4 @@ -From 144edfa492185db21fd3fd9dacf6ff5adc8f6989 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:25:48 -0400 Subject: [PATCH] Entity#getChunk API @@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API Get the chunk the entity is currently registered to diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index e2952209d..a8dbf282d 100644 +index e2952209d5e98ad507628bed4fbefc3aede6045f..a8dbf282d0a8fb57f4719b9e95199894d8d3324c 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -3,6 +3,7 @@ package org.bukkit.entity; @@ -31,6 +31,3 @@ index e2952209d..a8dbf282d 100644 + Chunk getChunk(); // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch index 9df8d3083c..adfac8a99f 100644 --- a/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch +++ b/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch @@ -1,4 +1,4 @@ -From 4b19178484cdd9010e318e7dce34581b5bf6e3a1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 19 Jul 2018 22:07:02 +0200 Subject: [PATCH] Add an asterisk to legacy API plugins @@ -7,7 +7,7 @@ Not here to name and shame, only so server admins can be aware of which plugins have and haven't been updated. diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index c0ff133de..821064264 100644 +index c0ff133dece238297bbdf4cb938c9a3070783ec4..821064264405cde147e944df279b44a20a4868ad 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -83,5 +83,11 @@ public interface UnsafeValues { @@ -23,7 +23,7 @@ index c0ff133de..821064264 100644 // Paper end } diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java -index a1071e317..3dcecf3a5 100644 +index a1071e3178a298f3fc1d6c960f4d8a6d3a3d0277..3dcecf3a543646327c277ee2698106159b2cbc84 100644 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java @@ -59,7 +59,13 @@ public class PluginsCommand extends BukkitCommand { @@ -42,7 +42,7 @@ index a1071e317..3dcecf3a5 100644 return "(" + plugins.size() + "): " + pluginList.toString(); diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 32ec68b48..8ff228ced 100644 +index 32ec68b489ab1933b4375a339c77c05a3e235202..8ff228ced356eb509b93abb7a0d3d9a26dd3e057 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -315,7 +315,14 @@ public final class JavaPluginLoader implements PluginLoader { @@ -61,6 +61,3 @@ index 32ec68b48..8ff228ced 100644 JavaPlugin jPlugin = (JavaPlugin) plugin; --- -2.26.2 - diff --git a/Spigot-API-Patches/0120-EnderDragon-Events.patch b/Spigot-API-Patches/0120-EnderDragon-Events.patch index 1ccddee514..68ed791382 100644 --- a/Spigot-API-Patches/0120-EnderDragon-Events.patch +++ b/Spigot-API-Patches/0120-EnderDragon-Events.patch @@ -1,4 +1,4 @@ -From 2cb1756d46eb48a7988d0b1980961165f2f3ab8c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:51:05 -0500 Subject: [PATCH] EnderDragon Events @@ -6,7 +6,7 @@ Subject: [PATCH] EnderDragon Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java new file mode 100644 -index 000000000..118c7b677 +index 0000000000000000000000000000000000000000..118c7b6772a52c250649af2a9286f483f43da385 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java @@ -0,0 +1,79 @@ @@ -91,7 +91,7 @@ index 000000000..118c7b677 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java new file mode 100644 -index 000000000..1915177f4 +index 0000000000000000000000000000000000000000..1915177f4b8f8013656fbdb41240f6c5c88f95d7 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java @@ -0,0 +1,61 @@ @@ -158,7 +158,7 @@ index 000000000..1915177f4 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java new file mode 100644 -index 000000000..8414bd805 +index 0000000000000000000000000000000000000000..8414bd805ec68d7b305fbf645c59f8d5b762c9ce --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java @@ -0,0 +1,61 @@ @@ -223,6 +223,3 @@ index 000000000..8414bd805 + cancelled = cancel; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch b/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch index 4ce3ad0944..7524daea92 100644 --- a/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch +++ b/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch @@ -1,4 +1,4 @@ -From ef9dc8ae78cf9fd1838a2e266c50b4c5f2c7cc34 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 03:10:50 -0500 Subject: [PATCH] PlayerLaunchProjectileEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerLaunchProjectileEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java new file mode 100644 -index 000000000..9074b2ede +index 0000000000000000000000000000000000000000..9074b2ede01f76c0560e5318246382163cc91591 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java @@ -0,0 +1,83 @@ @@ -93,6 +93,3 @@ index 000000000..9074b2ede + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch b/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch index 34fe915ec7..c5d8e5ddf3 100644 --- a/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch +++ b/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch @@ -1,4 +1,4 @@ -From cd43998087a617510cac0516b62db5f5274a0662 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:59:53 -0500 Subject: [PATCH] PlayerElytraBoostEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerElytraBoostEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java new file mode 100644 -index 000000000..e9a76a25f +index 0000000000000000000000000000000000000000..e9a76a25fa5445905a09dbc2fd5b35bff56d80b3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java @@ -0,0 +1,85 @@ @@ -95,6 +95,3 @@ index 000000000..e9a76a25f + cancelled = cancel; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0123-EntityTransformedEvent.patch b/Spigot-API-Patches/0123-EntityTransformedEvent.patch index b99aab73b2..c77c4a8ba6 100644 --- a/Spigot-API-Patches/0123-EntityTransformedEvent.patch +++ b/Spigot-API-Patches/0123-EntityTransformedEvent.patch @@ -1,4 +1,4 @@ -From 6951e644dd75d4299f00deddba74e92daafebb66 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Anthony MacAllister Date: Thu, 26 Jul 2018 15:28:53 -0400 Subject: [PATCH] EntityTransformedEvent @@ -6,7 +6,7 @@ Subject: [PATCH] EntityTransformedEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java new file mode 100644 -index 000000000..12194f1fc +index 0000000000000000000000000000000000000000..12194f1fc7f03ca6785904b6187b3dfd03b16461 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java @@ -0,0 +1,92 @@ @@ -102,6 +102,3 @@ index 000000000..12194f1fc + + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch b/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch index 6027e04e23..df832f339d 100644 --- a/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch @@ -1,11 +1,11 @@ -From 81bba63c4870342f386d6a505473878d15487067 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 15 Aug 2018 01:26:03 -0700 Subject: [PATCH] Allow disabling armour stand ticking diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index 6a854d7cf..c8c08f1f2 100644 +index 6a854d7cf68553b30e5aceca435c0bec31eb2f7c..c8c08f1f2cf875f3bab7548cebd3dd657a5bf3ec 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -308,5 +308,21 @@ public interface ArmorStand extends LivingEntity { @@ -30,6 +30,3 @@ index 6a854d7cf..c8c08f1f2 100644 + void setCanTick(final boolean tick); // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch b/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch index 238cab7886..152fb40e28 100644 --- a/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch +++ b/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch @@ -1,4 +1,4 @@ -From f51bcff92d8ae89a6a86234b508d4778a30e8b2d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 27 Jul 2018 22:36:17 -0500 Subject: [PATCH] SkeletonHorse Additions @@ -6,7 +6,7 @@ Subject: [PATCH] SkeletonHorse Additions diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java new file mode 100644 -index 000000000..d79dbcd68 +index 0000000000000000000000000000000000000000..d79dbcd689ffb8d87a197aa112fec678b576f80f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java @@ -0,0 +1,47 @@ @@ -58,7 +58,7 @@ index 000000000..d79dbcd68 +} + diff --git a/src/main/java/org/bukkit/entity/SkeletonHorse.java b/src/main/java/org/bukkit/entity/SkeletonHorse.java -index b2c6b6a86..ba9983463 100644 +index b2c6b6a8689f6bd6ce784bbe6f571f756dd700c1..ba9983463263f77db3d3487bc12f01db4508a32b 100644 --- a/src/main/java/org/bukkit/entity/SkeletonHorse.java +++ b/src/main/java/org/bukkit/entity/SkeletonHorse.java @@ -3,4 +3,12 @@ package org.bukkit.entity; @@ -75,6 +75,3 @@ index b2c6b6a86..ba9983463 100644 + void setTrap(boolean trap); + // Paper end +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch b/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch index da7cd9ba2b..9bea458013 100644 --- a/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch +++ b/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch @@ -1,4 +1,4 @@ -From af529b775e493033aad54122093c513126351a22 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 25 Jul 2018 01:36:07 -0400 Subject: [PATCH] Expand Location Manipulation API @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Location Manipulation API Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z); diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index ac3c8eef5..f87ecd0a7 100644 +index ac3c8eef58872c2de840a4b7ba7d77c2e597aee0..f87ecd0a753b0f730ee33c0dd699b7388e8c6697 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -546,6 +546,54 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -64,6 +64,3 @@ index ac3c8eef5..f87ecd0a7 100644 /** * @return A new location where X/Y/Z are on the Block location (integer value of X/Y/Z) */ --- -2.26.2 - diff --git a/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch b/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch index 35a5904ac7..4b00db4f51 100644 --- a/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch +++ b/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From cce65d9377cfd96529bc8fb770758fb9208a0650 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Thu, 26 Jul 2018 02:22:44 -0400 Subject: [PATCH] Expand ArmorStand API @@ -8,7 +8,7 @@ Add the following: - Enable/Disable slot interactions diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index c8c08f1f2..af70bac79 100644 +index c8c08f1f2cf875f3bab7548cebd3dd657a5bf3ec..af70bac7921852b58629d671fe03ad0e23be9266 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -1,6 +1,7 @@ @@ -109,6 +109,3 @@ index c8c08f1f2..af70bac79 100644 + boolean isSlotDisabled(@NotNull org.bukkit.inventory.EquipmentSlot slot); // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0128-AnvilDamageEvent.patch b/Spigot-API-Patches/0128-AnvilDamageEvent.patch index 74b506ba70..7561b6a9db 100644 --- a/Spigot-API-Patches/0128-AnvilDamageEvent.patch +++ b/Spigot-API-Patches/0128-AnvilDamageEvent.patch @@ -1,4 +1,4 @@ -From c46be2703c06acabbaa89b5a7dbcd5674a5b9664 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 20 Jul 2018 23:36:55 -0500 Subject: [PATCH] AnvilDamageEvent @@ -6,7 +6,7 @@ Subject: [PATCH] AnvilDamageEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java new file mode 100644 -index 000000000..a83c286c1 +index 0000000000000000000000000000000000000000..a83c286c1c11af25fc4d16af7a42b95ce90b9dee --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java @@ -0,0 +1,148 @@ @@ -158,6 +158,3 @@ index 000000000..a83c286c1 + } + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch index 9566752f7b..20fce849c9 100644 --- a/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch +++ b/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch @@ -1,4 +1,4 @@ -From 6e4fb0cc9482d789961ef8e386fb3fa8d6f17a4c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 00:32:05 -0400 Subject: [PATCH] Remove deadlock risk in firing async events @@ -16,7 +16,7 @@ which results in a hard crash. This change removes the synchronize and adds some protection around enable/disable diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index a8dbf282d..b4069dbf3 100644 +index a8dbf282d0a8fb57f4719b9e95199894d8d3324c..b4069dbf31587786da39f5e387a71b7bc6a5d0ae 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; @@ -29,7 +29,7 @@ index a8dbf282d..b4069dbf3 100644 * * @return a new copy of Location containing the position of this entity diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 8bb24f734..8355f9f0e 100644 +index 8bb24f734f0bbb5df37dff2f376a450b8be9be28..8355f9f0eb1b554bf6cfd3883afd2bdd2bf8c357 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -462,7 +462,7 @@ public final class SimplePluginManager implements PluginManager { @@ -97,7 +97,7 @@ index 8bb24f734..8355f9f0e 100644 RegisteredListener[] listeners = handlers.getRegisteredListeners(); diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java -index f188cd4f3..1941c9f49 100644 +index f188cd4f3b07027c30d41f1162db77a506b7b6bb..1941c9f49e9514c1236c5f4ea9f7af47f7be85c5 100644 --- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java +++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java @@ -17,7 +17,7 @@ public class PluginManagerTest { @@ -135,6 +135,3 @@ index f188cd4f3..1941c9f49 100644 @Test public void testRemovePermissionByNameLower() { --- -2.26.2 - diff --git a/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch b/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch index 86bec059c2..85c5c370f3 100644 --- a/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch +++ b/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch @@ -1,11 +1,11 @@ -From 8a987c7ba39c69da4de86656c748a60dfb163ac0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 2 Aug 2018 08:44:20 -0500 Subject: [PATCH] Add hand to bucket events diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java -index 7f225baa9..25bd8153e 100644 +index 7f225baa9fd3ff6f4f950ae70f9500141c674f66..25bd8153ef2ab7ab1052cf756bb599f1095732e7 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; @@ -34,7 +34,7 @@ index 7f225baa9..25bd8153e 100644 @NotNull @Override diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java -index 0e4fa04ea..1e0f7ee7d 100644 +index 0e4fa04ea73baaf2f9ad86725d379b569d7d6381..1e0f7ee7d198c08ce421ce105be42c4d01dc924f 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; @@ -98,7 +98,7 @@ index 0e4fa04ea..1e0f7ee7d 100644 public boolean isCancelled() { return cancelled; diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java -index 77c3a6e5c..56f1cc2d7 100644 +index 77c3a6e5c89ffde564d63b98b2d9e36c356d79fd..56f1cc2d773d2c58207ee291bac596692980a731 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; @@ -128,6 +128,3 @@ index 77c3a6e5c..56f1cc2d7 100644 @NotNull @Override public HandlerList getHandlers() { --- -2.26.2 - diff --git a/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch b/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch index 778bdbb23e..2bddc56f13 100644 --- a/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch +++ b/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch @@ -1,4 +1,4 @@ -From c3423f534450b937a1ed44e070f3c38eaa622ef9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 15 Jul 2018 22:17:55 +0300 Subject: [PATCH] Add TNTPrimeEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add TNTPrimeEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java new file mode 100644 -index 000000000..73dabb82c +index 0000000000000000000000000000000000000000..73dabb82c7fbea3f0cccade0a2944b11a80ede06 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java @@ -0,0 +1,114 @@ @@ -124,6 +124,3 @@ index 000000000..73dabb82c + REDSTONE + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch b/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch index ca6f25ac1c..7ebd3b8fdc 100644 --- a/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch +++ b/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch @@ -1,4 +1,4 @@ -From e5775c58752c8ac7bb3d6d079829a11708748f61 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 4 Aug 2018 19:37:35 -0400 Subject: [PATCH] Provide Chunk Coordinates as a Long API @@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method to look up by the long key too. diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index 95e485eea..0bbef14a9 100644 +index 95e485eea693e7648e63d198c8591d89e02e6755..0bbef14a9fc2a3ec03b4db59c8d8e1eedc0ad1c1 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -27,6 +27,32 @@ public interface Chunk { @@ -44,7 +44,7 @@ index 95e485eea..0bbef14a9 100644 * Gets the world containing this chunk * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 889756b1c..e5b76d59f 100644 +index 889756b1c8d5e413a6ebe3623e128a737f88d48c..e5b76d59fdcc85344cf3932b38ab096155d2eec3 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -207,6 +207,22 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -70,6 +70,3 @@ index 889756b1c..e5b76d59f 100644 /** * Checks if the specified {@link Chunk} is loaded * --- -2.26.2 - diff --git a/Spigot-API-Patches/0133-Async-Chunks-API.patch b/Spigot-API-Patches/0133-Async-Chunks-API.patch index 2a62945f70..67fcae0293 100644 --- a/Spigot-API-Patches/0133-Async-Chunks-API.patch +++ b/Spigot-API-Patches/0133-Async-Chunks-API.patch @@ -1,4 +1,4 @@ -From 36717a78ace022da59859e222d8acb972786fa97 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:43:33 -0600 Subject: [PATCH] Async Chunks API @@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously. Also adds utility methods to Entity to teleport asynchronously. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index e5b76d59f..62aa9bd67 100644 +index e5b76d59fdcc85344cf3932b38ab096155d2eec3..62aa9bd67cf652cc9fcd4ef2ced3bc48e120763d 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -221,6 +221,358 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -371,7 +371,7 @@ index e5b76d59f..62aa9bd67 100644 /** diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index b4069dbf3..45e0dffe6 100644 +index b4069dbf31587786da39f5e387a71b7bc6a5d0ae..45e0dffe60ce1f4d54b481b6b2cbee511659a5cc 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -155,6 +155,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @@ -405,6 +405,3 @@ index b4069dbf3..45e0dffe6 100644 /** * Returns a list of entities within a bounding box centered around this * entity --- -2.26.2 - diff --git a/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch b/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch index 313cbbc4f4..6779d66171 100644 --- a/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch +++ b/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch @@ -1,11 +1,11 @@ -From 5d5fb9f844259c06a9aa8599f52eae3bb6888847 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 10 Aug 2018 22:08:34 -0400 Subject: [PATCH] Make EnderDragon extend Mob diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java -index c14278d2c..92da609fb 100644 +index c14278d2c99deedddfd9c8afdc900760b0331546..92da609fb2bdf7c6396ba868410a40725fda05f0 100644 --- a/src/main/java/org/bukkit/entity/EnderDragon.java +++ b/src/main/java/org/bukkit/entity/EnderDragon.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable; @@ -17,6 +17,3 @@ index c14278d2c..92da609fb 100644 /** * Represents a phase or action that an Ender Dragon can perform. --- -2.26.2 - diff --git a/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch index dfe5ba6b13..51eec85e98 100644 --- a/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -1,11 +1,11 @@ -From f7c4241e30ac69f9ea8daa093e1dc8000ceb9eb3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:04:58 -0400 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index 0bbef14a9..11b691cf5 100644 +index 0bbef14a9fc2a3ec03b4db59c8d8e1eedc0ad1c1..11b691cf59b4a72493c91055fd8c46d7681b4527 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -102,13 +102,26 @@ public interface Chunk { @@ -36,6 +36,3 @@ index 0bbef14a9..11b691cf5 100644 /** * Checks if the chunk is loaded. --- -2.26.2 - diff --git a/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch index 565a700d6b..536fdc2d06 100644 --- a/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch +++ b/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch @@ -1,11 +1,11 @@ -From a98a64b6802dbc204e71451a2815277454118c16 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:19:37 -0400 Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java -index ddaed8127..203cda0f9 100644 +index ddaed81275fcc12d1671b668697acf318e96888b..203cda0f9a4dea4f28a21ea9ee8db7a7369842e3 100644 --- a/src/main/java/co/aikar/timings/TimingHistory.java +++ b/src/main/java/co/aikar/timings/TimingHistory.java @@ -119,7 +119,7 @@ public class TimingHistory { @@ -17,6 +17,3 @@ index ddaed8127..203cda0f9 100644 if (tileEntity == null) { Bukkit.getLogger().warning("Null tileentity detected in chunk at position x: " + chunk.getX() + ", z: " + chunk.getZ()); continue; --- -2.26.2 - diff --git a/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch index 041741151a..40ed85da9b 100644 --- a/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch +++ b/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch @@ -1,4 +1,4 @@ -From 0c951dc5e7f250bd4b5e57731eb714b1a83634ef Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Aug 2018 21:42:10 -0700 Subject: [PATCH] Allow Blocks to be accessed via a long key @@ -18,7 +18,7 @@ Y range: [0, 1023] X, Z range: [-67 108 864, 67 108 863] diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index f87ecd0a7..07e532cde 100644 +index f87ecd0a753b0f730ee33c0dd699b7388e8c6697..07e532cde37255ffb2db368453bb69ee0a410931 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -15,7 +15,6 @@ import org.jetbrains.annotations.Nullable; @@ -48,7 +48,7 @@ index f87ecd0a7..07e532cde 100644 * @return A new location where X/Y/Z are the center of the block */ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 62aa9bd67..64308c1f0 100644 +index 62aa9bd67cf652cc9fcd4ef2ced3bc48e120763d..64308c1f05747c2320ae5dc86f602c3d93e9d855 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -90,6 +90,38 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -91,7 +91,7 @@ index 62aa9bd67..64308c1f0 100644 * Gets the highest non-empty (impassable) coordinate at the given * coordinates. diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 8154093df..41f6b8491 100644 +index 8154093df6f6d4180485cecf98da3af26219eab8..41f6b849186346f9a4e254122d2448a7ea8e0ee9 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -153,6 +153,72 @@ public interface Block extends Metadatable { @@ -167,6 +167,3 @@ index 8154093df..41f6b8491 100644 /** * Gets the Location of the block * --- -2.26.2 - diff --git a/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch b/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch index 65f8472c26..8d27bd1b14 100644 --- a/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch +++ b/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch @@ -1,4 +1,4 @@ -From 98f7e098cc39d66307ca7a4fd13377df75c29229 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 08:18:27 -0500 Subject: [PATCH] Slime Pathfinder Events @@ -6,7 +6,7 @@ Subject: [PATCH] Slime Pathfinder Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java new file mode 100644 -index 000000000..2638bbd3e +index 0000000000000000000000000000000000000000..2638bbd3e1392b3d8640be58163f6eb2789dee4a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java @@ -0,0 +1,38 @@ @@ -50,7 +50,7 @@ index 000000000..2638bbd3e +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java new file mode 100644 -index 000000000..14b67da10 +index 0000000000000000000000000000000000000000..14b67da109321ae6521eab2ac6f6945f05d02db5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java @@ -0,0 +1,53 @@ @@ -109,7 +109,7 @@ index 000000000..14b67da10 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java new file mode 100644 -index 000000000..c8dd49d11 +index 0000000000000000000000000000000000000000..c8dd49d11da5a90a1bac965a75f2b65fd825f3f7 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java @@ -0,0 +1,17 @@ @@ -132,7 +132,7 @@ index 000000000..c8dd49d11 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java new file mode 100644 -index 000000000..e9ba32799 +index 0000000000000000000000000000000000000000..e9ba32799ed838779e49cd4c5011b7515b3363cb --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java @@ -0,0 +1,31 @@ @@ -169,7 +169,7 @@ index 000000000..e9ba32799 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java new file mode 100644 -index 000000000..4683a7237 +index 0000000000000000000000000000000000000000..4683a7237d2ed527fc85b9b4e5b2eaaf5ae3d797 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java @@ -0,0 +1,17 @@ @@ -191,7 +191,7 @@ index 000000000..4683a7237 + } +} diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java -index 1119e26e2..c4791f95d 100644 +index 1119e26e270bb45f517955b19d95a9ec3d113634..c4791f95d788d3a9e013dc89d8e64103ad8480a1 100644 --- a/src/main/java/org/bukkit/entity/Slime.java +++ b/src/main/java/org/bukkit/entity/Slime.java @@ -14,4 +14,20 @@ public interface Slime extends Mob { @@ -215,6 +215,3 @@ index 1119e26e2..c4791f95d 100644 + public void setWander(boolean canWander); + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0139-isChunkGenerated-API.patch b/Spigot-API-Patches/0139-isChunkGenerated-API.patch index 19882a76a9..163bd95b5f 100644 --- a/Spigot-API-Patches/0139-isChunkGenerated-API.patch +++ b/Spigot-API-Patches/0139-isChunkGenerated-API.patch @@ -1,11 +1,11 @@ -From 8f5e0cccb4a48b21d0d4bcf4e87474ddcfc9615b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 19:39:46 -0700 Subject: [PATCH] isChunkGenerated API diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 07e532cde..6e1a1124a 100644 +index 07e532cde37255ffb2db368453bb69ee0a410931..6e1a1124a6e528c1a94ccb1d09bc5dccf056b0b8 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -3,6 +3,7 @@ package org.bukkit; @@ -34,7 +34,7 @@ index 07e532cde..6e1a1124a 100644 /** * Sets the position of this Location and returns itself diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 64308c1f0..b7ad4f566 100644 +index 64308c1f05747c2320ae5dc86f602c3d93e9d855..b7ad4f566497914573ccfb595e660226dd34c273 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -254,6 +254,17 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -55,6 +55,3 @@ index 64308c1f0..b7ad4f566 100644 /** * This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided, * as well as future support --- -2.26.2 - diff --git a/Spigot-API-Patches/0140-Add-More-Creeper-API.patch b/Spigot-API-Patches/0140-Add-More-Creeper-API.patch index 863de13eac..798ccff07b 100644 --- a/Spigot-API-Patches/0140-Add-More-Creeper-API.patch +++ b/Spigot-API-Patches/0140-Add-More-Creeper-API.patch @@ -1,4 +1,4 @@ -From ef8376f5dd7ea665773c7dea55b6878db985d791 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 11:50:16 -0500 Subject: [PATCH] Add More Creeper API @@ -6,7 +6,7 @@ Subject: [PATCH] Add More Creeper API diff --git a/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java new file mode 100644 -index 000000000..ff10251b6 +index 0000000000000000000000000000000000000000..ff10251b6ded533b08048ec533525176eff03707 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java @@ -0,0 +1,54 @@ @@ -65,7 +65,7 @@ index 000000000..ff10251b6 + } +} diff --git a/src/main/java/org/bukkit/entity/Creeper.java b/src/main/java/org/bukkit/entity/Creeper.java -index 1b8ece6df..faaeb44a9 100644 +index 1b8ece6dfd64c4913dc997fe7ad2fc01975af8c7..faaeb44a99f26dfd1465f0021c75d4c349beaa3e 100644 --- a/src/main/java/org/bukkit/entity/Creeper.java +++ b/src/main/java/org/bukkit/entity/Creeper.java @@ -71,4 +71,27 @@ public interface Creeper extends Monster { @@ -96,6 +96,3 @@ index 1b8ece6df..faaeb44a9 100644 + public int getFuseTicks(); + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch b/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch index 65ae192ab7..5ffdc818cb 100644 --- a/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch @@ -1,4 +1,4 @@ -From 1f4f38a8c690ff17d12462ffe4661419db8d45b8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 25 Aug 2018 19:56:42 -0500 Subject: [PATCH] Add PhantomPreSpawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PhantomPreSpawnEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java new file mode 100644 -index 000000000..9022f697a +index 0000000000000000000000000000000000000000..9022f697ab244df43074e48c9150f39d44217531 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java @@ -0,0 +1,31 @@ @@ -42,7 +42,7 @@ index 000000000..9022f697a + } +} diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java -index 1a1044edc..ed4d417c2 100644 +index 1a1044edc57078f96c4a95c994d0865da382c152..ed4d417c2deefb78807cb61b01df5afcd334d754 100644 --- a/src/main/java/org/bukkit/entity/Phantom.java +++ b/src/main/java/org/bukkit/entity/Phantom.java @@ -1,5 +1,8 @@ @@ -69,6 +69,3 @@ index 1a1044edc..ed4d417c2 100644 + public java.util.UUID getSpawningEntity(); + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch index 699b7fe899..965de7c24a 100644 --- a/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch +++ b/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch @@ -1,11 +1,11 @@ -From 12cdf023a2742dcd89389af019fbcda32bbcc017 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sotr Date: Thu, 23 Aug 2018 16:14:25 +0800 Subject: [PATCH] Add source block to BlockPhysicsEvent diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java -index e3a5f5824..c382f9fc2 100644 +index e3a5f5824ed882058f5bac5003f66ce79733a868..c382f9fc2b8c5b959df7071007110dab737e400e 100644 --- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java @@ -32,6 +32,13 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable { @@ -22,6 +22,3 @@ index e3a5f5824..c382f9fc2 100644 public BlockPhysicsEvent(@NotNull final Block block, @NotNull final BlockData changed) { this(block, changed, block); } --- -2.26.2 - diff --git a/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch b/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch index 366e22dc60..a743710250 100644 --- a/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch +++ b/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch @@ -1,11 +1,11 @@ -From ed0362a4aef4fd5078ae307ae0ed1b25f8021577 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 28 Aug 2018 23:04:06 -0400 Subject: [PATCH] Inventory#removeItemAnySlot diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java -index 5a38d8f13..01fe217df 100644 +index 5a38d8f13b5ee38f9d1ec01ce10b2666f5883e37..01fe217dfa93c20bdec53eb981bd6e885a9f7a25 100644 --- a/src/main/java/org/bukkit/inventory/Inventory.java +++ b/src/main/java/org/bukkit/inventory/Inventory.java @@ -125,6 +125,34 @@ public interface Inventory extends Iterable { @@ -43,6 +43,3 @@ index 5a38d8f13..01fe217df 100644 /** * Returns all ItemStacks from the inventory * --- -2.26.2 - diff --git a/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch index 497bd3166a..1ff60e35ce 100644 --- a/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch @@ -1,4 +1,4 @@ -From e92576141196eb20f116f3d5fff26f2eb737a9c5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 3 Sep 2018 18:13:53 -0500 Subject: [PATCH] Add ray tracing methods to LivingEntity @@ -6,7 +6,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java new file mode 100644 -index 000000000..18a96dbb0 +index 0000000000000000000000000000000000000000..18a96dbb01d3b34476652264b2d6be3782a154ec --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java @@ -0,0 +1,54 @@ @@ -65,7 +65,7 @@ index 000000000..18a96dbb0 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 4af8e680d..5e9ca6f3d 100644 +index 4af8e680dbcd3e0bc1ed692146b72fecbf7735ba..5e9ca6f3d5aac2d119808eb03cfc00367306f5e4 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -81,6 +81,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -146,6 +146,3 @@ index 4af8e680d..5e9ca6f3d 100644 /** * Gets the last two blocks along the living entity's line of sight. *

--- -2.26.2 - diff --git a/Spigot-API-Patches/0145-Improve-death-events.patch b/Spigot-API-Patches/0145-Improve-death-events.patch index c32960aee1..f42921460c 100644 --- a/Spigot-API-Patches/0145-Improve-death-events.patch +++ b/Spigot-API-Patches/0145-Improve-death-events.patch @@ -1,4 +1,4 @@ -From a3424f4e649c8b2c866e08367d1bd423deda90d1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:32:28 +0100 Subject: [PATCH] Improve death events @@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using internal code. diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java -index a5984ab06..e19a3df9a 100644 +index a5984ab06cce95d30e70511e125f69339b574c04..e19a3df9aa2204b44c0b029bda141ae6306f60a1 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java @@ -5,14 +5,24 @@ import org.bukkit.entity.LivingEntity; @@ -179,6 +179,3 @@ index a5984ab06..e19a3df9a 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch b/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch index f2867624a6..6a2e4fdc51 100644 --- a/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch +++ b/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From 3918a41aea8da6963873adfc9219b07265a7c0a6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 12:39:06 -0400 Subject: [PATCH] Mob Pathfinding API @@ -13,7 +13,7 @@ You can use EntityPathfindEvent to cancel new pathfinds from overriding your cur diff --git a/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java new file mode 100644 -index 000000000..8b90a9053 +index 0000000000000000000000000000000000000000..8b90a9053f4e3165ef7541a36938929967989696 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java @@ -0,0 +1,170 @@ @@ -188,7 +188,7 @@ index 000000000..8b90a9053 + } +} diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index be9334a8b..b13228781 100644 +index be9334a8b5fba9181ad63c211697e798be63da25..b132287817d35579ca5128a1ed5c242bf229771a 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java @@ -1,6 +1,7 @@ @@ -215,6 +215,3 @@ index be9334a8b..b13228781 100644 /** * Instructs this Mob to set the specified LivingEntity as its target. *

--- -2.26.2 - diff --git a/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch index 5d4107d2de..3a0c136f2e 100644 --- a/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch @@ -1,11 +1,11 @@ -From 4544bc81906853de4bea0111e8bb6e633eac83d5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 4 Sep 2018 15:01:54 -0500 Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index c37d7fca0..3600b4c84 100644 +index c37d7fca014fb0f325574a33ef4ccba67db7fe49..3600b4c84058713616a6448c1175a7d1ba74fd7b 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1703,6 +1703,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -35,6 +35,3 @@ index c37d7fca0..3600b4c84 100644 // Paper end // Spigot start --- -2.26.2 - diff --git a/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch index 41aecbe671..2c8629f59b 100644 --- a/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch +++ b/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch @@ -1,4 +1,4 @@ -From 0fc7e321f3796ad0dabeed59fce6ceb0f778a306 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 12 Sep 2018 18:53:35 +0300 Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values @@ -6,7 +6,7 @@ Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values diff --git a/src/main/java/com/destroystokyo/paper/Namespaced.java b/src/main/java/com/destroystokyo/paper/Namespaced.java new file mode 100644 -index 000000000..cd1a34b82 +index 0000000000000000000000000000000000000000..cd1a34b82870684e09e18c47169bd472ecbbb91f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/Namespaced.java @@ -0,0 +1,40 @@ @@ -52,7 +52,7 @@ index 000000000..cd1a34b82 +} diff --git a/src/main/java/com/destroystokyo/paper/NamespacedTag.java b/src/main/java/com/destroystokyo/paper/NamespacedTag.java new file mode 100644 -index 000000000..28f3fda95 +index 0000000000000000000000000000000000000000..28f3fda950999a9c964a3608042ca60567ae1d6a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/NamespacedTag.java @@ -0,0 +1,142 @@ @@ -199,7 +199,7 @@ index 000000000..28f3fda95 + } +} diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java -index 22eca2a18..620a962df 100644 +index 22eca2a180618ed43a4ef103bebd134897d6c71a..620a962df6d871c7a3b7728030a05ade772135c2 100644 --- a/src/main/java/org/bukkit/NamespacedKey.java +++ b/src/main/java/org/bukkit/NamespacedKey.java @@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull; @@ -226,7 +226,7 @@ index 22eca2a18..620a962df 100644 return key; } diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index f2e9f2753..7e0b1d363 100644 +index f2e9f2753ec92aa4a3e3f06ca6053bd70b9091d7..7e0b1d363829031075b6822d7b35ccde9fc05da9 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -388,4 +388,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste @@ -317,6 +317,3 @@ index f2e9f2753..7e0b1d363 100644 + boolean hasDestroyableKeys(); + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch b/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch index 0523aeadef..4d64579e4a 100644 --- a/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch +++ b/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch @@ -1,4 +1,4 @@ -From e58674a97861595d28d7da7ac2aa982037fb69e4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 13 Sep 2018 20:51:50 -0400 Subject: [PATCH] Performance & Concurrency Improvements to Permissions @@ -18,7 +18,7 @@ Optimized it to simply be a single get call cutting permission map lookups in half. diff --git a/src/main/java/org/bukkit/permissions/PermissibleBase.java b/src/main/java/org/bukkit/permissions/PermissibleBase.java -index 497775f7f..c94e4cdb5 100644 +index 497775f7f8fa2eae34555ca0f0c6ba72d6cfab3f..c94e4cdb5785d5dfcb704c4adabda0b19a20ec7d 100644 --- a/src/main/java/org/bukkit/permissions/PermissibleBase.java +++ b/src/main/java/org/bukkit/permissions/PermissibleBase.java @@ -75,8 +75,11 @@ public class PermissibleBase implements Permissible { @@ -111,6 +111,3 @@ index 497775f7f..c94e4cdb5 100644 return new HashSet(permissions.values()); } --- -2.26.2 - diff --git a/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch b/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch index aa4f9aaa46..1a4eca8cc0 100644 --- a/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch +++ b/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch @@ -1,4 +1,4 @@ -From 6c31e06baa1fd1383189f4bc8a52e504ee19373b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 13 Sep 2018 21:39:26 -0400 Subject: [PATCH] Add ItemStackRecipeChoice Draft API @@ -9,7 +9,7 @@ Allows creating recipes that must match isSimilar to full item stack. diff --git a/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java new file mode 100644 -index 000000000..43e6576b1 +index 0000000000000000000000000000000000000000..43e6576b1d1bb811f9feb22de0024d9c823cb21a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java @@ -0,0 +1,51 @@ @@ -64,6 +64,3 @@ index 000000000..43e6576b1 + return false; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch index 36130bb862..cb4250b87c 100644 --- a/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch +++ b/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch @@ -1,4 +1,4 @@ -From 5071423004b2098afa9ca8985acb99c4a0202ff0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tassu Date: Thu, 13 Sep 2018 08:45:01 +0300 Subject: [PATCH] Implement furnace cook speed multiplier API @@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API Signed-off-by: Tassu diff --git a/src/main/java/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java -index c5a8c96fa..9063cf370 100644 +index c5a8c96fa2204d6b4d2409b1bfc97697d39d964e..9063cf370a0fe66c2a27086e125f9111b77366ae 100644 --- a/src/main/java/org/bukkit/block/Furnace.java +++ b/src/main/java/org/bukkit/block/Furnace.java @@ -61,6 +61,26 @@ public interface Furnace extends Container { @@ -36,6 +36,3 @@ index c5a8c96fa..9063cf370 100644 @NotNull @Override public FurnaceInventory getInventory(); --- -2.26.2 - diff --git a/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch index 0b04b53e2a..70ec0d47bd 100644 --- a/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch +++ b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 40a49656a4e036c386db9681efd960a27aedf0b7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 18 Sep 2018 23:50:10 +0100 Subject: [PATCH] PreSpawnerSpawnEvent @@ -10,7 +10,7 @@ spawners. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java new file mode 100644 -index 000000000..48cff0635 +index 0000000000000000000000000000000000000000..48cff063594840a07aeaf35513780e28ea019a76 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java @@ -0,0 +1,29 @@ @@ -43,6 +43,3 @@ index 000000000..48cff0635 + return spawnerLocation; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch b/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch index a67cbcfc7d..3c3873253c 100644 --- a/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch +++ b/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch @@ -1,4 +1,4 @@ -From fdee18aff4e9d98ff3663693cafbe5f8c362dc73 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 22 Sep 2018 18:41:01 -0400 Subject: [PATCH] Remove Precondition on name for AttributeModifier @@ -6,7 +6,7 @@ Subject: [PATCH] Remove Precondition on name for AttributeModifier Vanilla allows empty names diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java -index a97631474..f0dff145a 100644 +index a97631474545bb51dfcbc769401f4f1ffede580d..f0dff145a8c5ae729de5e5f547fff60333c6501e 100644 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java @@ -32,10 +32,10 @@ public class AttributeModifier implements ConfigurationSerializable { @@ -22,6 +22,3 @@ index a97631474..f0dff145a 100644 this.amount = amount; this.operation = operation; this.slot = slot; --- -2.26.2 - diff --git a/Spigot-API-Patches/0154-Material-API-additions.patch b/Spigot-API-Patches/0154-Material-API-additions.patch index 47b8505bd2..57e9e13c77 100644 --- a/Spigot-API-Patches/0154-Material-API-additions.patch +++ b/Spigot-API-Patches/0154-Material-API-additions.patch @@ -1,11 +1,11 @@ -From 4f5eb0e50f2fe421f3b703457b11f30f9476441f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 6 Oct 2018 21:14:29 -0400 Subject: [PATCH] Material API additions diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index f28da6efd..1f2dbd68c 100644 +index f28da6efd05cc1e0da25bebde82820907924f8de..1f2dbd68c5cdee65a1b51a163502c310f5ed6d80 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -82,6 +82,7 @@ import org.jetbrains.annotations.Nullable; @@ -39,6 +39,3 @@ index f28da6efd..1f2dbd68c 100644 /** * Do not use for any reason. * --- -2.26.2 - diff --git a/Spigot-API-Patches/0155-Add-Material-Tags.patch b/Spigot-API-Patches/0155-Add-Material-Tags.patch index 89c763b9e0..4ead203791 100644 --- a/Spigot-API-Patches/0155-Add-Material-Tags.patch +++ b/Spigot-API-Patches/0155-Add-Material-Tags.patch @@ -1,4 +1,4 @@ -From e9fc066ffcf858dd831b294140e8a8277fb7c952 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 17 Jul 2018 01:27:15 -0400 Subject: [PATCH] Add Material Tags @@ -8,7 +8,7 @@ are related to each other by a trait. diff --git a/src/main/java/com/destroystokyo/paper/MaterialSetTag.java b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java new file mode 100644 -index 000000000..c91ea2a06 +index 0000000000000000000000000000000000000000..c91ea2a0679a7f3a5627b5a008e0b39df3332889 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java @@ -0,0 +1,190 @@ @@ -204,7 +204,7 @@ index 000000000..c91ea2a06 +} diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java new file mode 100644 -index 000000000..88556fdb6 +index 0000000000000000000000000000000000000000..88556fdb6fa8f21355c49a77d5f4638216fbf156 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java @@ -0,0 +1,374 @@ @@ -584,7 +584,7 @@ index 000000000..88556fdb6 +} diff --git a/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java new file mode 100644 -index 000000000..328c51471 +index 0000000000000000000000000000000000000000..328c51471dc12e81c1a1b643455337b3fef4d14a --- /dev/null +++ b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java @@ -0,0 +1,25 @@ @@ -614,7 +614,7 @@ index 000000000..328c51471 + } +} diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java -index 61993528e..5f9d34824 100644 +index 61993528e6975c38d82213e9b5caf996fe777328..5f9d348241210689eaf41a39ace5948e7a237b12 100644 --- a/src/test/java/org/bukkit/TestServer.java +++ b/src/test/java/org/bukkit/TestServer.java @@ -29,6 +29,16 @@ public final class TestServer implements InvocationHandler { @@ -634,6 +634,3 @@ index 61993528e..5f9d34824 100644 methodMap.put( Server.class.getMethod("getPluginManager"), new MethodHandler() { --- -2.26.2 - diff --git a/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch b/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch index c5d033f397..68b33503be 100644 --- a/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch @@ -1,11 +1,11 @@ -From 5a7bb765eae8bfe4c0cb221d8e555aa966df7cec Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 21:47:09 -0500 Subject: [PATCH] Allow setting the vex's summoner diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java -index 6b61c4ab7..c34a3ea7b 100644 +index 6b61c4ab773c731fe5ae9577fd13e44707be9787..c34a3ea7b4d16817b4bee25d5c69787e22ec44d8 100644 --- a/src/main/java/org/bukkit/entity/Vex.java +++ b/src/main/java/org/bukkit/entity/Vex.java @@ -1,5 +1,7 @@ @@ -38,6 +38,3 @@ index 6b61c4ab7..c34a3ea7b 100644 + void setSummoner(@Nullable Mob summoner); + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch index c052d595f8..1e8991f57c 100644 --- a/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch @@ -1,4 +1,4 @@ -From 3f5857591b97ffaece41cc319cc130cb015f8ef1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:32:53 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity @@ -6,7 +6,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java new file mode 100644 -index 000000000..f52644fab +index 0000000000000000000000000000000000000000..f52644fab1522bdf83ff4f489e9805b274421094 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java @@ -0,0 +1,38 @@ @@ -49,7 +49,7 @@ index 000000000..f52644fab + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 5e9ca6f3d..deab50525 100644 +index 5e9ca6f3d5aac2d119808eb03cfc00367306f5e4..deab505250145e795ef14537c5d453c1703f80aa 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -150,6 +150,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -103,6 +103,3 @@ index 5e9ca6f3d..deab50525 100644 // Paper end /** --- -2.26.2 - diff --git a/Spigot-API-Patches/0158-Add-sun-related-API.patch b/Spigot-API-Patches/0158-Add-sun-related-API.patch index 8fbbf8da1d..d81cff7e9f 100644 --- a/Spigot-API-Patches/0158-Add-sun-related-API.patch +++ b/Spigot-API-Patches/0158-Add-sun-related-API.patch @@ -1,11 +1,11 @@ -From 7bfc23854585ea3d9b0281708668e638eb17f2a3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:15 -0500 Subject: [PATCH] Add sun related API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index b7ad4f566..c88f17244 100644 +index b7ad4f566497914573ccfb595e660226dd34c273..c88f17244617b75e251811595ffc189dc81e12fb 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1646,6 +1646,16 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -26,7 +26,7 @@ index b7ad4f566..c88f17244 100644 * Returns whether the world has an ongoing storm. * diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index b13228781..d726453c0 100644 +index b132287817d35579ca5128a1ed5c242bf229771a..d726453c041a980576312b6bee96a07837f37974 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java @@ -16,6 +16,13 @@ public interface Mob extends LivingEntity, Lootable { @@ -43,6 +43,3 @@ index b13228781..d726453c0 100644 // Paper end /** --- -2.26.2 - diff --git a/Spigot-API-Patches/0159-Here-s-Johnny.patch b/Spigot-API-Patches/0159-Here-s-Johnny.patch index 15a84bd9cf..faaadfb5db 100644 --- a/Spigot-API-Patches/0159-Here-s-Johnny.patch +++ b/Spigot-API-Patches/0159-Here-s-Johnny.patch @@ -1,11 +1,11 @@ -From 18dd50c26084dbf8b114d018adc5d9104dc96153 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 01:37:16 -0500 Subject: [PATCH] Here's Johnny! diff --git a/src/main/java/org/bukkit/entity/Vindicator.java b/src/main/java/org/bukkit/entity/Vindicator.java -index b8ea68a8f..c5d9e76a6 100644 +index b8ea68a8f420c1ba99c0621a15e654d3ee48c8d6..c5d9e76a6a4125eb0409967a57e3836b8f2d24a0 100644 --- a/src/main/java/org/bukkit/entity/Vindicator.java +++ b/src/main/java/org/bukkit/entity/Vindicator.java @@ -3,4 +3,30 @@ package org.bukkit.entity; @@ -40,6 +40,3 @@ index b8ea68a8f..c5d9e76a6 100644 + void setJohnny(boolean johnny); + // Paper end +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0160-Turtle-API.patch b/Spigot-API-Patches/0160-Turtle-API.patch index 4d04c46219..06abb703f4 100644 --- a/Spigot-API-Patches/0160-Turtle-API.patch +++ b/Spigot-API-Patches/0160-Turtle-API.patch @@ -1,4 +1,4 @@ -From dbd9830e09e09d62ea1cd51af8396cf2fcaa21db Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 28 Sep 2018 17:08:09 -0500 Subject: [PATCH] Turtle API @@ -6,7 +6,7 @@ Subject: [PATCH] Turtle API diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java new file mode 100644 -index 000000000..021356d15 +index 0000000000000000000000000000000000000000..021356d151ed638068e3e89b8cc77b3795883233 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java @@ -0,0 +1,49 @@ @@ -61,7 +61,7 @@ index 000000000..021356d15 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java new file mode 100644 -index 000000000..a315c5185 +index 0000000000000000000000000000000000000000..a315c5185cd465dcf63c0ababef195da76dfc786 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java @@ -0,0 +1,87 @@ @@ -154,7 +154,7 @@ index 000000000..a315c5185 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java new file mode 100644 -index 000000000..abeb24fcc +index 0000000000000000000000000000000000000000..abeb24fccda2acfdb0dfdadacb8fe688bd97cf78 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java @@ -0,0 +1,62 @@ @@ -221,7 +221,7 @@ index 000000000..abeb24fcc + } +} diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java -index 0a4cd2993..5375ea140 100644 +index 0a4cd29930c2f1c28f5a3e6884c7dec45b5cac11..5375ea14097f4f10b2294488b92924a35a72d4d7 100644 --- a/src/main/java/org/bukkit/entity/Turtle.java +++ b/src/main/java/org/bukkit/entity/Turtle.java @@ -1,6 +1,55 @@ @@ -281,6 +281,3 @@ index 0a4cd2993..5375ea140 100644 + void setHasEgg(boolean hasEgg); + // Paper end +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch index 8c9aa91b49..c96f137502 100644 --- a/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From f0f27645b1c2040ec5979ea93a1fc41f24bbee2e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 20:54:13 -0500 Subject: [PATCH] Implement getters and setters for EntityItem owner and @@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java -index cb9e9f369..a15f70ff4 100644 +index cb9e9f369e041cd9e5835cac7909db482295083c..a15f70ff4ef74e9e14fcc03850c477557b15285c 100644 --- a/src/main/java/org/bukkit/entity/Item.java +++ b/src/main/java/org/bukkit/entity/Item.java @@ -4,6 +4,10 @@ import org.bukkit.inventory.ItemStack; @@ -56,6 +56,3 @@ index cb9e9f369..a15f70ff4 100644 + public void setThrower(@Nullable UUID thrower); // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0162-Add-spectator-target-events.patch b/Spigot-API-Patches/0162-Add-spectator-target-events.patch index 312ff5252d..c5d4b7c4db 100644 --- a/Spigot-API-Patches/0162-Add-spectator-target-events.patch +++ b/Spigot-API-Patches/0162-Add-spectator-target-events.patch @@ -1,4 +1,4 @@ -From 0ac2bfd09b014ae5b3e37bb9b9a5a6beb43355e4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:30:56 -0500 Subject: [PATCH] Add spectator target events @@ -8,7 +8,7 @@ Subject: [PATCH] Add spectator target events diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java new file mode 100644 -index 000000000..b8ec7ef2d +index 0000000000000000000000000000000000000000..b8ec7ef2d4ef0683cc0d6ca86885dd9a01f47e16 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java @@ -0,0 +1,67 @@ @@ -81,7 +81,7 @@ index 000000000..b8ec7ef2d + diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java new file mode 100644 -index 000000000..693d119ab +index 0000000000000000000000000000000000000000..693d119ab920a1bd0d1b5a0feb092631715ec0ad --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java @@ -0,0 +1,54 @@ @@ -139,6 +139,3 @@ index 000000000..693d119ab + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0163-Add-more-Witch-API.patch b/Spigot-API-Patches/0163-Add-more-Witch-API.patch index 5b82040f1a..10ae141b6d 100644 --- a/Spigot-API-Patches/0163-Add-more-Witch-API.patch +++ b/Spigot-API-Patches/0163-Add-more-Witch-API.patch @@ -1,11 +1,11 @@ -From c9407327b961255a69a6c04d8771709091f81bc9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 03:47:26 -0500 Subject: [PATCH] Add more Witch API diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java -index aa88aede6..cd8d0a20e 100644 +index aa88aede6c4e66a608a63d07bc66d60357b0bee9..cd8d0a20e52ad35f659175e0d24a1dc0e92023b9 100644 --- a/src/main/java/org/bukkit/entity/Witch.java +++ b/src/main/java/org/bukkit/entity/Witch.java @@ -2,8 +2,43 @@ package org.bukkit.entity; @@ -52,6 +52,3 @@ index aa88aede6..cd8d0a20e 100644 + void setDrinkingPotion(@Nullable ItemStack potion); + // Paper end } --- -2.26.2 - 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 f9de24ffaf..07a9decd26 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,11 +1,11 @@ -From b301fb49d5cfc62a1755b694ca2c349c3eab1fa9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 f5fac807c..e83f0852d 100644 +index f5fac807cce22819cba5878a6e2664f0f82f1ae3..e83f0852d187524a0068a81875323b01e3fd5cbd 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1615,6 +1615,15 @@ public final class Bukkit { @@ -25,7 +25,7 @@ index f5fac807c..e83f0852d 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 11fffc514..fa855cace 100644 +index 11fffc514ed1f0b00b09c0cdb5272ea79340972c..fa855cacec894a0efb254e8a9729a9787464f17d 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1414,6 +1414,13 @@ public interface Server extends PluginMessageRecipient { @@ -43,7 +43,7 @@ index 11fffc514..fa855cace 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/command/Command.java b/src/main/java/org/bukkit/command/Command.java -index 03bdc1622..0b0d1bd7c 100644 +index 03bdc1622791e1206406c87065978688d602e39e..0b0d1bd7c4d5ca5241561211e86a9d1acf1893d2 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java @@ -185,7 +185,7 @@ public abstract class Command { @@ -55,6 +55,3 @@ index 03bdc1622..0b0d1bd7c 100644 } else if (permissionMessage.length() != 0) { for (String line : permissionMessage.replace("", permission).split("\n")) { target.sendMessage(line); --- -2.26.2 - diff --git a/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch b/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch index 64f1fc903c..a36772974a 100644 --- a/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch +++ b/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch @@ -1,4 +1,4 @@ -From cd074864d450da544dd3b172fd8dbd9a4e2749c1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 15:53:43 +0000 Subject: [PATCH] Support cancellation supression of EntityDismount/VehicleExit @@ -21,7 +21,7 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java -index 963b9ead4..a976c32de 100644 +index 963b9ead4ca0426b2e95c5641b0e89317c48853d..a976c32de6ad5e90b0a96a0f387136ab0f5eb52e 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java @@ -13,10 +13,18 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable { @@ -64,7 +64,7 @@ index 963b9ead4..a976c32de 100644 @Override public HandlerList getHandlers() { diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java -index 00d8ec81b..a7632c8f5 100644 +index 00d8ec81b4ae6ca5e438161ec9135e3c1edea6f4..a7632c8f5cb1bce4be0e456ec34f4a69c5ce80f3 100644 --- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java +++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java @@ -14,10 +14,19 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable { @@ -107,6 +107,3 @@ index 00d8ec81b..a7632c8f5 100644 @NotNull @Override public HandlerList getHandlers() { --- -2.26.2 - diff --git a/Spigot-API-Patches/0166-Add-more-Zombie-API.patch b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch index ae371639c3..a2abe72e3e 100644 --- a/Spigot-API-Patches/0166-Add-more-Zombie-API.patch +++ b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch @@ -1,11 +1,11 @@ -From 19f9dc15496d1efa08279e3a7ae100473028ee30 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 04:29:51 -0500 Subject: [PATCH] Add more Zombie API diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java -index 6dcac9798..fa7a43c35 100644 +index 6dcac979820b1460e8693b6a330876bc1ffdfffc..fa7a43c3517af455d197308d2e952ea40622349c 100644 --- a/src/main/java/org/bukkit/entity/Zombie.java +++ b/src/main/java/org/bukkit/entity/Zombie.java @@ -86,4 +86,55 @@ public interface Zombie extends Monster { @@ -64,6 +64,3 @@ index 6dcac9798..fa7a43c35 100644 + void setShouldBurnInDay(boolean shouldBurnInDay); + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch b/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch index db6bcec2e6..fa3de62864 100644 --- a/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch +++ b/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch @@ -1,11 +1,11 @@ -From f54f0db8e7169371fbab9d7166eea9c2d43c18ce Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com> Date: Tue, 23 Oct 2018 19:32:55 +0300 Subject: [PATCH] Change the reserved channel check to be sensible diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java -index 1d061412c..6fda7f3aa 100644 +index 1d061412cdafa28c6940c7433747ab1dabe23de1..6fda7f3aa68e76af64362e9afed70fc6a5e92986 100644 --- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java +++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java @@ -172,7 +172,7 @@ public class StandardMessenger implements Messenger { @@ -18,7 +18,7 @@ index 1d061412c..6fda7f3aa 100644 @Override diff --git a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java -index dce3d619a..7e2335ed8 100644 +index dce3d619a6f1791197e44277c2dee9eaf19ff56f..7e2335ed8acc692af1e70eddcf97ee7a56e30f68 100644 --- a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java +++ b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java @@ -25,8 +25,8 @@ public class StandardMessengerTest { @@ -32,6 +32,3 @@ index dce3d619a..7e2335ed8 100644 assertFalse(messenger.isReservedChannel("minecraft:brand")); } --- -2.26.2 - diff --git a/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch index 2f24c6d33f..f1a017f4fb 100644 --- a/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From f23d593720d88ce6108987504ed7b569e0fb8277 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 7 Oct 2018 12:05:06 -0700 Subject: [PATCH] Add PlayerConnectionCloseEvent @@ -35,7 +35,7 @@ is undefined. diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java new file mode 100644 -index 000000000..12c1c6fe9 +index 0000000000000000000000000000000000000000..12c1c6fe9dc8dc5f5faf6dcf99f6857219ef22b8 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java @@ -0,0 +1,95 @@ @@ -134,6 +134,3 @@ index 000000000..12c1c6fe9 + return HANDLERS; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index 2a2df3ba55..ec2b79af2d 100644 --- a/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -1,4 +1,4 @@ -From bec694b470d25f2085a404b980c98df2ba76a634 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Jan 2019 00:31:12 -0600 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed @@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index 6cf05fed7..3afd5f5c0 100644 +index 6cf05fed701c67a2c797a4e0839c795802a238a1..3afd5f5c0208a4ee93b5dbfc2aab2b9d2e8a7544 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -147,7 +147,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio @@ -60,6 +60,3 @@ index 6cf05fed7..3afd5f5c0 100644 /** * Increments the given statistic for this player. --- -2.26.2 - diff --git a/Spigot-API-Patches/0170-BlockDestroyEvent.patch b/Spigot-API-Patches/0170-BlockDestroyEvent.patch index dbca32d680..026a69cc91 100644 --- a/Spigot-API-Patches/0170-BlockDestroyEvent.patch +++ b/Spigot-API-Patches/0170-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From 7bf842ef93db8eb174bdb610a2e0c796517746d4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 Feb 2019 00:19:33 -0500 Subject: [PATCH] BlockDestroyEvent @@ -12,7 +12,7 @@ This can replace many uses of BlockPhysicsEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java new file mode 100644 -index 000000000..3aee12f1c +index 0000000000000000000000000000000000000000..3aee12f1cb37b0672bdcdfac1e932bd4e3a184b0 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java @@ -0,0 +1,92 @@ @@ -108,6 +108,3 @@ index 000000000..3aee12f1c + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch b/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch index 657fdb9240..45525648c7 100644 --- a/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch +++ b/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch @@ -1,4 +1,4 @@ -From 6515b3feae9348d1e48113cc1c85ff1b04035465 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 28 Jan 2014 19:13:57 -0500 Subject: [PATCH] Add ItemStack Recipe API helper methods @@ -6,7 +6,7 @@ Subject: [PATCH] Add ItemStack Recipe API helper methods Allows using ExactChoice Recipes with easier methodss diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index d742c4058..222a12baa 100644 +index d742c4058ba9aed4fbe1591fd755a06608b06e98..222a12baa8e93ad686ab59426653f066d5876e38 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java @@ -145,6 +145,13 @@ public class ShapedRecipe implements Recipe, Keyed { @@ -24,7 +24,7 @@ index d742c4058..222a12baa 100644 * Get a copy of the ingredients map. * diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -index 84062dd71..ddcf84e66 100644 +index 84062dd719cb8a6142dc8c806777cb208c6b42b2..ddcf84e6609abe8379cca2ff99983ce3efbab805 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java @@ -143,6 +143,40 @@ public class ShapelessRecipe implements Recipe, Keyed { @@ -68,6 +68,3 @@ index 84062dd71..ddcf84e66 100644 /** * Removes an ingredient from the list. * --- -2.26.2 - diff --git a/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch index 562fd44a8e..4bb54b5c92 100644 --- a/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch +++ b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch @@ -1,4 +1,4 @@ -From 1539f9c421ab42d9c3ba492a4e49fbdfe8db01f5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 13 Mar 2019 20:04:43 +0200 Subject: [PATCH] Add WhitelistToggleEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add WhitelistToggleEvent diff --git a/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java new file mode 100644 -index 000000000..fdd5eedb2 +index 0000000000000000000000000000000000000000..fdd5eedb2b7401439912a3a4343a920f32edc860 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java @@ -0,0 +1,40 @@ @@ -50,6 +50,3 @@ index 000000000..fdd5eedb2 + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0173-Annotation-Test-changes.patch b/Spigot-API-Patches/0173-Annotation-Test-changes.patch index 19a0220e26..18489e6629 100644 --- a/Spigot-API-Patches/0173-Annotation-Test-changes.patch +++ b/Spigot-API-Patches/0173-Annotation-Test-changes.patch @@ -1,11 +1,11 @@ -From 350f623a98789a937e5298b592dbfe54af8b93b9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 17 Mar 2019 23:04:30 +0000 Subject: [PATCH] Annotation Test changes diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index 0c7377247..38be576b3 100644 +index 0c7377247ad9251c9e498039511e7220370aba2d..38be576b39526592f324b2675b3db41b18e100cc 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -40,7 +40,17 @@ public class AnnotationTest { @@ -27,6 +27,3 @@ index 0c7377247..38be576b3 100644 }; @Test --- -2.26.2 - diff --git a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch index 05e0a4884d..67ae211cd5 100644 --- a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch +++ b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From 4ea7b62df345611789b4ea2507a2ba13fe1ca239 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:21:23 -0400 Subject: [PATCH] Entity#getEntitySpawnReason @@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 45e0dffe6..5518ecd21 100644 +index 45e0dffe60ce1f4d54b481b6b2cbee511659a5cc..5518ecd21435334d9148cd3e095ec06031bdd0a5 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -649,5 +649,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @@ -25,6 +25,3 @@ index 45e0dffe6..5518ecd21 100644 + org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason(); // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0175-Add-GS4-Query-event.patch b/Spigot-API-Patches/0175-Add-GS4-Query-event.patch index 5e6486046d..ffab49a92a 100644 --- a/Spigot-API-Patches/0175-Add-GS4-Query-event.patch +++ b/Spigot-API-Patches/0175-Add-GS4-Query-event.patch @@ -1,4 +1,4 @@ -From bab6b94e2043244b38b9524d6956c460fecb79d9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 17 Mar 2019 21:46:27 +0200 Subject: [PATCH] Add GS4 Query event @@ -6,7 +6,7 @@ Subject: [PATCH] Add GS4 Query event diff --git a/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java b/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java new file mode 100644 -index 000000000..77a19995f +index 0000000000000000000000000000000000000000..77a19995f6792a182c5a43d6714e7bda0f42df5b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java @@ -0,0 +1,412 @@ @@ -422,6 +422,3 @@ index 000000000..77a19995f + } + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch b/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch index 3f0d5a3bae..2eb0647eac 100644 --- a/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch +++ b/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch @@ -1,4 +1,4 @@ -From 599500e51a5fd023124affa7212c4fd9d34ae2b6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MisterVector Date: Fri, 26 Oct 2018 21:33:13 -0700 Subject: [PATCH] Add PlayerPostRespawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerPostRespawnEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java new file mode 100644 -index 000000000..31f34b548 +index 0000000000000000000000000000000000000000..31f34b54801f6699ce43355fa2a0a51f1ad0c997 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java @@ -0,0 +1,52 @@ @@ -62,6 +62,3 @@ index 000000000..31f34b548 + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch b/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch index 5c9a151f5e..fb38d7e340 100644 --- a/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch +++ b/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch @@ -1,4 +1,4 @@ -From 97522334c2889d82b4b13fbb754bbf3b7cd4f4e3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:44:26 -0400 Subject: [PATCH] Ignore package-private methods for nullability annotations @@ -6,7 +6,7 @@ Subject: [PATCH] Ignore package-private methods for nullability annotations This isn't API diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index 38be576b3..a48be38b1 100644 +index 38be576b39526592f324b2675b3db41b18e100cc..a48be38b159bec27ec398666b28620a9ea625547 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -162,7 +162,7 @@ public class AnnotationTest { @@ -18,6 +18,3 @@ index 38be576b3..a48be38b1 100644 return false; } --- -2.26.2 - 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 2a5e2bf99b..002ce7578a 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 796dabd7c6d4115be7c1af6434650c6dfbebfd4f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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,7 +9,7 @@ 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 e83f0852d..6658c12b8 100644 +index e83f0852d187524a0068a81875323b01e3fd5cbd..6658c12b87472a7fa58a6ca70ab0189083e75242 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1211,7 +1211,7 @@ public final class Bukkit { @@ -31,7 +31,7 @@ index e83f0852d..6658c12b8 100644 return server.getTag(registry, tag, clazz); } diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 6e1a1124a..77d9cd0a1 100644 +index 6e1a1124a6e528c1a94ccb1d09bc5dccf056b0b8..77d9cd0a1f54b5eb233eddbcff1bfa76bc182e9a 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -46,7 +46,7 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -62,7 +62,7 @@ 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 fa855cace..df37b9ee5 100644 +index fa855cacec894a0efb254e8a9729a9787464f17d..df37b9ee57ff8cd194401719bc48f868d6b1ee7e 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1014,7 +1014,7 @@ public interface Server extends PluginMessageRecipient { @@ -84,7 +84,7 @@ index fa855cace..df37b9ee5 100644 /** diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 3cada3487..03ba22659 100644 +index 3cada34873e6da92363c8d920f3bbbd0670a32e0..03ba2265908d35bded0f38ed31187e5500e1b1f0 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -3,6 +3,7 @@ package org.bukkit.inventory; @@ -105,7 +105,7 @@ index 3cada3487..03ba22659 100644 /** diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 4940ba6a9..d7d6a3e83 100644 +index 4940ba6a979cec5bea0edc24b94149298c256bc3..d7d6a3e83dfd88359708749f5c12be02815c3580 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -8,6 +8,7 @@ import java.util.Set; // Paper @@ -125,6 +125,3 @@ index 4940ba6a9..d7d6a3e83 100644 public ItemMeta getItemMeta() { return this.meta == null ? Bukkit.getItemFactory().getItemMeta(this.type) : this.meta.clone(); } --- -2.26.2 - diff --git a/Spigot-API-Patches/0179-Server-Tick-Events.patch b/Spigot-API-Patches/0179-Server-Tick-Events.patch index e5f199ef9c..9cb8b9a4c0 100644 --- a/Spigot-API-Patches/0179-Server-Tick-Events.patch +++ b/Spigot-API-Patches/0179-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From 1a22ffd8516da4b7847376075d625328f552b082 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 21:58:55 -0400 Subject: [PATCH] Server Tick Events @@ -7,7 +7,7 @@ Fires event at start and end of a server tick diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java new file mode 100644 -index 000000000..9fd28e036 +index 0000000000000000000000000000000000000000..9fd28e03649f66f71fb7f0536a137557ec32cd25 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java @@ -0,0 +1,59 @@ @@ -72,7 +72,7 @@ index 000000000..9fd28e036 +} diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java new file mode 100644 -index 000000000..eac85f1f4 +index 0000000000000000000000000000000000000000..eac85f1f49088bb71afb01eff4d5f53887306461 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java @@ -0,0 +1,32 @@ @@ -108,6 +108,3 @@ index 000000000..eac85f1f4 + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch index a27ff551c7..625a4dd36d 100644 --- a/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch +++ b/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch @@ -1,4 +1,4 @@ -From 37dc0a1dbb61d77c7b055ed6a0eb436c38f8f663 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 11 Mar 2013 20:04:34 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep @@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java -index 07a52441a..1e97d04b3 100644 +index 07a52441a5cdd7e428a14b286d7cb5210e3efa97..1e97d04b3f3509f82d4cda1773909f91800bf5bc 100644 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java @@ -17,6 +17,40 @@ public class PlayerDeathEvent extends EntityDeathEvent { @@ -52,6 +52,3 @@ index 07a52441a..1e97d04b3 100644 public PlayerDeathEvent(@NotNull final Player player, @NotNull final List drops, final int droppedExp, @Nullable final String deathMessage) { this(player, drops, droppedExp, 0, deathMessage); } --- -2.26.2 - diff --git a/Spigot-API-Patches/0181-Add-Heightmap-API.patch b/Spigot-API-Patches/0181-Add-Heightmap-API.patch index 7e5f453af0..9326962388 100644 --- a/Spigot-API-Patches/0181-Add-Heightmap-API.patch +++ b/Spigot-API-Patches/0181-Add-Heightmap-API.patch @@ -1,4 +1,4 @@ -From 0aa76f1b76225ee5d226da8753034b42c84a61bb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 1 Dec 2018 19:00:36 -0800 Subject: [PATCH] Add Heightmap API @@ -7,7 +7,7 @@ Deprecated 2020-02-08 MC 1.15.2 diff --git a/src/main/java/com/destroystokyo/paper/HeightmapType.java b/src/main/java/com/destroystokyo/paper/HeightmapType.java new file mode 100644 -index 000000000..709e44ea1 +index 0000000000000000000000000000000000000000..709e44ea1b14ab6917501c928e689cc6cbdf4bb4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/HeightmapType.java @@ -0,0 +1,39 @@ @@ -51,7 +51,7 @@ index 000000000..709e44ea1 + SOLID_OR_LIQUID_NO_LEAVES; +} diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 77d9cd0a1..590475032 100644 +index 77d9cd0a1f54b5eb233eddbcff1bfa76bc182e9a..5904750329a5c7061de6e4fe32335b0d4e6a5e04 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -638,6 +638,33 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -89,7 +89,7 @@ index 77d9cd0a1..590475032 100644 * Creates explosion at this location with given power * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index c88f17244..db18f70ec 100644 +index c88f17244617b75e251811595ffc189dc81e12fb..db18f70ec37253232fb2cfd08ccd07d13c7c457d 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -160,6 +160,87 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -180,6 +180,3 @@ index c88f17244..db18f70ec 100644 /** * Gets the highest coordinate corresponding to the {@link HeightMap} at the * given coordinates. --- -2.26.2 - diff --git a/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch b/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch index 9169e001f8..8c9b668bf2 100644 --- a/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch +++ b/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch @@ -1,11 +1,11 @@ -From 92e558aeeadc89ede03efc1ea18d6b93edac1673 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 19 Apr 2019 12:41:19 -0500 Subject: [PATCH] Mob Spawner API Enhancements diff --git a/src/main/java/org/bukkit/block/CreatureSpawner.java b/src/main/java/org/bukkit/block/CreatureSpawner.java -index cb447a4ad..35a599ebe 100644 +index cb447a4ad5a9dce7c98999a5d7fcd6111fc9b10e..35a599ebe9a35dc9570d546d73622da87cb136c4 100644 --- a/src/main/java/org/bukkit/block/CreatureSpawner.java +++ b/src/main/java/org/bukkit/block/CreatureSpawner.java @@ -199,4 +199,18 @@ public interface CreatureSpawner extends TileState { @@ -27,6 +27,3 @@ index cb447a4ad..35a599ebe 100644 + public void resetTimer(); + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch b/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch index 5c4e448d5c..6f1c6b0dfd 100644 --- a/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch +++ b/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch @@ -1,4 +1,4 @@ -From 28e560344d9b9e4904d6fbce0f7dcd658d445220 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: simpleauthority Date: Tue, 28 May 2019 03:41:28 -0700 Subject: [PATCH] Add BlockSoundGroup interface @@ -7,7 +7,7 @@ This PR adds the getSoundGroup() method in Block which returns a BlockSoundGroup diff --git a/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java new file mode 100644 -index 000000000..8cf87d228 +index 0000000000000000000000000000000000000000..8cf87d228a7006658d52ce0da16c2d74f4706545 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java @@ -0,0 +1,52 @@ @@ -64,7 +64,7 @@ index 000000000..8cf87d228 + Sound getFallSound(); +} diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 41f6b8491..971386795 100644 +index 41f6b849186346f9a4e254122d2448a7ea8e0ee9..9713867950572fdc8c0f8798afcb37712a6a4e85 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -1,6 +1,7 @@ @@ -92,6 +92,3 @@ index 41f6b8491..971386795 100644 + com.destroystokyo.paper.block.BlockSoundGroup getSoundGroup(); + // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch index 697d2a8413..b5148c5574 100644 --- a/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch +++ b/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch @@ -1,11 +1,11 @@ -From a6b1af15d761c3ecbabed5a3543c0af41d1c9985 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: simpleauthority Date: Thu, 11 Jul 2019 10:35:56 -0700 Subject: [PATCH] Amend PlayerInteractAtEntityEvent javadoc for ArmorStands diff --git a/src/main/java/org/bukkit/event/player/PlayerInteractAtEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerInteractAtEntityEvent.java -index 1075dbb81..3f24d302e 100644 +index 1075dbb8135d2fd2fd69d1e821dd1ba7f90824d5..3f24d302e28170f7f6e5885b5b9abb22cbbb7d66 100644 --- a/src/main/java/org/bukkit/event/player/PlayerInteractAtEntityEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerInteractAtEntityEvent.java @@ -13,6 +13,9 @@ import org.jetbrains.annotations.NotNull; @@ -18,6 +18,3 @@ index 1075dbb81..3f24d302e 100644 */ public class PlayerInteractAtEntityEvent extends PlayerInteractEntityEvent { private static final HandlerList handlers = new HandlerList(); --- -2.26.2 - diff --git a/Spigot-API-Patches/0185-Make-PlayerEvent-public.patch b/Spigot-API-Patches/0185-Make-PlayerEvent-public.patch index 2b5f7ec4ce..ed61e9159c 100644 --- a/Spigot-API-Patches/0185-Make-PlayerEvent-public.patch +++ b/Spigot-API-Patches/0185-Make-PlayerEvent-public.patch @@ -1,11 +1,11 @@ -From d5d4d306a2f31cfa9cf6ea388f1f353e6772acfb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 27 Apr 2020 02:40:34 -0400 Subject: [PATCH] Make PlayerEvent public diff --git a/src/main/java/org/bukkit/event/player/PlayerEvent.java b/src/main/java/org/bukkit/event/player/PlayerEvent.java -index 793b661b6..b7c8f2c31 100644 +index 793b661b6d2d05de3d7f4fc26a4c018a2af58e62..b7c8f2c31731960124ae4d67e935d2baaaae9e27 100644 --- a/src/main/java/org/bukkit/event/player/PlayerEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerEvent.java @@ -14,7 +14,7 @@ public abstract class PlayerEvent extends Event { @@ -17,6 +17,3 @@ index 793b661b6..b7c8f2c31 100644 super(async); player = who; --- -2.26.2 - diff --git a/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch b/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch index de64ab4087..24aacd2b29 100644 --- a/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch +++ b/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch @@ -1,4 +1,4 @@ -From 2679ec7c429bf9919049fb57caf39d399dcfcb79 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 18 Oct 2019 17:39:05 +0100 Subject: [PATCH] Increase custom payload channel message size @@ -7,7 +7,7 @@ Doubles the custom payload size limit imposed by bukkit, also creates a system property to allow customizing the size `paper.maxCustomChannelName` diff --git a/src/main/java/org/bukkit/plugin/messaging/Messenger.java b/src/main/java/org/bukkit/plugin/messaging/Messenger.java -index 9d2c68c82..682c77188 100644 +index 9d2c68c826f3b867d407e7f13c6394a899cc8ee8..682c77188436d696d4dafbc70cf131d5c921e94d 100644 --- a/src/main/java/org/bukkit/plugin/messaging/Messenger.java +++ b/src/main/java/org/bukkit/plugin/messaging/Messenger.java @@ -24,7 +24,7 @@ public interface Messenger { @@ -19,6 +19,3 @@ index 9d2c68c82..682c77188 100644 /** * Checks if the specified channel is a reserved name. --- -2.26.2 - 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 eba6a01dd9..bc3db05170 100644 --- a/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch +++ b/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch @@ -1,11 +1,11 @@ -From ac5f14a8810ec5a3c17384e1587464a2afe2792a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 6658c12b8..b99734068 100644 +index 6658c12b87472a7fa58a6ca70ab0189083e75242..b997340686e86e05847bedcbf125e070c569b90a 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1657,6 +1657,10 @@ public final class Bukkit { @@ -20,7 +20,7 @@ index 6658c12b8..b99734068 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index df37b9ee5..80f9abdca 100644 +index df37b9ee57ff8cd194401719bc48f868d6b1ee7e..80f9abdca71bba79cbf09035cfd5534e41002a27 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1448,5 +1448,12 @@ public interface Server extends PluginMessageRecipient { @@ -36,6 +36,3 @@ index df37b9ee5..80f9abdca 100644 + int getCurrentTick(); // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch index d4ed04e085..6df0416950 100644 --- a/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch +++ b/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch @@ -1,11 +1,11 @@ -From 7f0238c8822f58e59c5b1f515102d82827c8f015 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 24 Dec 2019 00:35:31 +0000 Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java -index 1e97d04b3..3a743430a 100644 +index 1e97d04b3f3509f82d4cda1773909f91800bf5bc..3a743430acb5eecc4d8db068fa62fe6d38a249e5 100644 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java @@ -1,6 +1,8 @@ @@ -59,6 +59,3 @@ index 1e97d04b3..3a743430a 100644 } @NotNull --- -2.26.2 - diff --git a/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch b/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch index fff82c7929..0ee1187617 100644 --- a/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch +++ b/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch @@ -1,11 +1,11 @@ -From 03b8a42e63003119c4d7edf60f35106ee3ea18e4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 12:25:16 -0600 Subject: [PATCH] Add effect to block break naturally diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 971386795..19a3b2a1f 100644 +index 9713867950572fdc8c0f8798afcb37712a6a4e85..19a3b2a1faa5037c34486873e0be0c534813da1d 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -468,6 +468,18 @@ public interface Block extends Metadatable { @@ -27,6 +27,3 @@ index 971386795..19a3b2a1f 100644 /** * Returns a list of items which would drop by destroying this block * --- -2.26.2 - diff --git a/Spigot-API-Patches/0190-Add-ThrownEggHatchEvent.patch b/Spigot-API-Patches/0190-Add-ThrownEggHatchEvent.patch index 58426050f5..f605a2a11b 100644 --- a/Spigot-API-Patches/0190-Add-ThrownEggHatchEvent.patch +++ b/Spigot-API-Patches/0190-Add-ThrownEggHatchEvent.patch @@ -1,4 +1,4 @@ -From f9078b7ce594babfaea4ee77bb1a36073818ed60 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 9 Feb 2020 00:19:08 -0600 Subject: [PATCH] Add ThrownEggHatchEvent @@ -8,7 +8,7 @@ Adds a new event similar to PlayerEggThrowEvent, but without the Player requirem diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ThrownEggHatchEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ThrownEggHatchEvent.java new file mode 100644 -index 000000000..085d77dde +index 0000000000000000000000000000000000000000..085d77dde83d6ed13eb83f23cf3e51d380187c9c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/ThrownEggHatchEvent.java @@ -0,0 +1,115 @@ @@ -127,6 +127,3 @@ index 000000000..085d77dde + return handlers; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0191-Entity-Jump-API.patch b/Spigot-API-Patches/0191-Entity-Jump-API.patch index 6eca037698..74f7ac19f3 100644 --- a/Spigot-API-Patches/0191-Entity-Jump-API.patch +++ b/Spigot-API-Patches/0191-Entity-Jump-API.patch @@ -1,4 +1,4 @@ -From ffafa77c36486a1d9d4a989d09df94dd80a06355 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 8 Feb 2020 23:26:18 -0600 Subject: [PATCH] Entity Jump API @@ -6,7 +6,7 @@ Subject: [PATCH] Entity Jump API diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java new file mode 100644 -index 000000000..f0067c2e9 +index 0000000000000000000000000000000000000000..f0067c2e953d18e1a33536980071ba3f0152ecb4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java @@ -0,0 +1,46 @@ @@ -57,7 +57,7 @@ index 000000000..f0067c2e9 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index deab50525..7f73e4b92 100644 +index deab505250145e795ef14537c5d453c1703f80aa..7f73e4b92bc7456477d054e69e93e5602d88a8fa 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -711,5 +711,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -86,6 +86,3 @@ index deab50525..7f73e4b92 100644 + void setJumping(boolean jumping); // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0192-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-API-Patches/0192-add-hand-to-BlockMultiPlaceEvent.patch index f775e2a165..f61bddb960 100644 --- a/Spigot-API-Patches/0192-add-hand-to-BlockMultiPlaceEvent.patch +++ b/Spigot-API-Patches/0192-add-hand-to-BlockMultiPlaceEvent.patch @@ -1,11 +1,11 @@ -From 3c38ffde416c5cee46f869755a7280c58dec8ce6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Trigary Date: Sun, 1 Mar 2020 22:43:34 +0100 Subject: [PATCH] add hand to BlockMultiPlaceEvent diff --git a/src/main/java/org/bukkit/event/block/BlockMultiPlaceEvent.java b/src/main/java/org/bukkit/event/block/BlockMultiPlaceEvent.java -index fe2ec79dd..8460aa4f5 100644 +index fe2ec79dd6084509cb8cbb8155a356f4162466fd..8460aa4f5e211fb0a6ab11f7487d38dba927e1da 100644 --- a/src/main/java/org/bukkit/event/block/BlockMultiPlaceEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockMultiPlaceEvent.java @@ -18,9 +18,17 @@ import org.jetbrains.annotations.NotNull; @@ -27,6 +27,3 @@ index fe2ec79dd..8460aa4f5 100644 } /** --- -2.26.2 - diff --git a/Spigot-API-Patches/0193-Add-tick-times-API.patch b/Spigot-API-Patches/0193-Add-tick-times-API.patch index 551085e8cc..efbcbd05c5 100644 --- a/Spigot-API-Patches/0193-Add-tick-times-API.patch +++ b/Spigot-API-Patches/0193-Add-tick-times-API.patch @@ -1,11 +1,11 @@ -From e0a523e39dc4d572fe3697e03697443a3caa7bf9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 5 Apr 2020 22:22:58 -0500 Subject: [PATCH] Add tick times API diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index b99734068..c3c2d9c6b 100644 +index b997340686e86e05847bedcbf125e070c569b90a..c3c2d9c6b546459a614b5fdf5ec3debf4ebcabcf 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1412,6 +1412,25 @@ public final class Bukkit { @@ -35,7 +35,7 @@ index b99734068..c3c2d9c6b 100644 /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 80f9abdca..bfa83c9bb 100644 +index 80f9abdca71bba79cbf09035cfd5534e41002a27..bfa83c9bb4d5f1ff4591e80fd38942d6c88cf960 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1188,6 +1188,21 @@ public interface Server extends PluginMessageRecipient { @@ -60,6 +60,3 @@ index 80f9abdca..bfa83c9bb 100644 // Paper end // Paper start --- -2.26.2 - diff --git a/Spigot-API-Patches/0194-Expose-MinecraftServer-isRunning.patch b/Spigot-API-Patches/0194-Expose-MinecraftServer-isRunning.patch index 40806dd1ff..0013b87f41 100644 --- a/Spigot-API-Patches/0194-Expose-MinecraftServer-isRunning.patch +++ b/Spigot-API-Patches/0194-Expose-MinecraftServer-isRunning.patch @@ -1,4 +1,4 @@ -From 165e8827e1cd5f52e5bed17d42f8ab2fbe99450d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: JRoy Date: Fri, 10 Apr 2020 21:24:35 -0400 Subject: [PATCH] Expose MinecraftServer#isRunning @@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index c3c2d9c6b..ea3e5d6fa 100644 +index c3c2d9c6b546459a614b5fdf5ec3debf4ebcabcf..ea3e5d6fa56a7ff259a9ce55a8e31d3921768b8b 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1680,6 +1680,15 @@ public final class Bukkit { @@ -26,7 +26,7 @@ index c3c2d9c6b..ea3e5d6fa 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index bfa83c9bb..9ceaac0e8 100644 +index bfa83c9bb4d5f1ff4591e80fd38942d6c88cf960..9ceaac0e859e347b07fa9f4c6507a73deb280670 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1470,5 +1470,12 @@ public interface Server extends PluginMessageRecipient { @@ -42,6 +42,3 @@ index bfa83c9bb..9ceaac0e8 100644 + boolean isStopping(); // Paper end } --- -2.26.2 - diff --git a/Spigot-API-Patches/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch b/Spigot-API-Patches/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch index ca01a0455c..a7e3a69f3b 100644 --- a/Spigot-API-Patches/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch +++ b/Spigot-API-Patches/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch @@ -1,4 +1,4 @@ -From ea40fdf45bb3c6b1130177862a7496efaae08a24 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 11 Apr 2020 21:38:59 -0400 Subject: [PATCH] Disable Sync Events firing Async errors during shutdown @@ -11,7 +11,7 @@ errors. This isn't an issue on Spigot diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 8355f9f0e..4931bc86d 100644 +index 8355f9f0eb1b554bf6cfd3883afd2bdd2bf8c357..4931bc86d44cd697d458d6e365c3b8030ea8285d 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -591,7 +591,7 @@ public final class SimplePluginManager implements PluginManager { @@ -23,6 +23,3 @@ index 8355f9f0e..4931bc86d 100644 throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously."); } --- -2.26.2 - diff --git a/Spigot-API-Patches/0196-Make-JavaPluginLoader-thread-safe.patch b/Spigot-API-Patches/0196-Make-JavaPluginLoader-thread-safe.patch index 4a9c008528..283d4022b8 100644 --- a/Spigot-API-Patches/0196-Make-JavaPluginLoader-thread-safe.patch +++ b/Spigot-API-Patches/0196-Make-JavaPluginLoader-thread-safe.patch @@ -1,11 +1,11 @@ -From 49584133dc28884b641698f3b8996b0b1d60642c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Trigary Date: Wed, 15 Apr 2020 01:24:55 -0400 Subject: [PATCH] Make JavaPluginLoader thread-safe diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 8ff228ced..ba2c5c6ee 100644 +index 8ff228ced356eb509b93abb7a0d3d9a26dd3e057..ba2c5c6eee6fc9f7c96c3ab304d8a1fc759ccd77 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -52,6 +52,8 @@ public final class JavaPluginLoader implements PluginLoader { @@ -57,6 +57,3 @@ index 8ff228ced..ba2c5c6ee 100644 return null; } --- -2.26.2 - diff --git a/Spigot-API-Patches/0197-Add-Player-Client-Options-API.patch b/Spigot-API-Patches/0197-Add-Player-Client-Options-API.patch index 42219f310e..8b7612e97f 100644 --- a/Spigot-API-Patches/0197-Add-Player-Client-Options-API.patch +++ b/Spigot-API-Patches/0197-Add-Player-Client-Options-API.patch @@ -1,4 +1,4 @@ -From c267ad45f2e7a1768db628032a10c17b2e301fb4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Mon, 20 Jan 2020 21:38:34 +0100 Subject: [PATCH] Add Player Client Options API @@ -6,7 +6,7 @@ Subject: [PATCH] Add Player Client Options API diff --git a/src/main/java/com/destroystokyo/paper/ClientOption.java b/src/main/java/com/destroystokyo/paper/ClientOption.java new file mode 100644 -index 000000000..9dad814cf +index 0000000000000000000000000000000000000000..9dad814cf51bc59ec5dfbf14474fea6557de38aa --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/ClientOption.java @@ -0,0 +1,33 @@ @@ -45,7 +45,7 @@ index 000000000..9dad814cf +} diff --git a/src/main/java/com/destroystokyo/paper/SkinParts.java b/src/main/java/com/destroystokyo/paper/SkinParts.java new file mode 100644 -index 000000000..4a0c39405 +index 0000000000000000000000000000000000000000..4a0c39405d4fbed457787e3c6ded4cc6591bc8c2 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/SkinParts.java @@ -0,0 +1,20 @@ @@ -71,7 +71,7 @@ index 000000000..4a0c39405 +} diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java new file mode 100644 -index 000000000..f7f171c4e +index 0000000000000000000000000000000000000000..f7f171c4ee0b8339b2f8fbe82442d65f17202f28 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java @@ -0,0 +1,100 @@ @@ -176,7 +176,7 @@ index 000000000..f7f171c4e + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 3600b4c84..787bb144b 100644 +index 3600b4c84058713616a6448c1175a7d1ba74fd7b..787bb144b5918ef1e46d69cb72b84128d2b678f3 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1,6 +1,7 @@ @@ -200,6 +200,3 @@ index 3600b4c84..787bb144b 100644 // Paper end // Spigot start --- -2.26.2 - diff --git a/Spigot-API-Patches/0198-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-API-Patches/0198-Add-PlayerAttackEntityCooldownResetEvent.patch index a1f18e46a4..15fa2db392 100644 --- a/Spigot-API-Patches/0198-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/Spigot-API-Patches/0198-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -1,4 +1,4 @@ -From 638eb076a921e969094b88f36daa251f2eb47ed7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Thu, 26 Mar 2020 19:30:58 -0700 Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java new file mode 100644 -index 000000000..ebdebe7b6 +index 0000000000000000000000000000000000000000..ebdebe7b6ec6ed5aadc7ee925ba0147e61e6bc84 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java @@ -0,0 +1,76 @@ @@ -86,6 +86,3 @@ index 000000000..ebdebe7b6 + return attackedEntity; + } +} --- -2.26.2 - diff --git a/Spigot-API-Patches/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/Spigot-API-Patches/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch index 5777b9bc97..800d5364e2 100644 --- a/Spigot-API-Patches/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch +++ b/Spigot-API-Patches/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch @@ -1,4 +1,4 @@ -From 920ba75d50b484e75fb3b746365ecc476135ca5b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Wesley Smith Date: Fri, 24 Apr 2020 18:30:26 -0400 Subject: [PATCH] Fix Potion#toItemStack swapping the extended and upgraded @@ -7,7 +7,7 @@ Subject: [PATCH] Fix Potion#toItemStack swapping the extended and upgraded While the Potion class is deprecated, it is still used in some plugins for cross-version potion handling. This issue has existed for a long time, and has caused many heaches along the way. diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java -index b9dbbfd07..ac02ae4fc 100644 +index b9dbbfd07dea643d7ac749822548571968adaa94..ac02ae4fc179483b4ac3d1adc41684a8426197eb 100644 --- a/src/main/java/org/bukkit/potion/Potion.java +++ b/src/main/java/org/bukkit/potion/Potion.java @@ -267,7 +267,7 @@ public class Potion { @@ -19,6 +19,3 @@ index b9dbbfd07..ac02ae4fc 100644 itemStack.setItemMeta(meta); return itemStack; } --- -2.26.2 - diff --git a/Spigot-API-Patches/0200-Villager-Restocks-API.patch b/Spigot-API-Patches/0200-Villager-Restocks-API.patch index 566f6fed1e..e2dcfc3144 100644 --- a/Spigot-API-Patches/0200-Villager-Restocks-API.patch +++ b/Spigot-API-Patches/0200-Villager-Restocks-API.patch @@ -1,11 +1,11 @@ -From 06142d327789e096f5fabec10ddf2667a892c094 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: zbk Date: Sun, 26 Apr 2020 23:49:03 -0400 Subject: [PATCH] Villager Restocks API diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java -index ef48ad9b2..d15791530 100644 +index ef48ad9b28750ab7b33071f6b8e354e922731909..d1579153092c1b80350155110f1b9926b1a1ef57 100644 --- a/src/main/java/org/bukkit/entity/Villager.java +++ b/src/main/java/org/bukkit/entity/Villager.java @@ -77,6 +77,20 @@ public interface Villager extends AbstractVillager { @@ -29,6 +29,3 @@ index ef48ad9b2..d15791530 100644 /** * Attempts to make this villager sleep at the given location. *
--- -2.26.2 - diff --git a/Spigot-API-Patches/0201-Expose-game-version.patch b/Spigot-API-Patches/0201-Expose-game-version.patch index f3a5eacdb6..c2e98ecdc8 100644 --- a/Spigot-API-Patches/0201-Expose-game-version.patch +++ b/Spigot-API-Patches/0201-Expose-game-version.patch @@ -1,11 +1,11 @@ -From d06bf34ea56dcddd270b687ffadcf28b0011f514 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Fri, 1 May 2020 17:39:02 +0300 Subject: [PATCH] Expose game version diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index ea3e5d6fa..95ad01226 100644 +index ea3e5d6fa56a7ff259a9ce55a8e31d3921768b8b..95ad0122605b40e28352fa6205528eeb5c453a50 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -118,6 +118,18 @@ public final class Bukkit { @@ -28,7 +28,7 @@ index ea3e5d6fa..95ad01226 100644 * Gets a view of all currently logged in players. This {@linkplain * Collections#unmodifiableCollection(Collection) view} is a reused diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 9ceaac0e8..c3fb1c271 100644 +index 9ceaac0e859e347b07fa9f4c6507a73deb280670..c3fb1c27187b5283e2fd5c2b894bbc889a48544d 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -97,6 +97,16 @@ public interface Server extends PluginMessageRecipient { @@ -48,6 +48,3 @@ index 9ceaac0e8..c3fb1c271 100644 /** * Gets a view of all currently logged in players. This {@linkplain * Collections#unmodifiableCollection(Collection) view} is a reused --- -2.26.2 - diff --git a/Spigot-API-Patches/0202-Add-item-slot-convenience-methods.patch b/Spigot-API-Patches/0202-Add-item-slot-convenience-methods.patch index 2ce192d454..b57a965aec 100644 --- a/Spigot-API-Patches/0202-Add-item-slot-convenience-methods.patch +++ b/Spigot-API-Patches/0202-Add-item-slot-convenience-methods.patch @@ -1,11 +1,11 @@ -From a5b8056b394f5316411507e4998dfb423e6dff11 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: KennyTV Date: Sat, 25 Apr 2020 23:31:28 +0200 Subject: [PATCH] Add item slot convenience methods diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java -index 4af56242..b95e563b 100644 +index 4af562426aa38faeb6822abb0c878a3ac346b383..b95e563b5454306a9188ae3295309ee86a756477 100644 --- a/src/main/java/org/bukkit/inventory/AnvilInventory.java +++ b/src/main/java/org/bukkit/inventory/AnvilInventory.java @@ -49,4 +49,64 @@ public interface AnvilInventory extends Inventory { @@ -74,7 +74,7 @@ index 4af56242..b95e563b 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/inventory/GrindstoneInventory.java b/src/main/java/org/bukkit/inventory/GrindstoneInventory.java -index 9048892c..1c750108 100644 +index 9048892c8768c6b4d6cea03da73339f13bfbe82e..1c750108f55a0a31ad23433b333e0ea486a63ff2 100644 --- a/src/main/java/org/bukkit/inventory/GrindstoneInventory.java +++ b/src/main/java/org/bukkit/inventory/GrindstoneInventory.java @@ -1,6 +1,68 @@ @@ -148,7 +148,7 @@ index 9048892c..1c750108 100644 + // Paper end +} diff --git a/src/main/java/org/bukkit/inventory/LecternInventory.java b/src/main/java/org/bukkit/inventory/LecternInventory.java -index 4a0c43ac..2ea7ea04 100644 +index 4a0c43acc2714e095973eb78536041bb1a179ddc..acf2244f77133df53eb5f862c8e713c85192f13d 100644 --- a/src/main/java/org/bukkit/inventory/LecternInventory.java +++ b/src/main/java/org/bukkit/inventory/LecternInventory.java @@ -11,4 +11,25 @@ public interface LecternInventory extends Inventory { @@ -178,7 +178,7 @@ index 4a0c43ac..2ea7ea04 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/inventory/StonecutterInventory.java b/src/main/java/org/bukkit/inventory/StonecutterInventory.java -index dbb034fa..e7a8e718 100644 +index dbb034fae3b8bfaf40e6341460e274c21e321a3b..e7a8e7188bf8b9840de56dc80c2b79d64a9389cb 100644 --- a/src/main/java/org/bukkit/inventory/StonecutterInventory.java +++ b/src/main/java/org/bukkit/inventory/StonecutterInventory.java @@ -1,6 +1,49 @@ @@ -232,6 +232,3 @@ index dbb034fa..e7a8e718 100644 + } + // Paper end +} --- -2.26.2.windows.1 - diff --git a/Spigot-API-Patches/0203-Add-Mob-Goal-API.patch b/Spigot-API-Patches/0203-Add-Mob-Goal-API.patch index 991e54f0b6..c81376b7c0 100644 --- a/Spigot-API-Patches/0203-Add-Mob-Goal-API.patch +++ b/Spigot-API-Patches/0203-Add-Mob-Goal-API.patch @@ -1,4 +1,4 @@ -From b9fa8d98289a044c4bc231ef79435e27d829a5de Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Fri, 3 Jan 2020 16:24:46 +0100 Subject: [PATCH] Add Mob Goal API @@ -6,7 +6,7 @@ Subject: [PATCH] Add Mob Goal API diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/Goal.java b/src/main/java/com/destroystokyo/paper/entity/ai/Goal.java new file mode 100644 -index 00000000..c57c5416 +index 0000000000000000000000000000000000000000..c57c5416c88e2070a082403ab0dda9d7f08d2a57 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/ai/Goal.java @@ -0,0 +1,66 @@ @@ -78,7 +78,7 @@ index 00000000..c57c5416 +} diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/GoalKey.java b/src/main/java/com/destroystokyo/paper/entity/ai/GoalKey.java new file mode 100644 -index 00000000..9cd98c6f +index 0000000000000000000000000000000000000000..9cd98c6fcfa3eb439d9013ef76ef4661175a0e5a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/ai/GoalKey.java @@ -0,0 +1,64 @@ @@ -148,7 +148,7 @@ index 00000000..9cd98c6f +} diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/GoalType.java b/src/main/java/com/destroystokyo/paper/entity/ai/GoalType.java new file mode 100644 -index 00000000..e2b44aff +index 0000000000000000000000000000000000000000..e2b44aff21e6818512a81f03a3bff913abf61f9f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/ai/GoalType.java @@ -0,0 +1,13 @@ @@ -167,7 +167,7 @@ index 00000000..e2b44aff +} diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoals.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoals.java new file mode 100644 -index 00000000..e21f7574 +index 0000000000000000000000000000000000000000..e21f7574763dd4f13794f91bbef192ef66a8f5e9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoals.java @@ -0,0 +1,50 @@ @@ -223,7 +223,7 @@ index 00000000..e21f7574 +} diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java new file mode 100644 -index 00000000..dc60d945 +index 0000000000000000000000000000000000000000..dc60d9450b80785034a3cfcdeb4cd5afd2ea41d4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java @@ -0,0 +1,182 @@ @@ -410,7 +410,7 @@ index 00000000..dc60d945 + GoalKey ZOMBIE_ATTACK = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack")); +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 95ad0122..a9c10228 100644 +index 95ad0122605b40e28352fa6205528eeb5c453a50..a9c10228eeeaac89361c695a5ab90161b6358ca1 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1701,6 +1701,16 @@ public final class Bukkit { @@ -431,7 +431,7 @@ index 95ad0122..a9c10228 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index c3fb1c27..cc06492f 100644 +index c3fb1c27187b5283e2fd5c2b894bbc889a48544d..cc06492f46ba5776221cd2614c1dcd8f33cc8faf 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1487,5 +1487,13 @@ public interface Server extends PluginMessageRecipient { @@ -449,7 +449,7 @@ index c3fb1c27..cc06492f 100644 // Paper end } diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java -index 957a6016..4fecbe94 100644 +index 957a60167215d00e9e0edaf418736f7f24c0a04b..4fecbe941b4b89e9022ba6abbdb76539b632a49f 100644 --- a/src/main/java/org/bukkit/entity/Tameable.java +++ b/src/main/java/org/bukkit/entity/Tameable.java @@ -3,7 +3,7 @@ package org.bukkit.entity; @@ -461,6 +461,3 @@ index 957a6016..4fecbe94 100644 /** * Check if this is tamed --- -2.26.0 - diff --git a/Spigot-API-Patches/0204-World-view-distance-api.patch b/Spigot-API-Patches/0204-World-view-distance-api.patch index ec0885e149..1a2d6e705c 100644 --- a/Spigot-API-Patches/0204-World-view-distance-api.patch +++ b/Spigot-API-Patches/0204-World-view-distance-api.patch @@ -1,11 +1,11 @@ -From 919aecffc9c10f8e95f114e326cae396bd48e409 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 5 May 2020 21:28:01 -0700 Subject: [PATCH] World view distance api diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index db18f70e..421ad6a9 100644 +index db18f70ec37253232fb2cfd08ccd07d13c7c457d..421ad6a91ceb38fd62684d18f109d7cf8526605a 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -3166,6 +3166,34 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -43,6 +43,3 @@ index db18f70e..421ad6a9 100644 // Spigot start public class Spigot { --- -2.26.0 - diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index c82c38885d..4ee8b894b0 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From e25efa93c402502049e6ccd531118f65a856d1a9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 9fc92e347f..6cc18aa360 100644 +index 9fc92e347f24a0210a9190513e93cba3b6772557..6cc18aa360c20448fca59cf5490d69267c8e2521 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,14 @@ @@ -157,7 +157,7 @@ index 9fc92e347f..6cc18aa360 100644 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 88223a53cb..cb5d0f5378 100644 +index 88223a53cb547727bacbba2d6006ecabf92bb524..cb5d0f5378418655eee2cd68bab8dc39a7b7052b 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -186,7 +186,7 @@ public class Main { @@ -170,7 +170,7 @@ index 88223a53cb..cb5d0f5378 100644 Calendar deadline = Calendar.getInstance(); deadline.add(Calendar.DAY_OF_YEAR, -21); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 93046379d0..674096cab1 100644 +index 93046379d0cefd5d3236fc59e698809acdc18f80..674096cab190d62622f9947853b056f57d43a2a5 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { @@ -182,6 +182,3 @@ index 93046379d0..674096cab1 100644 Properties properties = new Properties(); if (stream != null) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch index 249893ff20..94188ebe5a 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -1,4 +1,4 @@ -From 5f389e556ca6d0afbc7597f67572a543b79c23e7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 21:02:09 -0600 Subject: [PATCH] Paper config files @@ -6,7 +6,7 @@ Subject: [PATCH] Paper config files diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java new file mode 100644 -index 0000000000..41c79650b1 +index 0000000000000000000000000000000000000000..41c79650b169b87fbc70cf502438a5453a04f23d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -0,0 +1,256 @@ @@ -268,7 +268,7 @@ index 0000000000..41c79650b1 +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java new file mode 100644 -index 0000000000..273cdb598b +index 0000000000000000000000000000000000000000..273cdb598b3606b962dcc92564c84ad351b7a74f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -0,0 +1,184 @@ @@ -458,7 +458,7 @@ index 0000000000..273cdb598b +} diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java new file mode 100644 -index 0000000000..a738657394 +index 0000000000000000000000000000000000000000..a738657394bcccd859ef260a801736d44b234469 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -0,0 +1,67 @@ @@ -530,7 +530,7 @@ index 0000000000..a738657394 + } +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 41eac3588e..32c496fa88 100644 +index 41eac3588e01431818d8848a56ae009a5a510f30..32c496fa88eb1426ab4996fa1bd9803f60648267 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -260,15 +260,15 @@ public class ChunkProviderServer extends IChunkProvider { @@ -554,7 +554,7 @@ index 41eac3588e..32c496fa88 100644 } diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 136d1b50f1..9eed98e379 100644 +index 136d1b50f1cfe71aa5ce1495d9ffdf4a3cbd5aac..9eed98e3796be6d49dc51af9038a7376c94edeee 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -170,6 +170,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -574,7 +574,7 @@ index 136d1b50f1..9eed98e379 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 9fddbae24c..f4863852b0 100644 +index 9fddbae24c7cb7b24e3899714ced1375b928654f..f4863852b04c5fa55b79acabe40ce59909b9bbbd 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 { @@ -591,7 +591,7 @@ index 9fddbae24c..f4863852b0 100644 public long aa; public long ab; diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 158cc1beb2..29e776ca19 100644 +index 158cc1beb2d6b00642d025a5dd6797c4a20464bd..29e776ca19621b93d5b295d12f0576e6980cf11a 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -614,7 +614,7 @@ index 158cc1beb2..29e776ca19 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ad43b48073..2e1eabba14 100644 +index ad43b48073f5d59e6f6b5b2ec3de8cc9f03f9956..2e1eabba14a3757d03fd90741651001e78c6322f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -70,6 +70,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -635,7 +635,7 @@ index ad43b48073..2e1eabba14 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 be30f6bf6a..ad1dcf5304 100644 +index be30f6bf6a978dfe14af1aca1099cb9a6f7ab443..ad1dcf53040695a1b3194efa92b549172bea56ec 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -769,6 +769,7 @@ public final class CraftServer implements Server { @@ -699,7 +699,7 @@ index be30f6bf6a..ad1dcf5304 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index cb5d0f5378..101d5b42e3 100644 +index cb5d0f5378418655eee2cd68bab8dc39a7b7052b..101d5b42e319c010fd7ed043fb17d1f2289ae38f 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 { @@ -718,7 +718,7 @@ index cb5d0f5378..101d5b42e3 100644 }; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 5fdc9bc711..3cd66886cd 100644 +index 5fdc9bc711295edb325c0417465c69b33200fbe3..3cd66886cdabfa8bcf1e9c8b5a9805d8b53a2eee 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -39,36 +39,36 @@ public class SpigotWorldConfig @@ -764,6 +764,3 @@ index 5fdc9bc711..3cd66886cd 100644 { config.addDefault( "world-settings.default." + path, def ); return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) ); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch index 58a4dd7a02..5484107794 100644 --- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch +++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch @@ -1,11 +1,11 @@ -From 13cf3392bb2bc04fc35a486b7ab5e3a982bd72cc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 19:36:20 -0400 Subject: [PATCH] MC Dev fixes diff --git a/src/main/java/net/minecraft/server/ArraySetSorted.java b/src/main/java/net/minecraft/server/ArraySetSorted.java -index a3afe60b0d..85f799a713 100644 +index a3afe60b0d85cf90bf7a170dc0a0b61a796381a7..85f799a713db0c822d46b689010f9f6bd43f5280 100644 --- a/src/main/java/net/minecraft/server/ArraySetSorted.java +++ b/src/main/java/net/minecraft/server/ArraySetSorted.java @@ -23,11 +23,11 @@ public class ArraySetSorted extends AbstractSet { @@ -50,7 +50,7 @@ index a3afe60b0d..85f799a713 100644 System.arraycopy(this.b, 0, au, 0, this.c); if (au.length > this.c) { diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java -index 960dce2307..253890e537 100644 +index 960dce23072bbb5fad36760677f0fe2efb661552..253890e53702f9ba1c6628cc860a4ca10756626a 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java @@ -54,7 +54,7 @@ public abstract class BiomeBase { @@ -72,7 +72,7 @@ index 960dce2307..253890e537 100644 public List> g() { diff --git a/src/main/java/net/minecraft/server/BlockDataAbstract.java b/src/main/java/net/minecraft/server/BlockDataAbstract.java -index ab03b55682..1cf97cefc9 100644 +index ab03b556823a3daee07cc6a57112d01ee52b677f..1cf97cefc9d113583214f340e72b35d5560d1e5d 100644 --- a/src/main/java/net/minecraft/server/BlockDataAbstract.java +++ b/src/main/java/net/minecraft/server/BlockDataAbstract.java @@ -29,7 +29,7 @@ public abstract class BlockDataAbstract implements IBlockDataHolder { @@ -117,7 +117,7 @@ index ab03b55682..1cf97cefc9 100644 S s0 = this.e.get(iblockstate, v0); diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index e40f9c153b..c88a62f6b7 100644 +index e40f9c153b4f1f8f11ea467e6bd8e670959282d6..c88a62f6b72a8851b95587bb49c898569d74e0c6 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -57,12 +57,12 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -137,7 +137,7 @@ index e40f9c153b..c88a62f6b7 100644 }); } diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java -index 28cfbaae28..1486d460c8 100644 +index 28cfbaae287653d21e06f0017396b937e99fc3ad..1486d460c8ec3d117b4dc3d28b2c3f1b632e187b 100644 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java @@ -20,10 +20,10 @@ public class BlockStateEnum & INamable> extends BlockState @@ -154,7 +154,7 @@ index 28cfbaae28..1486d460c8 100644 if (this.b.containsKey(s1)) { diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java -index 68a601bac5..efdf611e66 100644 +index 68a601bac587294b46a79be6df7ee4e6e38e5f28..efdf611e66ffd782291de749d8a48f3bf08f2129 100644 --- a/src/main/java/net/minecraft/server/ChunkStatus.java +++ b/src/main/java/net/minecraft/server/ChunkStatus.java @@ -84,7 +84,7 @@ public class ChunkStatus { @@ -167,7 +167,7 @@ index 68a601bac5..efdf611e66 100644 for (int j = a().size() - 1; j >= 0; --j) { diff --git a/src/main/java/net/minecraft/server/CraftingManager.java b/src/main/java/net/minecraft/server/CraftingManager.java -index ca9ed57391..f0d7a91fa0 100644 +index ca9ed573914558d51318c713b14665480efdc5bf..f0d7a91fa06632d5731e277a9199aa9804d3a96a 100644 --- a/src/main/java/net/minecraft/server/CraftingManager.java +++ b/src/main/java/net/minecraft/server/CraftingManager.java @@ -63,7 +63,7 @@ public class CraftingManager extends ResourceDataJson { @@ -180,7 +180,7 @@ index ca9ed57391..f0d7a91fa0 100644 CraftingManager.LOGGER.info("Loaded {} recipes", map1.size()); } diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java -index 7d44348c78..73ecdd22ea 100644 +index 7d44348c78b0e468cef5c137d3a69aeb5704d881..73ecdd22ea1157abe00795d90c3e7b748650dbc8 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java +++ b/src/main/java/net/minecraft/server/EntityVindicator.java @@ -25,7 +25,7 @@ public class EntityVindicator extends EntityIllagerAbstract { @@ -193,7 +193,7 @@ index 7d44348c78..73ecdd22ea 100644 this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true)); this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true)); diff --git a/src/main/java/net/minecraft/server/Fluid.java b/src/main/java/net/minecraft/server/Fluid.java -index 035f05e827..7c9ba12862 100644 +index 035f05e82769445f213c225a731db6d95626f6cd..7c9ba128620f54c9cd691d350d1ee225d867fe70 100644 --- a/src/main/java/net/minecraft/server/Fluid.java +++ b/src/main/java/net/minecraft/server/Fluid.java @@ -74,7 +74,7 @@ public interface Fluid extends IBlockDataHolder { @@ -206,7 +206,7 @@ index 035f05e827..7c9ba12862 100644 }).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond))))); } diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java -index 447f6a55b6..1890c760f9 100644 +index 447f6a55b619402447b5cf4db9b22ea8cfc7d51d..1890c760f9ffd7628d6ae3db40c36f5272379227 100644 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java @@ -55,7 +55,7 @@ public abstract class IAsyncTaskHandler implements Mailbox implements @@ -276,7 +276,7 @@ index 3be9efd22c..3a1ad2346b 100644 for (i = 0; i < k; ++i) { diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index 534e70671a..d5c284cdd1 100644 +index 534e70671a624e58ed98df9dd62bd7f5ffdf91af..d5c284cdd10d33f5f1b7f456d6a384a44eafb139 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -47,7 +47,7 @@ public interface IEntityAccess { @@ -337,7 +337,7 @@ index 534e70671a..d5c284cdd1 100644 if (pathfindertargetcondition.a(entityliving, t0)) { list1.add(t0); diff --git a/src/main/java/net/minecraft/server/IOWorker.java b/src/main/java/net/minecraft/server/IOWorker.java -index a986f2912f..c5658c0779 100644 +index a986f2912fc04a7fdd49d648cbcd570464597937..c5658c0779b0e0d51fd4921456b6fef0711d7be3 100644 --- a/src/main/java/net/minecraft/server/IOWorker.java +++ b/src/main/java/net/minecraft/server/IOWorker.java @@ -46,7 +46,7 @@ public class IOWorker implements AutoCloseable { @@ -377,7 +377,7 @@ index a986f2912f..c5658c0779 100644 IOWorker.LOGGER.error("Failed to close storage", exception); this.h.completeExceptionally(exception); diff --git a/src/main/java/net/minecraft/server/LightEngineStorageSky.java b/src/main/java/net/minecraft/server/LightEngineStorageSky.java -index 1e1f7ec6e6..75d9065b32 100644 +index 1e1f7ec6e6e6fc698a8a5118ce21321d104dc5eb..75d9065b32731dc635d9d09c48fb9643172381a9 100644 --- a/src/main/java/net/minecraft/server/LightEngineStorageSky.java +++ b/src/main/java/net/minecraft/server/LightEngineStorageSky.java @@ -28,10 +28,10 @@ public class LightEngineStorageSky extends LightEngineStorage= l) { diff --git a/src/main/java/net/minecraft/server/LootSelectorEntry.java b/src/main/java/net/minecraft/server/LootSelectorEntry.java -index 59bb535431..3ed6a1e785 100644 +index 59bb53543113660cd2514350a24a4908a8464f24..3ed6a1e785f68c4bb6c5afe024c43150915968a3 100644 --- a/src/main/java/net/minecraft/server/LootSelectorEntry.java +++ b/src/main/java/net/minecraft/server/LootSelectorEntry.java @@ -125,7 +125,7 @@ public abstract class LootSelectorEntry extends LootEntryAbstract { @@ -422,7 +422,7 @@ index 59bb535431..3ed6a1e785 100644 } diff --git a/src/main/java/net/minecraft/server/NBTBase.java b/src/main/java/net/minecraft/server/NBTBase.java -index 829a7ae0a2..8b9e47b4c7 100644 +index 829a7ae0a2b77205fb8e8c5754d0d4333afa224d..8b9e47b4c7f5dc464fa617a59583df9e30a54045 100644 --- a/src/main/java/net/minecraft/server/NBTBase.java +++ b/src/main/java/net/minecraft/server/NBTBase.java @@ -18,7 +18,7 @@ public interface NBTBase { @@ -435,7 +435,7 @@ index 829a7ae0a2..8b9e47b4c7 100644 default String asString() { return this.toString(); diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java -index 22035b6c0b..5406f4c40f 100644 +index 22035b6c0b76687404e4df92f5796dbf244c50bc..5406f4c40f86e74f8ed4e7e986b23d19141ddc30 100644 --- a/src/main/java/net/minecraft/server/NBTTagList.java +++ b/src/main/java/net/minecraft/server/NBTTagList.java @@ -51,7 +51,7 @@ public class NBTTagList extends NBTList { @@ -448,7 +448,7 @@ index 22035b6c0b..5406f4c40f 100644 private byte type; diff --git a/src/main/java/net/minecraft/server/NextTickListEntry.java b/src/main/java/net/minecraft/server/NextTickListEntry.java -index 8471920b8b..e9c405fb53 100644 +index 8471920b8b92f0bbd0d3ee827e1b0a120f405f6c..e9c405fb5376c5733b9b0191cd5309173f4021e8 100644 --- a/src/main/java/net/minecraft/server/NextTickListEntry.java +++ b/src/main/java/net/minecraft/server/NextTickListEntry.java @@ -37,13 +37,13 @@ public class NextTickListEntry { @@ -470,7 +470,7 @@ index 8471920b8b..e9c405fb53 100644 } diff --git a/src/main/java/net/minecraft/server/RegionFileSection.java b/src/main/java/net/minecraft/server/RegionFileSection.java -index 737afc7d71..db9f0196bd 100644 +index 737afc7d71f415e942602efb4bd91fba6c6baa72..db9f0196bda4c987de6cf63eea437b7154d47b57 100644 --- a/src/main/java/net/minecraft/server/RegionFileSection.java +++ b/src/main/java/net/minecraft/server/RegionFileSection.java @@ -83,9 +83,9 @@ public class RegionFileSection implements AutoC @@ -495,7 +495,7 @@ index 737afc7d71..db9f0196bd 100644 }, dynamic2); }); diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java -index 7f89562e90..4efcb8b595 100644 +index 7f89562e90ede1bdd06b71c0798d986ccbb7886e..4efcb8b595750891b421e524812542f0f67e9f3f 100644 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java @@ -27,7 +27,7 @@ public class RegistryBlockID implements Registry { @@ -508,7 +508,7 @@ index 7f89562e90..4efcb8b595 100644 this.c.set(i, t0); diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java -index 4cb78c6a3f..e15d286710 100644 +index 4cb78c6a3feb15eb15f76f967e724829655e8617..e15d286710ed66a01bfb6b60f8735b837efb3fd7 100644 --- a/src/main/java/net/minecraft/server/RegistryID.java +++ b/src/main/java/net/minecraft/server/RegistryID.java @@ -17,9 +17,9 @@ public class RegistryID implements Registry { @@ -536,7 +536,7 @@ index 4cb78c6a3f..e15d286710 100644 this.f = 0; diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java -index 8534585eb1..7b92ecfff9 100644 +index 8534585eb17cd46f1e392d8f09bb671abe27ef52..7b92ecfff94e3c4a69269139ebed75fc59bbd4f1 100644 --- a/src/main/java/net/minecraft/server/SystemUtils.java +++ b/src/main/java/net/minecraft/server/SystemUtils.java @@ -45,8 +45,8 @@ public class SystemUtils { @@ -580,7 +580,7 @@ index 8534585eb1..7b92ecfff9 100644 if (throwable != null) { completablefuture.completeExceptionally(throwable); diff --git a/src/main/java/net/minecraft/server/ThreadedMailbox.java b/src/main/java/net/minecraft/server/ThreadedMailbox.java -index 8dbb33e749..8082569022 100644 +index 8dbb33e749a282ab1e41bfdc616a22744dc7b162..8082569022384a3ba03fb4a6f1ae12b443598dcb 100644 --- a/src/main/java/net/minecraft/server/ThreadedMailbox.java +++ b/src/main/java/net/minecraft/server/ThreadedMailbox.java @@ -83,7 +83,7 @@ public class ThreadedMailbox implements Mailbox, AutoCloseable, Runnable { @@ -593,7 +593,7 @@ index 8dbb33e749..8082569022 100644 }); } finally { diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java -index ee2059cf8e..77bb6b092a 100644 +index ee2059cf8ef0a0372e02b91a4bf6fa8a0ab31bca..77bb6b092a0763ff27f90f0401a8a81b15aebb8c 100644 --- a/src/main/java/net/minecraft/server/Ticket.java +++ b/src/main/java/net/minecraft/server/Ticket.java @@ -23,7 +23,7 @@ public final class Ticket implements Comparable> { @@ -606,7 +606,7 @@ index ee2059cf8e..77bb6b092a 100644 } diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java -index c137484f66..c999f8c9bf 100644 +index c137484f66a022f7f4581d0657210d60c619c5fa..c999f8c9bf8a59e19b3d6d1b7ad8b5fb6e48b928 100644 --- a/src/main/java/net/minecraft/server/VillagePlace.java +++ b/src/main/java/net/minecraft/server/VillagePlace.java @@ -165,7 +165,7 @@ public class VillagePlace extends RegionFileSection { @@ -637,7 +637,7 @@ index c137484f66..c999f8c9bf 100644 } diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java -index a06a31534e..3bcf0b385d 100644 +index a06a31534e5bdfddcd3914f68e5b60ae0ec43117..3bcf0b385d1f707176dae9c3ee49370e2e6dd481 100644 --- a/src/main/java/net/minecraft/server/VillagerTrades.java +++ b/src/main/java/net/minecraft/server/VillagerTrades.java @@ -15,12 +15,12 @@ import javax.annotation.Nullable; @@ -657,7 +657,7 @@ index a06a31534e..3bcf0b385d 100644 hashmap.put(VillagerProfession.CLERIC, a(ImmutableMap.of(1, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.ROTTEN_FLESH, 32, 16, 2), new VillagerTrades.h(Items.REDSTONE, 1, 2, 1)}, 2, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.GOLD_INGOT, 3, 12, 10), new VillagerTrades.h(Items.LAPIS_LAZULI, 1, 1, 5)}, 3, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.RABBIT_FOOT, 2, 12, 20), new VillagerTrades.h(Blocks.GLOWSTONE, 4, 1, 12, 10)}, 4, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.SCUTE, 4, 12, 30), new VillagerTrades.b(Items.GLASS_BOTTLE, 9, 12, 30), new VillagerTrades.h(Items.ENDER_PEARL, 5, 1, 15)}, 5, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.NETHER_WART, 22, 12, 30), new VillagerTrades.h(Items.EXPERIENCE_BOTTLE, 3, 1, 30)}))); hashmap.put(VillagerProfession.ARMORER, a(ImmutableMap.of(1, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.COAL, 15, 16, 2), new VillagerTrades.h(new ItemStack(Items.IRON_LEGGINGS), 7, 1, 12, 1, 0.2F), new VillagerTrades.h(new ItemStack(Items.IRON_BOOTS), 4, 1, 12, 1, 0.2F), new VillagerTrades.h(new ItemStack(Items.IRON_HELMET), 5, 1, 12, 1, 0.2F), new VillagerTrades.h(new ItemStack(Items.IRON_CHESTPLATE), 9, 1, 12, 1, 0.2F)}, 2, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.IRON_INGOT, 4, 12, 10), new VillagerTrades.h(new ItemStack(Items.pQ), 36, 1, 12, 5, 0.2F), new VillagerTrades.h(new ItemStack(Items.CHAINMAIL_BOOTS), 1, 1, 12, 5, 0.2F), new VillagerTrades.h(new ItemStack(Items.CHAINMAIL_LEGGINGS), 3, 1, 12, 5, 0.2F)}, 3, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.LAVA_BUCKET, 1, 12, 20), new VillagerTrades.b(Items.DIAMOND, 1, 12, 20), new VillagerTrades.h(new ItemStack(Items.CHAINMAIL_HELMET), 1, 1, 12, 10, 0.2F), new VillagerTrades.h(new ItemStack(Items.CHAINMAIL_CHESTPLATE), 4, 1, 12, 10, 0.2F), new VillagerTrades.h(new ItemStack(Items.SHIELD), 5, 1, 12, 10, 0.2F)}, 4, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.e(Items.DIAMOND_LEGGINGS, 14, 3, 15, 0.2F), new VillagerTrades.e(Items.DIAMOND_BOOTS, 8, 3, 15, 0.2F)}, 5, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.e(Items.DIAMOND_HELMET, 8, 3, 30, 0.2F), new VillagerTrades.e(Items.DIAMOND_CHESTPLATE, 16, 3, 30, 0.2F)}))); diff --git a/src/main/java/net/minecraft/server/VoxelShapeMergerList.java b/src/main/java/net/minecraft/server/VoxelShapeMergerList.java -index e8daa74986..71d2ae2a9c 100644 +index e8daa74986f07163fd5318f431398b4f0efde6e8..71d2ae2a9c5a05351241b5a313e66ca15b0624ef 100644 --- a/src/main/java/net/minecraft/server/VoxelShapeMergerList.java +++ b/src/main/java/net/minecraft/server/VoxelShapeMergerList.java @@ -38,7 +38,7 @@ public final class VoxelShapeMergerList implements VoxelShapeMerger { @@ -670,7 +670,7 @@ index e8daa74986..71d2ae2a9c 100644 this.c.add(j - 1); this.a.add(d1); diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java -index 555cf6be79..22e14fe1e9 100644 +index 555cf6be79985b686eb71cffe25453648f4cbc17..22e14fe1e98c8439f8db74c9464137a497fdaf7c 100644 --- a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java +++ b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java @@ -40,6 +40,6 @@ public class WorldGenFeatureStateProviderWeighted extends WorldGenFeatureStatePr @@ -682,7 +682,7 @@ index 555cf6be79..22e14fe1e9 100644 } } diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java -index 55fe7625af..19e68a7831 100644 +index 55fe7625af2207062f69188e9ab345ea68fac6ca..19e68a78310de787bca701bc2597c64e34a77d7c 100644 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java @@ -37,7 +37,7 @@ public class WorldPersistentData { @@ -712,6 +712,3 @@ index 55fe7625af..19e68a7831 100644 NBTTagCompound nbttagcompound = this.a(s, SharedConstants.getGameVersion().getWorldVersion()); t0.a(nbttagcompound.getCompound("data")); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch index 9840bc2b28..ce97c2d283 100644 --- a/Spigot-Server-Patches/0004-MC-Utils.patch +++ b/Spigot-Server-Patches/0004-MC-Utils.patch @@ -1,4 +1,4 @@ -From f36561fd1ff52fcd5c3c9d9b328a99ea5b607bfd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:55:47 -0400 Subject: [PATCH] MC Utils @@ -6,7 +6,7 @@ Subject: [PATCH] MC Utils diff --git a/src/main/java/com/destroystokyo/paper/util/concurrent/WeakSeqLock.java b/src/main/java/com/destroystokyo/paper/util/concurrent/WeakSeqLock.java new file mode 100644 -index 00000000000..4029dc68cf3 +index 0000000000000000000000000000000000000000..4029dc68cf35d63aa70c4a76c35bf65a7fc6358f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/concurrent/WeakSeqLock.java @@ -0,0 +1,68 @@ @@ -80,7 +80,7 @@ index 00000000000..4029dc68cf3 +} diff --git a/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Int.java b/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Int.java new file mode 100644 -index 00000000000..59868f37d14 +index 0000000000000000000000000000000000000000..59868f37d14bbc0ece0836095cdad148778995e6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Int.java @@ -0,0 +1,162 @@ @@ -248,7 +248,7 @@ index 00000000000..59868f37d14 +} diff --git a/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Object.java b/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Object.java new file mode 100644 -index 00000000000..7bab31a3124 +index 0000000000000000000000000000000000000000..7bab31a312463cc963d9621cdc543a281459bd32 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Object.java @@ -0,0 +1,202 @@ @@ -456,7 +456,7 @@ index 00000000000..7bab31a3124 +} diff --git a/src/main/java/com/destroystokyo/paper/util/maplist/ChunkList.java b/src/main/java/com/destroystokyo/paper/util/maplist/ChunkList.java new file mode 100644 -index 00000000000..4eac0577862 +index 0000000000000000000000000000000000000000..4eac0577862450e0e3299f5579f9ff6759b0256d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/maplist/ChunkList.java @@ -0,0 +1,129 @@ @@ -591,7 +591,7 @@ index 00000000000..4eac0577862 +} diff --git a/src/main/java/com/destroystokyo/paper/util/maplist/EntityList.java b/src/main/java/com/destroystokyo/paper/util/maplist/EntityList.java new file mode 100644 -index 00000000000..cdda74564ce +index 0000000000000000000000000000000000000000..cdda74564ced196ae577a64782236c2bfe36e433 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/maplist/EntityList.java @@ -0,0 +1,128 @@ @@ -725,7 +725,7 @@ index 00000000000..cdda74564ce +} diff --git a/src/main/java/com/destroystokyo/paper/util/maplist/IBlockDataList.java b/src/main/java/com/destroystokyo/paper/util/maplist/IBlockDataList.java new file mode 100644 -index 00000000000..84ef8d9ecab +index 0000000000000000000000000000000000000000..84ef8d9ecab4745a90504718f803110b9e2dbf65 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/maplist/IBlockDataList.java @@ -0,0 +1,128 @@ @@ -859,7 +859,7 @@ index 00000000000..84ef8d9ecab +} diff --git a/src/main/java/com/destroystokyo/paper/util/math/IntegerUtil.java b/src/main/java/com/destroystokyo/paper/util/math/IntegerUtil.java new file mode 100644 -index 00000000000..c3b936f54b3 +index 0000000000000000000000000000000000000000..c3b936f54b3fff418c265639ef223292ccc89356 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/math/IntegerUtil.java @@ -0,0 +1,230 @@ @@ -1095,7 +1095,7 @@ index 00000000000..c3b936f54b3 +} diff --git a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java new file mode 100644 -index 00000000000..c71ed118345 +index 0000000000000000000000000000000000000000..c71ed11834557f71504de5038d3bb593824f6f95 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java @@ -0,0 +1,439 @@ @@ -1540,7 +1540,7 @@ index 00000000000..c71ed118345 +} diff --git a/src/main/java/com/destroystokyo/paper/util/misc/DistanceTrackingAreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/DistanceTrackingAreaMap.java new file mode 100644 -index 00000000000..3f86c1ad437 +index 0000000000000000000000000000000000000000..3f86c1ad43782bdc56be6c0eca053311e51228ca --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/misc/DistanceTrackingAreaMap.java @@ -0,0 +1,175 @@ @@ -1721,7 +1721,7 @@ index 00000000000..3f86c1ad437 +} diff --git a/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java new file mode 100644 -index 00000000000..8a552a87abf +index 0000000000000000000000000000000000000000..8a552a87abf5cc6fc0e10bf93de3cf8168d57cb5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java @@ -0,0 +1,27 @@ @@ -1754,7 +1754,7 @@ index 00000000000..8a552a87abf +} diff --git a/src/main/java/com/destroystokyo/paper/util/misc/PlayerDistanceTrackingAreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/PlayerDistanceTrackingAreaMap.java new file mode 100644 -index 00000000000..0292afc5224 +index 0000000000000000000000000000000000000000..0292afc5224326b767bd56d0718c215c184f2e0f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/misc/PlayerDistanceTrackingAreaMap.java @@ -0,0 +1,24 @@ @@ -1784,7 +1784,7 @@ index 00000000000..0292afc5224 +} diff --git a/src/main/java/com/destroystokyo/paper/util/misc/PooledLinkedHashSets.java b/src/main/java/com/destroystokyo/paper/util/misc/PooledLinkedHashSets.java new file mode 100644 -index 00000000000..e51104e65a0 +index 0000000000000000000000000000000000000000..e51104e65a07b6ea7bbbcbb6afb066ef6401cc5b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/misc/PooledLinkedHashSets.java @@ -0,0 +1,287 @@ @@ -2077,7 +2077,7 @@ index 00000000000..e51104e65a0 +} diff --git a/src/main/java/com/destroystokyo/paper/util/pooled/PooledObjects.java b/src/main/java/com/destroystokyo/paper/util/pooled/PooledObjects.java new file mode 100644 -index 00000000000..d4325f1f115 +index 0000000000000000000000000000000000000000..d4325f1f1152e34f82046dfe24cbe505f6e316ae --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/pooled/PooledObjects.java @@ -0,0 +1,185 @@ @@ -2268,7 +2268,7 @@ index 00000000000..d4325f1f115 +} diff --git a/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java b/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java new file mode 100644 -index 00000000000..9df0006c1a2 +index 0000000000000000000000000000000000000000..9df0006c1a283f77c4d01d9fce9062fc1c9bbb1f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java @@ -0,0 +1,67 @@ @@ -2340,7 +2340,7 @@ index 00000000000..9df0006c1a2 + } +} diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java -index 4f60b931a14..f427953a83c 100644 +index 4f60b931a143ebf70a8469913ec445ff13da4d8d..f427953a83c4712dc490bd76e07aaaa0381ff17c 100644 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java @@ -186,6 +186,7 @@ public class AxisAlignedBB { @@ -2352,7 +2352,7 @@ index 4f60b931a14..f427953a83c 100644 return this.a(axisalignedbb.minX, axisalignedbb.minY, axisalignedbb.minZ, axisalignedbb.maxX, axisalignedbb.maxY, axisalignedbb.maxZ); } diff --git a/src/main/java/net/minecraft/server/BlockAccessAir.java b/src/main/java/net/minecraft/server/BlockAccessAir.java -index eff6ebcd30b..30cbfc8eac2 100644 +index eff6ebcd30b538cbaedaa031a46a59ea956253ba..30cbfc8eac20910aa55951e3dce63862f5a43c37 100644 --- a/src/main/java/net/minecraft/server/BlockAccessAir.java +++ b/src/main/java/net/minecraft/server/BlockAccessAir.java @@ -14,6 +14,18 @@ public enum BlockAccessAir implements IBlockAccess { @@ -2375,7 +2375,7 @@ index eff6ebcd30b..30cbfc8eac2 100644 public IBlockData getType(BlockPosition blockposition) { return Blocks.AIR.getBlockData(); diff --git a/src/main/java/net/minecraft/server/BlockDataAbstract.java b/src/main/java/net/minecraft/server/BlockDataAbstract.java -index 1cf97cefc9d..2040f183490 100644 +index 1cf97cefc9d113583214f340e72b35d5560d1e5d..2040f183490d515b913df048ae8ab07bbecaa9a4 100644 --- a/src/main/java/net/minecraft/server/BlockDataAbstract.java +++ b/src/main/java/net/minecraft/server/BlockDataAbstract.java @@ -78,6 +78,7 @@ public abstract class BlockDataAbstract implements IBlockDataHolder { @@ -2387,7 +2387,7 @@ index 1cf97cefc9d..2040f183490 100644 return this.d.containsKey(iblockstate); } diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index c88a62f6b72..f8ac39e1b01 100644 +index c88a62f6b72a8851b95587bb49c898569d74e0c6..f8ac39e1b019b0918996f745d99f6ed09db0fd11 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -120,6 +120,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -2450,7 +2450,7 @@ index c88a62f6b72..f8ac39e1b01 100644 this.d = i; } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 55373cae078..b39ce329aa0 100644 +index 55373cae078ddaf6c7c974abf59183698f669c24..b39ce329aa0b2e8da679a7b658f707f1da1f1a99 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -25,7 +25,7 @@ import org.apache.logging.log4j.Logger; @@ -2681,7 +2681,7 @@ index 55373cae078..b39ce329aa0 100644 // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java -index 11c4d23ba98..53c15c1c0bf 100644 +index 11c4d23ba988dac5f3fd85142083c77fb603e673..53c15c1c0bf2d902e6b0325e0964f88f6d5fd6a5 100644 --- a/src/main/java/net/minecraft/server/ChunkCache.java +++ b/src/main/java/net/minecraft/server/ChunkCache.java @@ -8,7 +8,7 @@ public class ChunkCache implements IBlockAccess, ICollisionAccess { @@ -2715,7 +2715,7 @@ index 11c4d23ba98..53c15c1c0bf 100644 @Override public TileEntity getTileEntity(BlockPosition blockposition) { diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java -index 260644bf0be..f2a19acd845 100644 +index 260644bf0be4c5b2d96033f11382f88231048ce3..f2a19acd84561e746bfc8da0331b5d4055e95327 100644 --- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java +++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java @@ -31,7 +31,9 @@ public class ChunkCoordIntPair { @@ -2730,7 +2730,7 @@ index 260644bf0be..f2a19acd845 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 32c496fa88e..ba2af2abe2d 100644 +index 32c496fa88eb1426ab4996fa1bd9803f60648267..ba2af2abe2dd09eb6801f431a0942bd93755c97e 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 { @@ -2963,7 +2963,7 @@ index 32c496fa88e..ba2af2abe2d 100644 @Override public IChunkAccess getChunkAt(int i, int j, ChunkStatus chunkstatus, boolean flag) { diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index 652067757a6..638b0e39798 100644 +index 652067757a6b9510b19c339072f1f4183e8d64b6..638b0e39798a3f75566fcf9ea48b81024e60b471 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -132,6 +132,7 @@ public class ChunkSection { @@ -2975,7 +2975,7 @@ index 652067757a6..638b0e39798 100644 packetdataserializer.writeShort(this.nonEmptyBlockCount); this.blockIds.b(packetdataserializer); diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java -index 7ca3a1d0c59..2edd9b87146 100644 +index 7ca3a1d0c592df0038953c9fd81783f9bb5c8beb..2edd9b87146a3d1b6623b0efb17b28b524f18c2f 100644 --- a/src/main/java/net/minecraft/server/DataBits.java +++ b/src/main/java/net/minecraft/server/DataBits.java @@ -83,6 +83,7 @@ public class DataBits { @@ -2987,7 +2987,7 @@ index 7ca3a1d0c59..2edd9b87146 100644 return this.a; } diff --git a/src/main/java/net/minecraft/server/DataPalette.java b/src/main/java/net/minecraft/server/DataPalette.java -index 75ba6988687..45403fbe308 100644 +index 75ba69886872f737ff102cb68ec229feb268f94a..45403fbe308cbc6192536d5df606cf8643a65e13 100644 --- a/src/main/java/net/minecraft/server/DataPalette.java +++ b/src/main/java/net/minecraft/server/DataPalette.java @@ -4,10 +4,12 @@ import javax.annotation.Nullable; @@ -3004,7 +3004,7 @@ index 75ba6988687..45403fbe308 100644 T a(int i); diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index 774a8f54342..d5f5a51872d 100644 +index 774a8f543424853be5fc8c0367d734ddf196d7f9..d5f5a51872dfabdbb828b6c20d61893aed2efec7 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -11,7 +11,7 @@ import java.util.stream.Collectors; @@ -3046,7 +3046,7 @@ index 774a8f54342..d5f5a51872d 100644 this.a(); packetdataserializer.writeByte(this.i); diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java -index fe69161e5b9..b40c8d2f83a 100644 +index fe69161e5b9e69c75696a3434a681d0489f3863e..b40c8d2f83a80bcb8925632a1e7d6bb4cc0caebf 100644 --- a/src/main/java/net/minecraft/server/EntityCreature.java +++ b/src/main/java/net/minecraft/server/EntityCreature.java @@ -6,6 +6,8 @@ import org.bukkit.event.entity.EntityUnleashEvent; @@ -3059,7 +3059,7 @@ index fe69161e5b9..b40c8d2f83a 100644 super(entitytypes, world); } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index bdfb1738539..0b06fa2b664 100644 +index bdfb1738539d0e0c9043ecb63950a5e7fce1c532..0b06fa2b664830d40cdb93968bc2f8c98415d1bf 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -146,6 +146,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -3071,7 +3071,7 @@ index bdfb1738539..0b06fa2b664 100644 // CraftBukkit start - fire event setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 9d1adaaa2c0..3ace8ee854c 100644 +index 9d1adaaa2c0dbd3773f81a1b54aac98fd16ae26d..3ace8ee854c11abd607dc27b93fe61a0982a73de 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -129,6 +129,7 @@ public abstract class EntityLiving extends Entity { @@ -3083,7 +3083,7 @@ index 9d1adaaa2c0..3ace8ee854c 100644 @Override public float getBukkitYaw() { diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java -index 00c3b666d7b..e5322fbae51 100644 +index 00c3b666d7b568f1619d885de6ca7ab2ce0daa7a..e5322fbae5140ce784dad49b690767af8c52ce1c 100644 --- a/src/main/java/net/minecraft/server/EntityMonster.java +++ b/src/main/java/net/minecraft/server/EntityMonster.java @@ -5,6 +5,7 @@ import java.util.function.Predicate; @@ -3095,7 +3095,7 @@ index 00c3b666d7b..e5322fbae51 100644 super(entitytypes, world); this.f = 5; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 541ddc928b9..26e32aa1dbd 100644 +index 541ddc928b9a4e6a7bf5c6a4f64d78422d241d90..26e32aa1dbd6de0ba971c32f8daef0d92d65b683 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -87,6 +87,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -3117,7 +3117,7 @@ index 541ddc928b9..26e32aa1dbd 100644 this.displayName = this.getName(); this.canPickUpLoot = true; diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 29e776ca196..4328273b1fc 100644 +index 29e776ca19621b93d5b295d12f0576e6980cf11a..4328273b1fca165320097dbac0650b31fae4e5ca 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -4,6 +4,7 @@ import com.mojang.datafixers.DataFixUtils; @@ -3140,7 +3140,7 @@ index 29e776ca196..4328273b1fc 100644 } diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java -index 1890c760f9f..7e5ece9d50a 100644 +index 1890c760f9ffd7628d6ae3db40c36f5272379227..7e5ece9d50af7151ad4cc084e3680dae41ac92be 100644 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java @@ -68,6 +68,15 @@ public abstract class IAsyncTaskHandler implements Mailbox h = new CompletableFuture(); diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java -index ba315131e16..cbe2aa4c0ac 100644 +index ba315131e1633ce8b9b8824b00d2be47950d6f19..cbe2aa4c0acbdcc0b453fdad9a192a3e264406c6 100644 --- a/src/main/java/net/minecraft/server/IWorldReader.java +++ b/src/main/java/net/minecraft/server/IWorldReader.java @@ -4,6 +4,7 @@ import javax.annotation.Nullable; @@ -3214,7 +3214,7 @@ index ba315131e16..cbe2aa4c0ac 100644 IChunkAccess getChunkAt(int i, int j, ChunkStatus chunkstatus, boolean flag); diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 75308712d06..aa7501d366b 100644 +index 75308712d0642d5ab168de653023349df8aee5ed..aa7501d366b15e7f7f64b7d98a1dccff99f731d2 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -37,10 +37,19 @@ import org.bukkit.event.world.StructureGrowEvent; @@ -3274,7 +3274,7 @@ index 75308712d06..aa7501d366b 100644 // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java new file mode 100644 -index 00000000000..9fb9a96ccb3 +index 0000000000000000000000000000000000000000..9fb9a96ccb37f5c7f39403e24e7b3bdb9279fe81 --- /dev/null +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -0,0 +1,414 @@ @@ -3693,7 +3693,7 @@ index 00000000000..9fb9a96ccb3 + } +} diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java -index e85b24a327f..75604dbc69d 100644 +index e85b24a327fb0a17ed28ed3c90cd039c2bdbed6a..75604dbc69d0a416dc9d56ae3f795ed03e120af8 100644 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java @@ -60,7 +60,7 @@ public class NBTTagCompound implements NBTBase { @@ -3722,7 +3722,7 @@ index e85b24a327f..75604dbc69d 100644 return new UUID(this.getLong(s + "Most"), this.getLong(s + "Least")); } diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 6700582e362..3ccf1663669 100644 +index 6700582e362b3ff2e0aa4a203981f75de0f22d89..3ccf1663669c79a63a6b3a9f6dc17a6e25e91915 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -159,6 +159,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -3754,7 +3754,7 @@ index 6700582e362..3ccf1663669 100644 public QueuedPacket(Packet packet, @Nullable GenericFutureListener> genericfuturelistener) { this.a = packet; diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java -index 81b6f4581f8..d9574a9ace9 100644 +index 81b6f4581f8e4d956668535a44342f991d677267..d9574a9ace96d8c5666e62a5aed96a67021b91d8 100644 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java @@ -33,6 +33,7 @@ public class PacketDataSerializer extends ByteBuf { @@ -3766,7 +3766,7 @@ index 81b6f4581f8..d9574a9ace9 100644 for (int j = 1; j < 5; ++j) { if ((i & -1 << j * 7) == 0) { diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java -index 90223deae33..63c4dbd327b 100644 +index 90223deae3376fd6828eddf3831dab96650afef2..63c4dbd327beb7b6ab42eb44650d68accd3b0de6 100644 --- a/src/main/java/net/minecraft/server/PacketEncoder.java +++ b/src/main/java/net/minecraft/server/PacketEncoder.java @@ -42,6 +42,7 @@ public class PacketEncoder extends MessageToByteEncoder> { @@ -3778,7 +3778,7 @@ index 90223deae33..63c4dbd327b 100644 throw new SkipEncodeException(throwable); } else { diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 677e3e5f687..3a1d0deb0de 100644 +index 677e3e5f687e81ffb6c6aec134e2a19b90bd61cf..3a1d0deb0dec880d73185690e2a7c769a2731479 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -17,7 +17,7 @@ public class PacketPlayOutMapChunk implements Packet { @@ -3799,7 +3799,7 @@ index 677e3e5f687..3a1d0deb0de 100644 int j = 0; ChunkSection[] achunksection = chunk.getSections(); diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 5c5bf010d07..6e9f402fb0f 100644 +index 5c5bf010d07b65f1328541843b0f24ce5d50e6ac..6e9f402fb0faccc222b4289deb36e2d85a66eb7c 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -19,9 +19,9 @@ public class PlayerChunk { @@ -3989,7 +3989,7 @@ index 5c5bf010d07..6e9f402fb0f 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 7ad30548e2a..b5052445163 100644 +index 7ad30548e2ad221494d6870b0b3a08e1d2f3ed06..b505244516321292e56609eaa54693d84e0bf617 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -99,6 +99,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -4062,7 +4062,7 @@ index 7ad30548e2a..b5052445163 100644 @Override diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 0c496ee0a04..6a681d694e7 100644 +index 0c496ee0a04da4f0523f6e629f26e99c490f171a..6a681d694e76fa6f38d00ee7bae67762f3e5c34f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -67,9 +67,9 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -4079,7 +4079,7 @@ index 0c496ee0a04..6a681d694e7 100644 private volatile int chatThrottle; private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle"); diff --git a/src/main/java/net/minecraft/server/PlayerInventory.java b/src/main/java/net/minecraft/server/PlayerInventory.java -index 08768a3c877..d103cfaace4 100644 +index 08768a3c877bfe26c2a9533af390068b172a5996..d103cfaace4f42aaad677103f4eef578490699da 100644 --- a/src/main/java/net/minecraft/server/PlayerInventory.java +++ b/src/main/java/net/minecraft/server/PlayerInventory.java @@ -17,7 +17,7 @@ public class PlayerInventory implements IInventory, INamableTileEntity { @@ -4092,7 +4092,7 @@ index 08768a3c877..d103cfaace4 100644 public final EntityHuman player; private ItemStack carried; diff --git a/src/main/java/net/minecraft/server/PotionUtil.java b/src/main/java/net/minecraft/server/PotionUtil.java -index b3824898daa..bf4172be525 100644 +index b3824898daa80da791cdc8cfd06900e9a0b3b5b5..bf4172be525d5bdd7c152117afce8bf00106a139 100644 --- a/src/main/java/net/minecraft/server/PotionUtil.java +++ b/src/main/java/net/minecraft/server/PotionUtil.java @@ -110,6 +110,7 @@ public class PotionUtil { @@ -4104,7 +4104,7 @@ index b3824898daa..bf4172be525 100644 MinecraftKey minecraftkey = IRegistry.POTION.getKey(potionregistry); diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java -index 6e65306a275..39339fa2755 100644 +index 6e65306a275fe91ce82b28e4e6155f91dceaa3f2..39339fa27551b06a9bfd8ea67b1ec8c66726f488 100644 --- a/src/main/java/net/minecraft/server/ProtoChunk.java +++ b/src/main/java/net/minecraft/server/ProtoChunk.java @@ -80,6 +80,18 @@ public class ProtoChunk implements IChunkAccess { @@ -4127,7 +4127,7 @@ index 6e65306a275..39339fa2755 100644 public IBlockData getType(BlockPosition blockposition) { int i = blockposition.getY(); diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index 7b6e0e86b00..187c4e0f58b 100644 +index 7b6e0e86b00c7750267f0090b79b738696f115c4..187c4e0f58b7de58dfd2194afb194cbed0a58957 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -88,6 +88,7 @@ public class RegionFile implements AutoCloseable { @@ -4139,7 +4139,7 @@ index 7b6e0e86b00..187c4e0f58b 100644 public synchronized DataInputStream a(ChunkCoordIntPair chunkcoordintpair) throws IOException { int i = this.getOffset(chunkcoordintpair); diff --git a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java -index 8c123f265e6..9d0e8c2d43b 100644 +index 8c123f265e674ca99bc06e4d64f212148f6cac1a..9d0e8c2d43ba56d53bc30c0a3e2d7d170d8be474 100644 --- a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java +++ b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java @@ -108,6 +108,26 @@ public class RegionLimitedWorldAccess implements GeneratorAccess { @@ -4170,7 +4170,7 @@ index 8c123f265e6..9d0e8c2d43b 100644 public IBlockData getType(BlockPosition blockposition) { return this.getChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4).getType(blockposition); diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java -index 4efcb8b5957..60948afa4ea 100644 +index 4efcb8b595750891b421e524812542f0f67e9f3f..60948afa4ead71010dc27c7cef3e5acdb0ba005a 100644 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java @@ -57,6 +57,7 @@ public class RegistryBlockID implements Registry { @@ -4182,7 +4182,7 @@ index 4efcb8b5957..60948afa4ea 100644 return this.b.size(); } diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java -index 7b92ecfff94..7e224ebeff3 100644 +index 7b92ecfff94e3c4a69269139ebed75fc59bbd4f1..7e224ebeff3bf34270df173a47b08d3290c00670 100644 --- a/src/main/java/net/minecraft/server/SystemUtils.java +++ b/src/main/java/net/minecraft/server/SystemUtils.java @@ -58,7 +58,7 @@ public class SystemUtils { @@ -4195,7 +4195,7 @@ index 7b92ecfff94..7e224ebeff3 100644 public static long getTimeMillis() { diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java -index f82db93f882..75ab9f185b3 100644 +index f82db93f88223ffddc55deec8f21efc5b774d900..75ab9f185b3231113dfa387c956a707b403bb2db 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 { @@ -4207,7 +4207,7 @@ index f82db93f882..75ab9f185b3 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 2e1eabba14a..2a4fa455ff3 100644 +index 2e1eabba14a3757d03fd90741651001e78c6322f..2a4fa455ff3065f9b1ad9bcf8d236bbb6f830bc9 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 @@ -4271,7 +4271,7 @@ index 2e1eabba14a..2a4fa455ff3 100644 return this.setTypeAndData(blockposition, fluid.getBlockData(), 3 | (flag ? 64 : 0)); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index e181df6f4d0..4a9132c7016 100644 +index e181df6f4d08b88835db7342f97e0b848bcf01ef..4a9132c7016b076ab35b5d66ce81bbd247e1a3ce 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -85,6 +85,7 @@ public final class CraftItemStack extends ItemStack { @@ -4283,7 +4283,7 @@ index e181df6f4d0..4a9132c7016 100644 /** * Mirror diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java -index d8358a0f031..d0b813008ca 100644 +index d8358a0f031ca6e5d5dc1700172175446f74384e..d0b813008ca21fe6aa9b514ed4325596113fd459 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java @@ -196,4 +196,22 @@ public class DummyGeneratorAccess implements GeneratorAccess { @@ -4310,7 +4310,7 @@ index d8358a0f031..d0b813008ca 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java -index 1aec70a1f1a..f72c13bedaa 100644 +index 1aec70a1f1a9d8fd2cd06bde4033e19e769ab331..f72c13bedaa6fa45e26f5dcad564835bdd4af61f 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java +++ b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java @@ -17,7 +17,7 @@ import java.util.RandomAccess; @@ -4322,6 +4322,3 @@ index 1aec70a1f1a..f72c13bedaa 100644 private int size; private int initialCapacity; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0005-Paper-Metrics.patch b/Spigot-Server-Patches/0005-Paper-Metrics.patch index 773830c5e0..0ac402ed69 100644 --- a/Spigot-Server-Patches/0005-Paper-Metrics.patch +++ b/Spigot-Server-Patches/0005-Paper-Metrics.patch @@ -1,4 +1,4 @@ -From 760b0e1fc3bceb0363fa0c68ead4bff009ea1a01 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 24 Mar 2017 23:56:01 -0500 Subject: [PATCH] Paper Metrics @@ -15,7 +15,7 @@ decisions on behalf of the project. diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java new file mode 100644 -index 0000000000..e257d6b36e +index 0000000000000000000000000000000000000000..e257d6b36e0e78dac5b8320017d92776171e1bb0 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -0,0 +1,627 @@ @@ -647,7 +647,7 @@ index 0000000000..e257d6b36e + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 273cdb598b..b6d470e594 100644 +index 273cdb598b3606b962dcc92564c84ad351b7a74f..b6d470e594ce196f560ac6c94ced904b0081b205 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -41,6 +41,7 @@ public class PaperConfig { @@ -671,7 +671,7 @@ index 273cdb598b..b6d470e594 100644 static void readConfig(Class clazz, Object instance) { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index ff1ddfcfe0..fdca34346a 100644 +index ff1ddfcfe0f231c3726c0b985288b4c3cdc5f64d..fdca34346a31a6096b8005670464a4c42ae2f73b 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -83,6 +83,7 @@ public class SpigotConfig @@ -690,6 +690,3 @@ index ff1ddfcfe0..fdca34346a 100644 } static void readConfig(Class clazz, Object instance) --- -2.26.2 - diff --git a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch index 6f4d1b45aa..07f72a90e2 100644 --- a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch +++ b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch @@ -1,4 +1,4 @@ -From d7e09e8c54402420bebf78ed377f8edb9b66c4e3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 01:40:13 -0400 Subject: [PATCH] Add MinecraftKey Information to Objects @@ -6,7 +6,7 @@ Subject: [PATCH] Add MinecraftKey Information to Objects Stores the reference to the objects respective MinecraftKey diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 41c79650b1..b839769cea 100644 +index 41c79650b169b87fbc70cf502438a5453a04f23d..b839769ceae8932bb121a0b96fde1e7d129a1f63 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -178,7 +178,7 @@ public class PaperCommand extends Command { @@ -19,7 +19,7 @@ index 41c79650b1..b839769cea 100644 MutablePair> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap())); ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ()); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index f4863852b0..38227d85f4 100644 +index f4863852b04c5fa55b79acabe40ce59909b9bbbd..38227d85f482b4b4869e17cd7117eb1a476e462f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -49,7 +49,7 @@ import org.bukkit.event.player.PlayerTeleportEvent; @@ -65,7 +65,7 @@ index f4863852b0..38227d85f4 100644 protected abstract void a(NBTTagCompound nbttagcompound); diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 4328273b1f..8427ee2ee8 100644 +index 4328273b1fca165320097dbac0650b31fae4e5ca..8427ee2ee8b90d5deb686412bb2eefb9a574b75a 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -237,6 +237,7 @@ public class EntityTypes { @@ -78,7 +78,7 @@ index 4328273b1f..8427ee2ee8 100644 } diff --git a/src/main/java/net/minecraft/server/KeyedObject.java b/src/main/java/net/minecraft/server/KeyedObject.java new file mode 100644 -index 0000000000..743142d030 +index 0000000000000000000000000000000000000000..743142d0303fa25fe48a2abb07040d1228d04402 --- /dev/null +++ b/src/main/java/net/minecraft/server/KeyedObject.java @@ -0,0 +1,9 @@ @@ -92,7 +92,7 @@ index 0000000000..743142d030 + } +} diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 40752f7617..9071bb7ece 100644 +index 40752f7617d5aa6b5ae55cd9a1b2eeb57c276adb..9071bb7ece6d38d85b4ea11e53671f3ec5210b28 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -11,7 +11,7 @@ import org.bukkit.inventory.InventoryHolder; @@ -140,6 +140,3 @@ index 40752f7617..9071bb7ece 100644 @Nullable public World getWorld() { return this.world; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch index cedd956482..08764d2693 100644 --- a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch +++ b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch @@ -1,4 +1,4 @@ -From e969742b4a74d232455d49d51ce3ac8c0c915e05 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:10:36 -0400 Subject: [PATCH] Store reference to current Chunk for Entity and Block @@ -8,7 +8,7 @@ This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index b39ce329aa..4d7dc71474 100644 +index b39ce329aa0b2e8da679a7b658f707f1da1f1a99..4d7dc714748a82470d00e787eeb3dc7ca08c656a 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -29,7 +29,7 @@ public class Chunk implements IChunkAccess { @@ -89,7 +89,7 @@ index b39ce329aa..4d7dc71474 100644 } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 38227d85f4..fc878e28c9 100644 +index 38227d85f482b4b4869e17cd7117eb1a476e462f..fc878e28c96bb4a9d4cd84001141935736d23e1f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -134,7 +134,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -155,7 +155,7 @@ index 38227d85f4..fc878e28c9 100644 private String entityKeyString; diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 9071bb7ece..820180ab3f 100644 +index 9071bb7ece6d38d85b4ea11e53671f3ec5210b28..820180ab3f7053c348caa80cc21f15dfa3d26afd 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -51,6 +51,15 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -175,7 +175,7 @@ index 9071bb7ece..820180ab3f 100644 @Nullable diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 056525526e..5a047dd682 100644 +index 056525526e87fa75f026278a82311640a3b466db..5a047dd68223363ef83f8d5b77adbd45f7531113 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -138,6 +138,7 @@ import net.minecraft.server.EntityZombieVillager; @@ -199,6 +199,3 @@ index 056525526e..5a047dd682 100644 public static CraftEntity getEntity(CraftServer server, Entity entity) { /* * Order is *EXTREMELY* important -- keep it right! =D --- -2.26.0 - diff --git a/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch b/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch index 7919e14924..417d404c9c 100644 --- a/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch +++ b/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch @@ -1,4 +1,4 @@ -From 8c353e9c2c1388d62b4b73c47d18c629f4a5682b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:13:59 -0400 Subject: [PATCH] Store counts for each Entity/Block Entity Type @@ -6,7 +6,7 @@ Subject: [PATCH] Store counts for each Entity/Block Entity Type Opens door for future patches to optimize performance diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 4d7dc71474..a144f4ef56 100644 +index 4d7dc714748a82470d00e787eeb3dc7ca08c656a..a144f4ef5658359715ba493e6363c7e887d812d3 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -56,15 +56,19 @@ public class Chunk implements IChunkAccess { @@ -53,6 +53,3 @@ index 4d7dc71474..a144f4ef56 100644 // Paper end this.entities.remove(entity); // Paper } --- -2.26.0 - diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index 41f7d09f0b..96622a56a6 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -1,4 +1,4 @@ -From 3ebd9a34ff56a4ff3f3ff262e9f6ca4059e9363e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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..223d3b1125 +index 0000000000000000000000000000000000000000..223d3b1125d0781758c45c6b469e6cccd13f187a --- /dev/null +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -0,0 +1,141 @@ @@ -153,7 +153,7 @@ index 0000000000..223d3b1125 +} 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..fa1c920ea6 +index 0000000000000000000000000000000000000000..fa1c920ea6092259149f9e7f9cd7cc1ed27bf338 --- /dev/null +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java @@ -0,0 +1,118 @@ @@ -276,7 +276,7 @@ index 0000000000..fa1c920ea6 + } +} 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 b6d470e594ce196f560ac6c94ced904b0081b205..f402a29b0904a0094ffe6e42dbdc6fbc0912d9d9 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; @@ -323,7 +323,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 cd72a9c84569592f9c82708a17388e594648d19d..5de881371a485957fd8fadc7540a2b549b20dd65 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 { @@ -343,7 +343,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 a144f4ef56..352bb787fd 100644 +index a144f4ef5658359715ba493e6363c7e887d812d3..352bb787fddca85a1aa06d263211841a2a6fada7 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -689,6 +689,7 @@ public class Chunk implements IChunkAccess { @@ -363,7 +363,7 @@ index a144f4ef56..352bb787fd 100644 } } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index ba2af2abe2..875f353dc3 100644 +index ba2af2abe2dd09eb6801f431a0942bd93755c97e..875f353dc3a0f3418b01821abf30e0f1ca32bb4d 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -308,11 +308,13 @@ public class ChunkProviderServer extends IChunkProvider { @@ -460,7 +460,7 @@ index ba2af2abe2..875f353dc3 100644 @Override diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index e16d30f2ca..13d99de2cd 100644 +index e16d30f2cafcbc5edbcd58d97703686aaf1537d5..13d99de2cd08de02215031a1f699110c13ef35ff 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -1,5 +1,6 @@ @@ -497,7 +497,7 @@ index e16d30f2ca..13d99de2cd 100644 private static NBTTagCompound a(ChunkCoordIntPair chunkcoordintpair, Map map, Map map1) { 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 8d7a6d2403722c7e7ff437f8e153ffa6194679d7..707bd2600d19699f58405eaa23ec36f406ca20ba 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 { @@ -524,7 +524,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 ba40d5fbb5fe69225d25bdc4e299857f5ab21b40..ee42e1dfa493c3d7f5af8cc7b8e17e80fcb32b71 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 { @@ -537,7 +537,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 9eed98e3796be6d49dc51af9038a7376c94edeee..d6646d7e61b63c116fa87951b0ef3131b68ebe97 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; @@ -625,7 +625,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 fc878e28c9..c75b74d558 100644 +index fc878e28c96bb4a9d4cd84001141935736d23e1f..c75b74d5581e3517d39079eea827a24c471eaa6c 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; @@ -664,7 +664,7 @@ index fc878e28c9..c75b74d558 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 3ace8ee854..690c1ce0f6 100644 +index 3ace8ee854c11abd607dc27b93fe61a0982a73de..690c1ce0f6707b2f5dd787e0fe340af5bd719783 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; @@ -740,7 +740,7 @@ index 3ace8ee854..690c1ce0f6 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b4a0bd7951..67bdd57747 100644 +index b4a0bd79511a3b1185a165991c937375aeecf3d1..67bdd577477730f1775f87189c9fcee6f92c7e57 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; @@ -934,7 +934,7 @@ index b4a0bd7951..67bdd57747 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 b505244516..65134c8777 100644 +index b505244516321292e56609eaa54693d84e0bf617..65134c87772cb6d4d732fc223929cfda7524dde2 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,7 +1,9 @@ @@ -1029,7 +1029,7 @@ index b505244516..65134c8777 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 6a681d694e76fa6f38d00ee7bae67762f3e5c34f..914366afcdffe616d1403de4143205033860dbcb 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; @@ -1084,7 +1084,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 2c671629a43f42da8335e7216f9fd399bb878729..eb3269e0ea3ce33d08e9eee3bca7cf434921e991 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; @@ -1111,7 +1111,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 94ed83baf0..f28be11eee 100644 +index 94ed83baf06646e8edc050fe15aab1d176c98a19..f28be11eee2b6e64e9db84a533dd2fb297611740 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1,5 +1,6 @@ @@ -1135,7 +1135,7 @@ index 94ed83baf0..f28be11eee 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 00bbd34b6a2a8185bc6395d6c85bce6353c3cbc4..f533860bbed19ff2915c90186c259b466f41ce90 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 { @@ -1185,7 +1185,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 820180ab3f7053c348caa80cc21f15dfa3d26afd..fa6400dccd4df635d696e0858c0c164a0f19b4a4 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; @@ -1204,7 +1204,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 2a4fa455ff..f572c5f227 100644 +index 2a4fa455ff3065f9b1ad9bcf8d236bbb6f830bc9..f572c5f22712288cc75fffeae65fc2bd632d2de1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1,5 +1,7 @@ @@ -1260,7 +1260,7 @@ index 2a4fa455ff..f572c5f227 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 d5014abc9d..38a71bca2f 100644 +index d5014abc9d13efd801e17ecede37918b7acf7b33..38a71bca2f4c708fea656ce3bddf3842a44c82de 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1,6 +1,8 @@ @@ -1405,7 +1405,7 @@ index d5014abc9d..38a71bca2f 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 ad1dcf5304..1ceba5f7ea 100644 +index ad1dcf53040695a1b3194efa92b549172bea56ec..1ceba5f7eae58426834d7042af17f7e3b1990a56 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1973,12 +1973,31 @@ public final class CraftServer implements Server { @@ -1442,7 +1442,7 @@ index ad1dcf5304..1ceba5f7ea 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 2bd22a369825040c7f5074117d82ae83f07b6096..0000000000000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java +++ /dev/null @@ -1,162 +0,0 @@ @@ -1609,7 +1609,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 f20f72c035..ba6a924a9c 100644 +index f20f72c035c003b06c9ad83d05538b3dba780ebe..ba6a924a9c33ac02d3ef877e142f1e21abd10cb2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1718,6 +1718,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1628,7 +1628,7 @@ index f20f72c035..ba6a924a9c 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 9ad17c560c..db433ed370 100644 +index 9ad17c560c8d99a396543ab9f97c34de648f6544..db433ed3707a1cb3a6df13b3c3fb5696155f7160 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 @@ @@ -1694,7 +1694,7 @@ index 9ad17c560c..db433ed370 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 3f55381c152b9841b524f623c9b32360e97cb8ed..0d9a466809be6733fcb7e5421318477da333850f 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 @@ @@ -1779,7 +1779,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 e52ef47b783785dc214746b678e7b549aea9a274..3d90b3426873a3528af14f7f1ab0adae0027da2e 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; @@ -1791,7 +1791,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 68728b4d86c4037fb1907bd16d86df5e23e8fe77..02f33005335a0995ce4157088353da93833b6ecc 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 { @@ -1809,7 +1809,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 ca7789b5e0f0baf0a1b0529236d6469b2abae236..4423839697987e255e5a93bdd6742186dde2e4c4 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; @@ -1869,6 +1869,3 @@ index ca7789b5e0..4423839697 100644 return isActive; } } --- -2.26.0 - diff --git a/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch b/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch index afaa2b005b..dbef4cb010 100644 --- a/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch +++ b/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch @@ -1,11 +1,11 @@ -From 51f78214ad1aa4e496b31fc1f4e99ac5d0c26f01 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:02:51 -0600 Subject: [PATCH] Configurable cactus and reed natural growth heights diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a738657394..098bd3fba8 100644 +index a738657394bcccd859ef260a801736d44b234469..098bd3fba867c0e4c6c58748aa6e2e632737a948 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -64,4 +64,13 @@ public class PaperWorldConfig { @@ -23,7 +23,7 @@ index a738657394..098bd3fba8 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java -index 1e1d02dc73..e0974e256f 100644 +index 1e1d02dc73ea193fca69b26e4c51efd845713d2f..e0974e256f0f10e047b9eb8e362982c6578d2d98 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -30,7 +30,7 @@ public class BlockCactus extends Block { @@ -36,7 +36,7 @@ index 1e1d02dc73..e0974e256f 100644 if (j >= (byte) range(3, ((100.0F / worldserver.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java -index 2106b0b49f..55b07444e1 100644 +index 2106b0b49f19f56fd446c2c6cec63526eb74fdb7..55b07444e1d769952f2a411b1b5d1032565af8a1 100644 --- a/src/main/java/net/minecraft/server/BlockReed.java +++ b/src/main/java/net/minecraft/server/BlockReed.java @@ -29,7 +29,7 @@ public class BlockReed extends Block { @@ -48,6 +48,3 @@ index 2106b0b49f..55b07444e1 100644 int j = (Integer) iblockdata.get(BlockReed.AGE); if (j >= (byte) range(3, ((100.0F / worldserver.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot --- -2.26.2 - diff --git a/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch index 3eb22f2603..009e07aa2b 100644 --- a/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch +++ b/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch @@ -1,11 +1,11 @@ -From 0a0e608e9cc522e573ee12fff0ef88922238642c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:09:16 -0600 Subject: [PATCH] Configurable baby zombie movement speed diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 098bd3fba8..912611cf1a 100644 +index 098bd3fba867c0e4c6c58748aa6e2e632737a948..912611cf1aeccf5a82a789aab07d76723d4357cc 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -73,4 +73,15 @@ public class PaperWorldConfig { @@ -25,7 +25,7 @@ index 098bd3fba8..912611cf1a 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 7783b57912..0240cef74a 100644 +index 7783b57912e87ac132bab3d2e85808240f077174..0240cef74aaa7f9fcfea40106267ee2e8d39f133 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -21,7 +21,7 @@ public class EntityZombie extends EntityMonster { @@ -49,6 +49,3 @@ index 7783b57912..0240cef74a 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch index 04c67bf763..bd2fd32960 100644 --- a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch +++ b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch @@ -1,11 +1,11 @@ -From c999b51b488b1a969d3bca8df0e6ee3129a3c044 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:14:11 -0600 Subject: [PATCH] Configurable fishing time ranges diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 912611cf1a..7d9976ce6b 100644 +index 912611cf1aeccf5a82a789aab07d76723d4357cc..7d9976ce6bf86e6fdfd0c7770104cee0db363a6d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -84,4 +84,12 @@ public class PaperWorldConfig { @@ -22,7 +22,7 @@ index 912611cf1a..7d9976ce6b 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 7be189f742..40bdcf4e75 100644 +index 7be189f7428886058982774028de6adbd384fafd..40bdcf4e75bb36385e82ba8b8f2471760072705a 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -326,8 +326,9 @@ public class EntityFishingHook extends Entity { @@ -36,6 +36,3 @@ index 7be189f742..40bdcf4e75 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch index db123ba058..271c82d78b 100644 --- a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch +++ b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch @@ -1,11 +1,11 @@ -From 2db9760a6c3eaf9c8129af28e115f5b9e3d914a5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:24:16 -0600 Subject: [PATCH] Allow nerfed mobs to jump and take water damage diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 7d9976ce6b..6d6a68cb1b 100644 +index 7d9976ce6bf86e6fdfd0c7770104cee0db363a6d..6d6a68cb1b952da8308ac9ce5b54694bc9ba0e30 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -92,4 +92,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 7d9976ce6b..6d6a68cb1b 100644 + } } diff --git a/src/main/java/net/minecraft/server/ControllerJump.java b/src/main/java/net/minecraft/server/ControllerJump.java -index 2e869004c8..8a6856e0fd 100644 +index 2e869004c8c6b8bfbb002fb4eda04519d50390c8..8a6856e0fd7b9b515d98f45aaabefbc30d532596 100644 --- a/src/main/java/net/minecraft/server/ControllerJump.java +++ b/src/main/java/net/minecraft/server/ControllerJump.java @@ -13,6 +13,7 @@ public class ControllerJump { @@ -31,7 +31,7 @@ index 2e869004c8..8a6856e0fd 100644 this.b.setJumping(this.a); this.a = false; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index c75b74d558..23497aa934 100644 +index c75b74d5581e3517d39079eea827a24c471eaa6c..23497aa93444ddabbd0ae89b277ed250e896b266 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1103,6 +1103,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -43,7 +43,7 @@ index c75b74d558..23497aa934 100644 return this.isInWater() || this.isInRain() || this.l(); } diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 1cc66108d0..538c2169cd 100644 +index 1cc66108d0f799eef6ee984e8f65a9a46e337785..538c2169cd53d364b941ad1251df3731f77b3a2c 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -171,7 +171,7 @@ public class EntityEnderman extends EntityMonster { @@ -56,7 +56,7 @@ index 1cc66108d0..538c2169cd 100644 if (this.world.isDay() && this.ticksLived >= this.bA + 600) { diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 0b06fa2b66..70cd0801dc 100644 +index 0b06fa2b664830d40cdb93968bc2f8c98415d1bf..70cd0801dc62dc0b15a75869b375353db8a9ae46 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -32,6 +32,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -87,7 +87,7 @@ index 0b06fa2b66..70cd0801dc 100644 this.bw.a(); this.world.getMethodProfiler().exit(); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java -index 0f0dc7277f..43908b0400 100644 +index 0f0dc7277f28a96711ab81e6bbf2dd7d1c212f25..43908b0400933119de9bcfe4240853e4fce7ec6f 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java @@ -8,10 +8,12 @@ public class PathfinderGoalFloat extends PathfinderGoal { @@ -111,6 +111,3 @@ index 0f0dc7277f..43908b0400 100644 @Override public void e() { if (this.a.getRandom().nextFloat() < 0.8F) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch index a21772e42b..70a3cff149 100644 --- a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch @@ -1,11 +1,11 @@ -From 8112879d97a26b6dc2c5c07cf5ac527c4bd566ff Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Suddenly Date: Tue, 1 Mar 2016 13:51:54 -0600 Subject: [PATCH] Add configurable despawn distances for living entities diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 6d6a68cb1b..2845686411 100644 +index 6d6a68cb1b952da8308ac9ce5b54694bc9ba0e30..2845686411615245137cfe1a155088a865a4d3a0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -97,4 +97,20 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index 6d6a68cb1b..2845686411 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 70cd0801dc..23995b68a1 100644 +index 70cd0801dc62dc0b15a75869b375353db8a9ae46..23995b68a17b87b90962c4c12aa37e3a254073b5 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -630,11 +630,11 @@ public abstract class EntityInsentient extends EntityLiving { @@ -47,6 +47,3 @@ index 70cd0801dc..23995b68a1 100644 this.die(); } else if (d0 < 1024.0D) { this.ticksFarFromPlayer = 0; --- -2.26.2 - 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 191b16ef0e..e7dc4ece78 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 50e14d6c5ba9f7484b197136b0e09d39f15ba969 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 2845686411615245137cfe1a155088a865a4d3a0..8ee2b9bb1bce698fce50ac1b3fc477fcafd0542c 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,7 +20,7 @@ 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 f572c5f227..0332aca8be 100644 +index f572c5f22712288cc75fffeae65fc2bd632d2de1..0332aca8be854fca7444308b9ab5e43f01f8055e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -141,6 +141,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -31,6 +31,3 @@ index f572c5f227..0332aca8be 100644 this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime); this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch index ebf26fee5e..229ff24a83 100644 --- a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch +++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch @@ -1,11 +1,11 @@ -From ad87983cdd6c3b9fcd615e75b23dca3290404587 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 14:14:15 -0600 Subject: [PATCH] Drop falling block and tnt entities at the specified height diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 8ee2b9bb1b..d59b82b7bb 100644 +index 8ee2b9bb1bce698fce50ac1b3fc477fcafd0542c..d59b82b7bb1f6d1b231f4e394e0a67a3d154d7be 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -119,4 +119,14 @@ public class PaperWorldConfig { @@ -24,7 +24,7 @@ index 8ee2b9bb1b..d59b82b7bb 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 23497aa934..9647d7850c 100644 +index 23497aa93444ddabbd0ae89b277ed250e896b266..9647d7850c2abe9fa7c313f994b834a70cfcac2e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1818,6 +1818,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -36,7 +36,7 @@ index 23497aa934..9647d7850c 100644 public EntityItem a(ItemStack itemstack, float f) { if (itemstack.isEmpty()) { diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 4b4e71bf70..2097ec535e 100644 +index 4b4e71bf700f13d9719556d4c07316b93aac0fd2..2097ec535e8a4427fc08da02726044b837d5a716 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -85,6 +85,17 @@ public class EntityFallingBlock extends Entity { @@ -58,7 +58,7 @@ index 4b4e71bf70..2097ec535e 100644 blockposition = new BlockPosition(this); boolean flag = this.block.getBlock() instanceof BlockConcretePowder; diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index d042124362..d9fd4448c7 100644 +index d042124362e02a6ec634a16610d4a1ed5ef83284..d9fd4448c707aca8e2040a5848387ce76bbee1df 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -54,6 +54,12 @@ public class EntityTNTPrimed extends Entity { @@ -74,6 +74,3 @@ index d042124362..d9fd4448c7 100644 this.setMot(this.getMot().a(0.98D)); if (this.onGround) { this.setMot(this.getMot().d(0.7D, -0.5D, 0.7D)); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 217bbdea39..0cba92fa42 100644 --- a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -1,4 +1,4 @@ -From 746bf932691839f8e2c1fd8a5b4167abbe552faa Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 14:32:43 -0600 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang @@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java -index 3f35a28ba1..cf00f35a5b 100644 +index 3f35a28ba15f4d0dfe1cb2b56f621e81b1fb8c99..cf00f35a5b7c2d2f6b6989e0855de8b882dcef50 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -70,7 +70,7 @@ public class EULA { @@ -19,7 +19,7 @@ index 3f35a28ba1..cf00f35a5b 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 67bdd57747..e71ee0fb33 100644 +index 67bdd577477730f1775f87189c9fcee6f92c7e57..e71ee0fb3393463044ca3e1d486ab749e55fbc44 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1345,7 +1345,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 27 May 2019 03:40:05 -0500 Subject: [PATCH] Implement Paper VersionChecker @@ -6,7 +6,7 @@ Subject: [PATCH] Implement Paper VersionChecker diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java new file mode 100644 -index 0000000000..5deed3e25f +index 0000000000000000000000000000000000000000..5deed3e25ff41ab0a4015a5fd0c1e952cdb16402 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -0,0 +1,115 @@ @@ -126,7 +126,7 @@ index 0000000000..5deed3e25f + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 02f3300533..b1e1b59d45 100644 +index 02f33005335a0995ce4157088353da93833b6ecc..b1e1b59d451674b42cdc6f896d3e2b707a03b923 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -303,6 +303,11 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -141,6 +141,3 @@ index 02f3300533..b1e1b59d45 100644 // Paper end /** --- -2.26.2 - diff --git a/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch b/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch index d06b82e369..ed0cac6dae 100644 --- a/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch +++ b/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch @@ -1,11 +1,11 @@ -From 8fbf689ae7f4d4025dafa432323bc5bcffbac07a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Kyle Wood Date: Thu, 1 Mar 2018 19:37:52 -0600 Subject: [PATCH] Add version history to version command diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index 5deed3e25f..49a38c6608 100644 +index 5deed3e25ff41ab0a4015a5fd0c1e952cdb16402..49a38c6608b652ff48ef4eaca0dd3ccb1ba570e3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -25,7 +25,10 @@ public class PaperVersionFetcher implements VersionFetcher { @@ -42,7 +42,7 @@ index 5deed3e25f..49a38c6608 100644 } diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java new file mode 100644 -index 0000000000..aac3f66cb2 +index 0000000000000000000000000000000000000000..aac3f66cb23d260729c2a48d8710a9de2346aa22 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java @@ -0,0 +1,145 @@ @@ -192,7 +192,7 @@ index 0000000000..aac3f66cb2 + } +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index d6646d7e61..4b1f8c5373 100644 +index d6646d7e61b63c116fa87951b0ef3131b68ebe97..4b1f8c53737f998fa57859146d5ddb999cdc8d41 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -180,6 +180,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -203,6 +203,3 @@ index d6646d7e61..4b1f8c5373 100644 // Paper end this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch index b2e7e1b361..f199b9197e 100644 --- a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch @@ -1,11 +1,11 @@ -From 29f1c96dafc276ffc026652f562e716cf2224873 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 14:47:52 -0600 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 1228b73bd4..1f20fbbf92 100644 +index 1228b73bd433c59b0b1503f3be270a9af6aadaa5..1f20fbbf92c9d2937594c924837fff0bb9ee9238 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -71,6 +71,9 @@ public abstract class EntityHuman extends EntityLiving { @@ -19,7 +19,7 @@ index 1228b73bd4..1f20fbbf92 100644 // CraftBukkit start public boolean fauxSleeping; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 23995b68a1..1732c1ae95 100644 +index 23995b68a17b87b90962c4c12aa37e3a254073b5..1732c1ae9537957c51da5e484b55febb6e9f0091 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -627,7 +627,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -32,7 +32,7 @@ index 23995b68a1..1732c1ae95 100644 if (d0 > world.paperConfig.hardDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java -index 102b3a3c48..08c2a22f7a 100644 +index 102b3a3c48799e44de760da48425fef9c5278771..08c2a22f7a01df21532e1949ea9d51f78a611cee 100644 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java @@ -99,7 +99,7 @@ public class EntitySilverfish extends EntityMonster { @@ -45,7 +45,7 @@ index 102b3a3c48..08c2a22f7a 100644 return false; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ba6a924a9c..e40a379905 100644 +index ba6a924a9c33ac02d3ef877e142f1e21abd10cb2..e40a379905c836ef3828400470e9f57938e9a99e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1626,7 +1626,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -68,6 +68,3 @@ index ba6a924a9c..e40a379905 100644 @Override public void updateCommands() { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch index 5196fc95e3..1d3a7d587d 100644 --- a/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch +++ b/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch @@ -1,11 +1,11 @@ -From f2cfab87a7d62010dd7e2d7c9e23d72e302d1bf6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 15:08:03 -0600 Subject: [PATCH] Remove invalid mob spawner tile entities diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 352bb787fd..687e609cab 100644 +index 352bb787fddca85a1aa06d263211841a2a6fada7..687e609cab33aaea62784fb338ce70606a831217 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -604,6 +604,10 @@ public class Chunk implements IChunkAccess { @@ -19,6 +19,3 @@ index 352bb787fd..687e609cab 100644 } else { System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ() + " (" + getType(blockposition) + ") where there was no entity tile!"); --- -2.26.0 - diff --git a/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch index efffe5a388..8d64b6a092 100644 --- a/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch @@ -1,11 +1,11 @@ -From 2636209798e4b7c25812b1281446bd801c5b7d64 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 22:55:25 -0600 Subject: [PATCH] Optimize TileEntity Ticking diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java -index 35f4dc75fb..c4766f729f 100644 +index 35f4dc75fbc7cccc80453f279a08b286ab32a25a..c4766f729fed7c9da9e456cae044400e2d08400c 100644 --- a/src/main/java/net/minecraft/server/TileEntityChest.java +++ b/src/main/java/net/minecraft/server/TileEntityChest.java @@ -7,7 +7,7 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity; @@ -91,7 +91,7 @@ index 35f4dc75fb..c4766f729f 100644 int newPower = Math.max(0, Math.min(15, this.viewingCount)); diff --git a/src/main/java/net/minecraft/server/TileEntityEnderChest.java b/src/main/java/net/minecraft/server/TileEntityEnderChest.java -index 68737be5e6..17c39edca0 100644 +index 68737be5e67b52cb1f9f526b58b589ecba14dd6b..17c39edca08e6db5da5f0de5d70cb2c64e8cd7df 100644 --- a/src/main/java/net/minecraft/server/TileEntityEnderChest.java +++ b/src/main/java/net/minecraft/server/TileEntityEnderChest.java @@ -1,6 +1,6 @@ @@ -181,6 +181,3 @@ index 68737be5e6..17c39edca0 100644 } public boolean a(EntityHuman entityhuman) { --- -2.26.2 - 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 dfdc66b626..ff893f0a12 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 b73bfd83c5a8235791061bb14f75cde36101cf40 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e71ee0fb33..53d0a98d00 100644 +index e71ee0fb3393463044ca3e1d486ab749e55fbc44..53d0a98d00c7f923e4ee87804a214d812a7ef1bb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -160,7 +160,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 21.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 ); // Paper - only print * at 21, we commonly peak to 20.02 as the tick sleep is not accurate enough, stop the noise } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch index 89669b6535..b42eee81b7 100644 --- a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch @@ -1,11 +1,11 @@ -From 6c4de90b4c2f1d43f938864f88f9da0d964b382a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:12:03 -0600 Subject: [PATCH] Only refresh abilities if needed diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e40a379905..331555dc27 100644 +index e40a379905c836ef3828400470e9f57938e9a99e..331555dc27f7ad0542dbff1b84a5e3b2b7257982 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1315,12 +1315,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -23,6 +23,3 @@ index e40a379905..331555dc27 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch index 84f8841512..79367d5b39 100644 --- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch @@ -1,11 +1,11 @@ -From 9294ce1bcbd8799c239b4016a04637ef70470340 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] Entity Origin API diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9647d7850c..cf4901ccae 100644 +index 9647d7850c2abe9fa7c313f994b834a70cfcac2e..cf4901ccaecff800285cfa63cbf05ab130a8b0b5 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -167,6 +167,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -51,7 +51,7 @@ index 9647d7850c..cf4901ccae 100644 NBTTagList nbttaglist = new NBTTagList(); double[] adouble1 = adouble; diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 2097ec535e..e64722f63b 100644 +index 2097ec535e8a4427fc08da02726044b837d5a716..e64722f63bab6bc1ce97ca63d4fde7599f6c1296 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -254,6 +254,14 @@ public class EntityFallingBlock extends Entity { @@ -70,7 +70,7 @@ index 2097ec535e..e64722f63b 100644 public void a(boolean flag) { diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index d9fd4448c7..7f8b8f5a36 100644 +index d9fd4448c707aca8e2040a5848387ce76bbee1df..7f8b8f5a365d44f03cb4dd60a7403721f9859446 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -104,6 +104,14 @@ public class EntityTNTPrimed extends Entity { @@ -89,7 +89,7 @@ index d9fd4448c7..7f8b8f5a36 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java -index 5406f4c40f..d778eac45d 100644 +index 5406f4c40f86e74f8ed4e7e986b23d19141ddc30..d778eac45de775cf4058621fadb55b1b4e1f3457 100644 --- a/src/main/java/net/minecraft/server/NBTTagList.java +++ b/src/main/java/net/minecraft/server/NBTTagList.java @@ -188,6 +188,7 @@ public class NBTTagList extends NBTList { @@ -101,7 +101,7 @@ index 5406f4c40f..d778eac45d 100644 if (i >= 0 && i < this.list.size()) { NBTBase nbtbase = (NBTBase) this.list.get(i); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 38a71bca2f..351825ebec 100644 +index 38a71bca2f4c708fea656ce3bddf3842a44c82de..351825ebec43cd5dabe57650a7d9f81ac6e6e82d 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1178,6 +1178,11 @@ public class WorldServer extends World { @@ -117,7 +117,7 @@ index 38a71bca2f..351825ebec 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 5a047dd682..5625e5bda2 100644 +index 5a047dd68223363ef83f8d5b77adbd45f7531113..5625e5bda20578d7653439c47eee4671603f7b5b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1009,4 +1009,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -133,6 +133,3 @@ index 5a047dd682..5625e5bda2 100644 + } + // Paper end } --- -2.26.0 - 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 08d567c98c..6dc71a7ec2 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 7b3e2a5ab6667fe4ad3a400cbaaa9fa9803fea3d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 fa6400dccd4df635d696e0858c0c164a0f19b4a4..e2f3cec7420edbd284b531ca7d1d121459fc098c 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,7 +23,7 @@ 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 0332aca8be..1bb3620154 100644 +index 0332aca8be854fca7444308b9ab5e43f01f8055e..1bb36201544987cf44b9da2494e4cc54385f7e77 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -664,11 +664,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -63,6 +63,3 @@ index 0332aca8be..1bb3620154 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch index cdca4e6b19..07dfc5b44b 100644 --- a/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch +++ b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch @@ -1,11 +1,11 @@ -From 493eb4bf539ee63f18a72add87ca6a1a0ca6aaff Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:58:50 -0600 Subject: [PATCH] Configurable top of nether void damage diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index d59b82b7bb..f7a0a33e49 100644 +index d59b82b7bb1f6d1b231f4e394e0a67a3d154d7be..f7a0a33e49cadf9b2bd43f118c106937760da762 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -129,4 +129,19 @@ public class PaperWorldConfig { @@ -29,7 +29,7 @@ index d59b82b7bb..f7a0a33e49 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index cf4901ccae..5e3959901b 100644 +index cf4901ccaecff800285cfa63cbf05ab130a8b0b5..5e3959901bf54178c8042036e00e1d42cc8fc99d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -406,9 +406,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -76,7 +76,7 @@ index cf4901ccae..5e3959901b 100644 this.die(); } diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index e4d1f37f9f..c2843d5d60 100644 +index e4d1f37f9f93a62602753e82caa128111abeec4d..c2843d5d607c3d19806b673c76289a8bee035e70 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -210,9 +210,15 @@ public abstract class EntityMinecartAbstract extends Entity { @@ -95,6 +95,3 @@ index e4d1f37f9f..c2843d5d60 100644 // this.doPortalTick(); // CraftBukkit - handled in postTick if (this.world.isClientSide) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch index 57e9fb3eea..3e7ef83690 100644 --- a/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch +++ b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch @@ -1,11 +1,11 @@ -From 0c54a8c74d21959e27efaa3de62113fa12e5e551 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 00:03:55 -0600 Subject: [PATCH] Check online mode before converting and renaming player data diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index 97bac7d257..a0254d8e51 100644 +index 97bac7d2579a8b895d76082c6575491b83411298..a0254d8e519fa8b19dc282f3abf33b8ebe4f0aba 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -164,7 +164,7 @@ public class WorldNBTStorage implements IPlayerFileData { @@ -17,6 +17,3 @@ index 97bac7d257..a0254d8e51 100644 { file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat"); if ( file.exists() ) --- -2.26.2 - diff --git a/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch index daf2c8212b..daf6c75abd 100644 --- a/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch +++ b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch @@ -1,11 +1,11 @@ -From 46ec2964d532d3db70c6e89531bdbf3b05cf5979 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 00:32:25 -0600 Subject: [PATCH] Always tick falling blocks diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 4423839697..f86404f83a 100644 +index 4423839697987e255e5a93bdd6742186dde2e4c4..f86404f83ae605159307a3ad2cca6c6c314a01af 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -13,6 +13,7 @@ import net.minecraft.server.EntityCreature; @@ -24,6 +24,3 @@ index 4423839697..f86404f83a 100644 || entity instanceof EntityEnderCrystal || entity instanceof EntityFireworks || entity instanceof EntityThrownTrident ) --- -2.26.2 - diff --git a/Spigot-Server-Patches/0030-Configurable-end-credits.patch b/Spigot-Server-Patches/0030-Configurable-end-credits.patch index 215fafc382..b07c0149f9 100644 --- a/Spigot-Server-Patches/0030-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0030-Configurable-end-credits.patch @@ -1,11 +1,11 @@ -From 62ad837be8e703d41667e3db844a934f59933484 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: DoctorDark Date: Wed, 16 Mar 2016 02:21:39 -0500 Subject: [PATCH] Configurable end credits diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f7a0a33e49..50dec5cb5e 100644 +index f7a0a33e49cadf9b2bd43f118c106937760da762..50dec5cb5e924301842300e8fc80cb671b6b9173 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -144,4 +144,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index f7a0a33e49..50dec5cb5e 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 26e32aa1db..cd09b207c9 100644 +index 26e32aa1dbd6de0ba971c32f8daef0d92d65b683..cd09b207c963d81c9302067e0294db57e3ffd0f7 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -40,6 +40,3 @@ index 26e32aa1db..cd09b207c9 100644 this.playerConnection.sendPacket(new PacketPlayOutGameStateChange(4, this.cm ? 0.0F : 1.0F)); this.cm = true; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch index fcdb720c3e..0a4db8807d 100644 --- a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch +++ b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch @@ -1,11 +1,11 @@ -From 1a91044449d17f5883561696be4bf072f5a2fde6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Iceee Date: Wed, 2 Mar 2016 01:39:52 -0600 Subject: [PATCH] Fix lag from explosions processing dead entities diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index eb7b8d94c8..a063d1bfaa 100644 +index eb7b8d94c83c3f3be0a7f019dad7dd87da5347fe..a063d1bfaa1acd20a5de9701eef028a543235d5e 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -151,7 +151,14 @@ public class Explosion { @@ -25,7 +25,7 @@ index eb7b8d94c8..a063d1bfaa 100644 for (int l1 = 0; l1 < list.size(); ++l1) { diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index c75ed9ddc1..c1f462d9d3 100644 +index c75ed9ddc14e1fd3b57a7c989267bf5a0bb6157a..c1f462d9d3eefdab767bea28da484bfb1dfda06a 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -14,6 +14,7 @@ public final class IEntitySelector { @@ -36,6 +36,3 @@ index c75ed9ddc1..c1f462d9d3 100644 public static final Predicate e = (entity) -> { return !(entity instanceof EntityHuman) || !entity.isSpectator() && !((EntityHuman) entity).isCreative(); }; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0032-Optimize-explosions.patch b/Spigot-Server-Patches/0032-Optimize-explosions.patch index 00c6cc9802..12e2565861 100644 --- a/Spigot-Server-Patches/0032-Optimize-explosions.patch +++ b/Spigot-Server-Patches/0032-Optimize-explosions.patch @@ -1,4 +1,4 @@ -From 756d58f146d9c136d05cb02edc280e5d68dbdab6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 50dec5cb5e924301842300e8fc80cb671b6b9173..f038d3f7dc7d1034a3ee9f2384a85642f224836e 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 a063d1bfaa1acd20a5de9701eef028a543235d5e..5583860f152aadcbe74bf7b99e7efd8e47cefa35 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 53d0a98d00..11f81ab364 100644 +index 53d0a98d00c7f923e4ee87804a214d812a7ef1bb..11f81ab364b3bff8b61650a77eb8369c188e6e30 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1181,6 +1181,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 2 Mar 2016 14:48:03 -0600 Subject: [PATCH] Disable explosion knockback diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f038d3f7dc..25e0717186 100644 +index f038d3f7dc7d1034a3ee9f2384a85642f224836e..25e0717186366af580e512eedfd403b8efc64a75 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -156,4 +156,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index f038d3f7dc..25e0717186 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 690c1ce0f6..d4d60220ef 100644 +index 690c1ce0f6707b2f5dd787e0fe340af5bd719783..d4d60220efdf32ee84eef57a7155e7de513cf029 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1073,6 +1073,7 @@ public abstract class EntityLiving extends Entity { @@ -48,7 +48,7 @@ index 690c1ce0f6..d4d60220ef 100644 if (!this.f(damagesource)) { SoundEffect soundeffect = this.getSoundDeath(); diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index 5583860f15..d99d2defe9 100644 +index 5583860f152aadcbe74bf7b99e7efd8e47cefa35..d99d2defe9916e191ba7a2bfbd94bd72a2f5872a 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -193,14 +193,14 @@ public class Explosion { @@ -68,6 +68,3 @@ index 5583860f15..d99d2defe9 100644 this.l.put(entityhuman, new Vec3D(d8 * d13, d9 * d13, d10 * d13)); } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0034-Disable-thunder.patch b/Spigot-Server-Patches/0034-Disable-thunder.patch index f211a5ce75..7a3db5b69f 100644 --- a/Spigot-Server-Patches/0034-Disable-thunder.patch +++ b/Spigot-Server-Patches/0034-Disable-thunder.patch @@ -1,11 +1,11 @@ -From 034f422a35f153691c5c7cd4575ef1a457ba2b51 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:52:43 -0600 Subject: [PATCH] Disable thunder diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 25e0717186..41436a4ead 100644 +index 25e0717186366af580e512eedfd403b8efc64a75..41436a4ead736dc925ca77d4cabf925f4e492d68 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -161,4 +161,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 25e0717186..41436a4ead 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 450b414298..856857d559 100644 +index 351825ebec43cd5dabe57650a7d9f81ac6e6e82d..a6d6ebdcb5b35bf62528d1c6c705f2a7f1437f7b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -445,7 +445,7 @@ public class WorldServer extends World { @@ -31,6 +31,3 @@ index 450b414298..856857d559 100644 blockposition = this.a(this.a(j, 0, k, 15)); if (this.isRainingAt(blockposition)) { DifficultyDamageScaler difficultydamagescaler = this.getDamageScaler(blockposition); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch index db38cc7eb3..3ad815ce26 100644 --- a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch +++ b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch @@ -1,11 +1,11 @@ -From 13b8e0c94fcd64936047baae7b9ffe19a7132aae Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:57:24 -0600 Subject: [PATCH] Disable ice and snow diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 41436a4ead..f53d8b9675 100644 +index 41436a4ead736dc925ca77d4cabf925f4e492d68..f53d8b96757cbedc5fbb16195952a7da5c07164f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -166,4 +166,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 41436a4ead..f53d8b9675 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 856857d559..a34df8ce5d 100644 +index a6d6ebdcb5b35bf62528d1c6c705f2a7f1437f7b..7d4d59e310aa276c89916d0e706c6c829037eb73 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -465,7 +465,7 @@ public class WorldServer extends World { @@ -31,6 +31,3 @@ index 856857d559..a34df8ce5d 100644 blockposition = this.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, this.a(j, 0, k, 15)); BlockPosition blockposition1 = blockposition.down(); BiomeBase biomebase = this.getBiome(blockposition); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch index 328ac36b66..a6195820fb 100644 --- a/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch +++ b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch @@ -1,11 +1,11 @@ -From 2b18ff0e52e64c85b5911e2eb3e99883adf5a0cb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 15:03:53 -0600 Subject: [PATCH] Configurable mob spawner tick rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f53d8b9675..428deed56d 100644 +index f53d8b96757cbedc5fbb16195952a7da5c07164f..428deed56dae597291670bea8c8a6a67ce4d940f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -171,4 +171,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index f53d8b9675..428deed56d 100644 + } } diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 0f23313e89..b249af20c4 100644 +index 0f23313e89fade91eea97e44a5b707cdee3988ad..b249af20c4712a89e5f340eb922291557099058a 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -24,6 +24,7 @@ public abstract class MobSpawnerAbstract { @@ -63,6 +63,3 @@ index 0f23313e89..b249af20c4 100644 return; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch index bf37e9f5c6..4865636ec3 100644 --- a/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch +++ b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch @@ -1,11 +1,11 @@ -From 29462b1030a7b988922e9e4b7bedcad81158195b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Wed, 2 Mar 2016 23:13:07 -0600 Subject: [PATCH] Send absolute position the first time an entity is seen diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index a75e0ec54e..a13fd9b340 100644 +index a75e0ec54e9dfd98c1bcbd13cb022ab05d8410b9..a13fd9b3404381879663c1f694a5d1903d1fd884 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -77,7 +77,7 @@ index a75e0ec54e..a13fd9b340 100644 this.c(); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 65134c8777..eece2f689c 100644 +index 65134c87772cb6d4d732fc223929cfda7524dde2..eece2f689cce58a35d33c6e8d9d56ea4e9dfd88c 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1220,10 +1220,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -106,6 +106,3 @@ index 65134c8777..eece2f689c 100644 this.trackerEntry.b(entityplayer); } } else if (this.trackedPlayers.remove(entityplayer)) { --- -2.26.0 - diff --git a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch index 16081b4ea9..81f607b50f 100644 --- a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch +++ b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch @@ -1,11 +1,11 @@ -From cc7d3caaa3ac02321b1117eeafbed058af531375 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 23:30:53 -0600 Subject: [PATCH] Add BeaconEffectEvent diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java -index 536afe5312..df2d6c3b07 100644 +index 536afe531278e8f6f1ab730c875346c8a624486b..df2d6c3b070c2fc106fa2942959ef21b3511f0ee 100644 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java @@ -14,6 +14,11 @@ import org.bukkit.craftbukkit.potion.CraftPotionUtil; @@ -66,6 +66,3 @@ index 536afe5312..df2d6c3b07 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch index 4c79f11f6a..12dd86313d 100644 --- a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch +++ b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch @@ -1,11 +1,11 @@ -From 355e6485b93162df559e244c86d0627ebd9d58c8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 23:34:44 -0600 Subject: [PATCH] Configurable container update tick rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 428deed56d..a4da22ea65 100644 +index 428deed56dae597291670bea8c8a6a67ce4d940f..a4da22ea65d5fdba38f8dc331919088f9ca99aed 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -176,4 +176,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 428deed56d..a4da22ea65 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index cd09b207c9..64635fe70f 100644 +index cd09b207c963d81c9302067e0294db57e3ffd0f7..64635fe70f37cecdf4344661c28768f6ac16fdd2 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -72,6 +72,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -44,6 +44,3 @@ index cd09b207c9..64635fe70f 100644 if (!this.world.isClientSide && !this.activeContainer.canUse(this)) { this.closeInventory(); this.activeContainer = this.defaultContainer; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch index 3bfadbdfc3..ee7c21942d 100644 --- a/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch +++ b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch @@ -1,11 +1,11 @@ -From f660591d8db199bc2b9cd40d90e7f1eafd3d6f7c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 2 Mar 2016 23:42:37 -0600 Subject: [PATCH] Use UserCache for player heads diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index a6e95a9097..4fb27cc7ed 100644 +index a6e95a90977603068cbbaabfb02b640f15085965..4fb27cc7ed062696239f75b6f85ddb0a31866568 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -157,7 +157,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { @@ -23,6 +23,3 @@ index a6e95a9097..4fb27cc7ed 100644 } return true; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch index 3e00e46962..62aa75c6df 100644 --- a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch +++ b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch @@ -1,11 +1,11 @@ -From 18580a16c97ec80425dacf5bc1f099772cc10d1d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown 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 4604634577..4d849719f4 100644 +index 4604634577418be8382a3d84eaaa90869834c88f..4d849719f4b06dad40f96afd27c3ef32092b5bd0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -634,9 +634,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -19,6 +19,3 @@ index 4604634577..4d849719f4 100644 tileTickPosition = (tileTickPosition < tileEntityListTick.size()) ? tileTickPosition : 0; TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition); // Spigot start --- -2.26.2 - diff --git a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch index ada56eb575..a9acd38718 100644 --- a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch @@ -1,4 +1,4 @@ -From 2f2f30e296173f81723dde1480232744b4e444ef Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Thu, 3 Mar 2016 00:09:38 -0600 Subject: [PATCH] Add PlayerInitialSpawnEvent @@ -9,7 +9,7 @@ This is a duplicate API from spigot, so use our duplicate subclass and improve setPosition to use raw diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index f28be11eee..541e3ce830 100644 +index f28be11eee2b6e64e9db84a533dd2fb297611740..541e3ce83042b4363cdff3baf3dfcd3eba9b4820 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -119,14 +119,14 @@ public abstract class PlayerList { @@ -29,6 +29,3 @@ index f28be11eee..541e3ce830 100644 entityplayer.setYawPitch(loc.getYaw(), loc.getPitch()); // Spigot end --- -2.26.2 - diff --git a/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch index 3fec5fd9c1..f03361ec15 100644 --- a/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch +++ b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch @@ -1,4 +1,4 @@ -From 2568cb155145b518aea9a0a881286c6b0c620e8d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 01:13:45 -0600 Subject: [PATCH] Configurable Disabling Cat Chest Detection @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Disabling Cat Chest Detection Offers a gameplay feature to stop cats from blocking chests diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a4da22ea65..345ac63e28 100644 +index a4da22ea65d5fdba38f8dc331919088f9ca99aed..345ac63e281bb3372b2ae879d587d658243581ba 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -181,4 +181,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index a4da22ea65..345ac63e28 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java -index 033cb78d91..72fb92f7c3 100644 +index 033cb78d91d522b356fea85e66b33de2224f8fe2..72fb92f7c379cb84425b6b03ddf8aad29388c0ae 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/src/main/java/net/minecraft/server/BlockChest.java @@ -267,6 +267,11 @@ public class BlockChest extends BlockChestAbstract implements I @@ -35,6 +35,3 @@ index 033cb78d91..72fb92f7c3 100644 List list = generatoraccess.a(EntityCat.class, new AxisAlignedBB((double) blockposition.getX(), (double) (blockposition.getY() + 1), (double) blockposition.getZ(), (double) (blockposition.getX() + 1), (double) (blockposition.getY() + 2), (double) (blockposition.getZ() + 1))); if (!list.isEmpty()) { --- -2.26.2 - 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 c8b565f8be..cc58fae267 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 71c89ae4f0b988e40d788420d34090c9823827f9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 @@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren that it is happening so that plugin authors can fix their code to stop executing commands async. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 914366afcd..5e8739462e 100644 +index 914366afcdffe616d1403de4143205033860dbcb..5e8739462eface8b3bbc7ef8c0e08763e45c5b2e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1570,6 +1570,29 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -48,7 +48,7 @@ index 914366afcd..5e8739462e 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 99083a1f36..697246492a 100644 +index 99083a1f36f95a4fb3d67f903d02b84d6ebae3d2..697246492a4bf31e84ce3d9f4e35c46f54b7eb7d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -720,6 +720,29 @@ public final class CraftServer implements Server { @@ -82,7 +82,7 @@ index 99083a1f36..697246492a 100644 return true; } diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java -index ddef523ea8..70f8d42992 100644 +index ddef523ea8762c927f37f7d16d581e43367e8c6b..70f8d42992aa348ef7b2d03d22cdd59d7c73f0fe 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java @@ -13,6 +13,7 @@ public class ServerShutdownThread extends Thread { @@ -94,7 +94,7 @@ index ddef523ea8..70f8d42992 100644 } finally { try { diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java -index aeed769725..9f7d2ef932 100644 +index aeed7697254af17ffefe8e578353ad216e15f9f3..9f7d2ef932ab41cef5d3d0736d20a7c7e4a2c888 100644 --- a/src/main/java/org/spigotmc/AsyncCatcher.java +++ b/src/main/java/org/spigotmc/AsyncCatcher.java @@ -6,6 +6,7 @@ public class AsyncCatcher @@ -106,7 +106,7 @@ index aeed769725..9f7d2ef932 100644 public static void catchOp(String reason) { diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java -index e7b953ca31..ccea803f58 100644 +index e7b953ca312533f7ede12cdab42b2289aefc3b95..ccea803f58e09067cc998c62ffa134d6604878ff 100644 --- a/src/main/java/org/spigotmc/RestartCommand.java +++ b/src/main/java/org/spigotmc/RestartCommand.java @@ -43,6 +43,7 @@ public class RestartCommand extends Command @@ -117,6 +117,3 @@ index e7b953ca31..ccea803f58 100644 try { String[] split = restartScript.split( " " ); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch index 827160f518..99c268a3a9 100644 --- a/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch +++ b/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch @@ -1,11 +1,11 @@ -From 368d7cb1678fc3d9f89db71a829b8f7e14ffbc37 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: vemacs Date: Thu, 3 Mar 2016 01:19:22 -0600 Subject: [PATCH] All chunks are slime spawn chunks toggle diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 345ac63e28..62e793b71b 100644 +index 345ac63e281bb3372b2ae879d587d658243581ba..62e793b71b313146b86b466421e7a5f894bef9df 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -186,4 +186,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 345ac63e28..62e793b71b 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index 8e8526f371..3ecf732192 100644 +index 8e8526f371ec967862891e371faa0e4b9c2c11c3..3ecf732192f7f1bd20b9d766bedef08e64434fda 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -289,7 +289,7 @@ public class EntitySlime extends EntityInsentient implements IMonster { @@ -31,6 +31,3 @@ index 8e8526f371..3ecf732192 100644 if (random.nextInt(10) == 0 && flag && blockposition.getY() < 40) { return a(entitytypes, generatoraccess, enummobspawn, blockposition, random); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch index 7fa421a2e0..713d410089 100644 --- a/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch +++ b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch @@ -1,11 +1,11 @@ -From d9be9e5a4f57b905508e9554fef34b3f04886ff1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 697246492a..1cf8fd93a4 100644 +index 697246492a4bf31e84ce3d9f4e35c46f54b7eb7d..1cf8fd93a45fb76fc1638c7fd8751314d4c813e3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1629,6 +1629,7 @@ public final class CraftServer implements Server { @@ -16,6 +16,3 @@ index 697246492a..1cf8fd93a4 100644 public SimpleCommandMap getCommandMap() { return commandMap; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch index f7868452df..734e22a132 100644 --- a/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch +++ b/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch @@ -1,11 +1,11 @@ -From 6b296e8747151670d7b51810ec33a18b7293cf42 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:18:39 -0600 Subject: [PATCH] Be a bit more informative in maxHealth exception diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 6146db1841..966d23add1 100644 +index 6146db18416785a06f86a3118329b33adde9c5f8..966d23add13a3139adead8f8969c0a4ff34929c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -106,7 +106,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -20,6 +20,3 @@ index 6146db1841..966d23add1 100644 } getHandle().setHealth((float) health); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch index 0c47a1a731..2ac8d174a0 100644 --- a/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch @@ -1,11 +1,11 @@ -From a4f71b76f9e0244848bb9b0892f275cf7ba89d86 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 02:32:10 -0600 Subject: [PATCH] Player Tab List and Title APIs diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java -index cf89622a8b..fb97c51bb1 100644 +index cf89622a8b56ddcff1ba09dfb3fbd1b4c3c4677e..fb97c51bb1a4cabc6b67d8f74a5f0b6e0fb6052c 100644 --- a/src/main/java/net/minecraft/server/IChatBaseComponent.java +++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java @@ -439,6 +439,7 @@ public interface IChatBaseComponent extends Message, Iterable { @@ -52,7 +52,7 @@ index 3a6e780007..535056c64e 100644 if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 331555dc27..5f3b6ebbe4 100644 +index 331555dc27f7ad0542dbff1b84a5e3b2b7257982..5f3b6ebbe4e2df92ecd7038e950d212edfe0f8b2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,6 @@ @@ -159,6 +159,3 @@ index 331555dc27..5f3b6ebbe4 100644 @Override public String getDisplayName() { return getHandle().displayName; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch index 2e44dc4a53..26a35dbcf8 100644 --- a/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch +++ b/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch @@ -1,11 +1,11 @@ -From 73e3d996112ef0a80fd46b30beb92cc8d355ff56 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:33:53 -0600 Subject: [PATCH] Ensure inv drag is in bounds diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java -index e38438db6e..0c3a2f080c 100644 +index e38438db6ef46d30c63f13610e9e636b8bf5b66c..0c3a2f080ce71ac88a90e6c74fd3497d27a2c7c6 100644 --- a/src/main/java/net/minecraft/server/Container.java +++ b/src/main/java/net/minecraft/server/Container.java @@ -201,7 +201,7 @@ public abstract class Container { @@ -17,6 +17,3 @@ index e38438db6e..0c3a2f080c 100644 itemstack1 = playerinventory.getCarried(); if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.i.size()) && this.b(slot)) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch index 644d709543..629481b2e8 100644 --- a/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch +++ b/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch @@ -1,4 +1,4 @@ -From c05b5893e43278ce2f8ecfec657f6b31e98d7796 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:39:54 -0600 Subject: [PATCH] Change implementation of (tile)entity removal list @@ -6,7 +6,7 @@ Subject: [PATCH] Change implementation of (tile)entity removal list use sets for faster removal diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 4d849719f4..6e8ac186c9 100644 +index 4d849719f4b06dad40f96afd27c3ef32092b5bd0..6e8ac186c9975888fe7403506ad0724fb37ad26c 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,6 +18,3 @@ index 4d849719f4..6e8ac186c9 100644 public final Thread serverThread; private int c; protected int i = (new Random()).nextInt(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch index a6e41e2f52..16ee91cf75 100644 --- a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch +++ b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch @@ -1,11 +1,11 @@ -From b319a5e8f6288e7f39e76a2a564ce05681d8100f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:46:17 -0600 Subject: [PATCH] Add configurable portal search radius diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 62e793b71b..cd47a4ca06 100644 +index 62e793b71b313146b86b466421e7a5f894bef9df..cd47a4ca069df26969de3051c2aac80540093818 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -191,4 +191,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 62e793b71b..cd47a4ca06 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5e3959901b..5892d344ad 100644 +index 5e3959901bf54178c8042036e00e1d42cc8fc99d..5892d344ad9eb25af78aa45727beee216fd4e1ea 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2580,7 +2580,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -34,7 +34,7 @@ index 5e3959901b..5892d344ad 100644 return null; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 64635fe70f..540048627e 100644 +index 64635fe70f37cecdf4344661c28768f6ac16fdd2..540048627ef5716be2c9115b162a6eeaf9951ad9 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -755,7 +755,9 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -49,7 +49,7 @@ index 64635fe70f..540048627e 100644 if (event.isCancelled() || event.getTo() == null) { return null; diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java -index 19c54f1dde..f84dd6d9be 100644 +index 19c54f1dde60feb2e8deedc83940c778500401eb..f84dd6d9bec4c0f2f741bab20a4f45884594da2d 100644 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java @@ -45,7 +45,7 @@ public class PortalTravelAgent { @@ -70,6 +70,3 @@ index 19c54f1dde..f84dd6d9be 100644 List list = (List) villageplace.b((villageplacetype) -> { return villageplacetype == VillagePlaceType.u; }, blockposition, searchRadius, VillagePlace.Occupancy.ANY).collect(Collectors.toList()); // CraftBukkit - searchRadius --- -2.26.2 - diff --git a/Spigot-Server-Patches/0052-Add-velocity-warnings.patch b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch index daf88b7e63..dd65715ad3 100644 --- a/Spigot-Server-Patches/0052-Add-velocity-warnings.patch +++ b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch @@ -1,11 +1,11 @@ -From 84dc2e6c2ae2aa9fc259b1a472cb6bd21a42b4b6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:48:12 -0600 Subject: [PATCH] Add velocity warnings diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1cf8fd93a4..d5311eb017 100644 +index 1cf8fd93a45fb76fc1638c7fd8751314d4c813e3..d5311eb017fa093c3068e7ea0c24026822b9d638 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -234,6 +234,7 @@ public final class CraftServer implements Server { @@ -17,7 +17,7 @@ index 1cf8fd93a4..d5311eb017 100644 static { ConfigurationSerialization.registerClass(CraftOfflinePlayer.class); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 5625e5bda2..1d02e9acb9 100644 +index 5625e5bda20578d7653439c47eee4671603f7b5b..1d02e9acb94c972f3dc178a15ed0963a9c80539e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -409,10 +409,41 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -63,7 +63,7 @@ index 5625e5bda2..1d02e9acb9 100644 public double getHeight() { return getHandle().getHeight(); diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 73fa74e3cc..d961000611 100644 +index 73fa74e3cc0239a38cd2ba41b3e9e991a5c4ebf9..d9610006113e5f67c2feeea332b2920230822d41 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -76,7 +76,19 @@ public class WatchdogThread extends Thread @@ -87,6 +87,3 @@ index 73fa74e3cc..d961000611 100644 log.log( Level.SEVERE, "------------------------------" ); log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log ); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch index c8143ffa68..fb09f0f26e 100644 --- a/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch +++ b/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch @@ -1,4 +1,4 @@ -From 2eeedfab569f31c1742aeb96a0bc4ee16c2ac7e6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Thu, 3 Mar 2016 02:50:31 -0600 Subject: [PATCH] Configurable inter-world teleportation safety @@ -16,7 +16,7 @@ The wanted destination was on top of the emerald block however the player ended This only is the case if the player is teleporting between worlds. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index cd47a4ca06..abbf59bb91 100644 +index cd47a4ca069df26969de3051c2aac80540093818..abbf59bb91021821876a8960e8f77fac24457ec4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -198,4 +198,9 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index cd47a4ca06..abbf59bb91 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5f3b6ebbe4..5ce7504c5f 100644 +index 5f3b6ebbe4e2df92ecd7038e950d212edfe0f8b2..5ce7504c5f2c8049bd65d9558f9e413495c8894e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -759,7 +759,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -42,6 +42,3 @@ index 5f3b6ebbe4..5ce7504c5f 100644 } return true; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch index c9ef8ff3e1..c382297140 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 9f2aaaba2db42bdb16c50970b27d088680156f7a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java new file mode 100644 -index 0000000000..f699ce18ca +index 0000000000000000000000000000000000000000..f699ce18ca044f813e194ef2786b7ea853ea86e7 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java @@ -0,0 +1,38 @@ @@ -49,7 +49,7 @@ index 0000000000..f699ce18ca + } +} diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 687e609cab..8f3eee5ea8 100644 +index 687e609cab33aaea62784fb338ce70606a831217..8f3eee5ea812320af02e1bb6d2378fbbbef62e3c 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -1,5 +1,6 @@ @@ -80,7 +80,7 @@ index 687e609cab..8f3eee5ea8 100644 } } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 875f353dc3..fa4ad0b6dc 100644 +index 875f353dc3a0f3418b01821abf30e0f1ca32bb4d..fa4ad0b6dcd2cb428d87047340b81594b271e4b2 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; @@ -94,7 +94,7 @@ index 875f353dc3..fa4ad0b6dc 100644 public class ChunkProviderServer extends IChunkProvider { diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java -index c9c2b00251..1422503e11 100644 +index c9c2b0025159c8383998bfe374bcf995f75ed95f..1422503e11ac632c7b94640d59d9aaa0c5cb2f8f 100644 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java @@ -1,5 +1,6 @@ @@ -121,7 +121,7 @@ index c9c2b00251..1422503e11 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index eece2f689c..6374bf8785 100644 +index eece2f689cce58a35d33c6e8d9d56ea4e9dfd88c..6374bf8785f7d99ab8750deba79867433d31eb5f 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -728,6 +728,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -141,7 +141,7 @@ index eece2f689c..6374bf8785 100644 } } diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index 187c4e0f58..c2312a227c 100644 +index 187c4e0f58b7de58dfd2194afb194cbed0a58957..c2312a227c60417c02fc028047e1e4562bbfccff 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -241,6 +241,7 @@ public class RegionFile implements AutoCloseable { @@ -161,7 +161,7 @@ index 187c4e0f58..c2312a227c 100644 } finally { if (filechannel != null) { diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 8ba344df64..02157d051f 100644 +index 8ba344df6455307be88113e52d46b0d802f4443e..02157d051f3ecfc05f23ae8631cf01b6133ad159 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -8,6 +8,7 @@ import org.apache.logging.log4j.LogManager; @@ -189,7 +189,7 @@ index 8ba344df64..02157d051f 100644 } diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java -index d5e9bae709..1bcf01c09a 100644 +index d5e9bae7097460b44f9061198cf54b421bf2b3cf..1bcf01c09a9ba5168d491797e13eeddcf8961b75 100644 --- a/src/main/java/net/minecraft/server/VillageSiege.java +++ b/src/main/java/net/minecraft/server/VillageSiege.java @@ -1,5 +1,7 @@ @@ -209,7 +209,7 @@ index d5e9bae709..1bcf01c09a 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6e8ac186c9..a6b2867094 100644 +index 6e8ac186c9975888fe7403506ad0724fb37ad26c..a6b2867094b6a757b4bc54a947b6972417845f2b 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; @@ -248,7 +248,7 @@ index 6e8ac186c9..a6b2867094 100644 return; // Paper end diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java -index 19e68a7831..a2a25cf6a4 100644 +index 19e68a78310de787bca701bc2597c64e34a77d7c..a2a25cf6a43a1f59a80c997e2980f2bb8e6b3817 100644 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java @@ -121,6 +121,7 @@ public class WorldPersistentData { @@ -260,7 +260,7 @@ index 19e68a7831..a2a25cf6a4 100644 } finally { if (pushbackinputstream != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index db433ed370..d05a9ae0fb 100644 +index db433ed3707a1cb3a6df13b3c3fb5696155f7160..d05a9ae0fbdc8c9d86109a631d059299e51a2a39 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -16,6 +16,9 @@ import java.util.concurrent.atomic.AtomicInteger; @@ -305,6 +305,3 @@ index db433ed370..d05a9ae0fb 100644 // We don't need to parse pending // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) } --- -2.26.0 - diff --git a/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch index 148a52d383..6390cb2504 100644 --- a/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch +++ b/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch @@ -1,4 +1,4 @@ -From f63660a943a8fba16b0aaa6ef611c6935c4b854b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 18:28:43 -0800 Subject: [PATCH] Don't nest if we don't need to when cerealising text @@ -6,7 +6,7 @@ Subject: [PATCH] Don't nest if we don't need to when cerealising text diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java -index fa4eab5b0b..0ab611564e 100644 +index fa4eab5b0b72595fb247b512d732bebe3a98a776..0ab611564edc3cd9322e0dbe21832510e9c35bbf 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java @@ -29,7 +29,14 @@ public class PacketPlayOutChat implements Packet { @@ -25,6 +25,3 @@ index fa4eab5b0b..0ab611564e 100644 } else { packetdataserializer.a(this.a); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch index ec959685cf..0949322f43 100644 --- a/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch +++ b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch @@ -1,4 +1,4 @@ -From 98ec6b7cf28a3e3838f508be5f36fb8750059300 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 8 Mar 2016 23:25:45 -0500 Subject: [PATCH] Disable Scoreboards for non players by default @@ -11,7 +11,7 @@ So avoid looking up scoreboards and short circuit to the "not on a team" logic which is most likely to be true. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index abbf59bb91..04430aae52 100644 +index abbf59bb91021821876a8960e8f77fac24457ec4..04430aae52205ee167662004e45c145b9d2e8bed 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -203,4 +203,9 @@ public class PaperWorldConfig { @@ -25,7 +25,7 @@ index abbf59bb91..04430aae52 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5892d344ad..10855cec1e 100644 +index 5892d344ad9eb25af78aa45727beee216fd4e1ea..10855cec1e0bee6af0878bad0d0b05c5a637fad2 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2269,6 +2269,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -37,7 +37,7 @@ index 5892d344ad..10855cec1e 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index d4d60220ef..591bf14a62 100644 +index d4d60220efdf32ee84eef57a7155e7de513cf029..591bf14a6270a67e0bf705a90869c1223b9b36fd 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -535,6 +535,7 @@ public abstract class EntityLiving extends Entity { @@ -48,6 +48,3 @@ index d4d60220ef..591bf14a62 100644 boolean flag = scoreboardteam != null && this.world.getScoreboard().addPlayerToTeam(this.getUniqueIDString(), scoreboardteam); if (!flag) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 5e243cc87e..3611265103 100644 --- a/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,11 +1,11 @@ -From 4bbba33157c98db6b74b394a0725b98fa7ef1e24 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:43:39 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 966d23add1..da86ee4149 100644 +index 966d23add13a3139adead8f8969c0a4ff34929c6..da86ee41499b02959755328544307aed39752483 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -623,4 +623,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -25,6 +25,3 @@ index 966d23add1..da86ee4149 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch index a36e4c37bd..00deca6a8a 100644 --- a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch @@ -1,11 +1,11 @@ -From 3cd2a97bdd201676e91b79e7eff3af5289c57778 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 23:17:52 -0400 Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5e8739462e..3c8c9c9cd4 100644 +index 5e8739462eface8b3bbc7ef8c0e08763e45c5b2e..3c8c9c9cd4cf4bc4f8c0da26f139d67fd8c5474b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1335,7 +1335,11 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -22,7 +22,7 @@ index 5e8739462e..3c8c9c9cd4 100644 // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5ce7504c5f..c4c3727850 100644 +index 5ce7504c5f2c8049bd65d9558f9e413495c8894e..c4c372785045050c878e8df82425bc98c3c498b1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -133,6 +133,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -69,6 +69,3 @@ index 5ce7504c5f..c4c3727850 100644 // Paper end @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch index dcbb7734ce..e4ae1be13d 100644 --- a/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch +++ b/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch @@ -1,4 +1,4 @@ -From 10153a917b3bdf01ba8935cf148e78722bf05e15 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Mar 2013 23:46:10 -0500 Subject: [PATCH] Chunk Save Reattempt @@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks. diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index c2312a227c..cee1ea8f43 100644 +index c2312a227c60417c02fc028047e1e4562bbfccff..cee1ea8f43e3135cd72a67c1c8067174feaf956e 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -241,7 +241,7 @@ public class RegionFile implements AutoCloseable { @@ -19,7 +19,7 @@ index c2312a227c..cee1ea8f43 100644 } } diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index a164aee880..fd46da95e0 100644 +index a164aee8805580069cc4b6daee7f2ad9137d34e0..fd46da95e0342c0004d82a36a164f3a18f9edac6 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -85,6 +85,7 @@ public final class RegionFileCache implements AutoCloseable { @@ -49,6 +49,3 @@ index a164aee880..fd46da95e0 100644 } public void close() throws IOException { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch index 08d400e0a7..c70f3d90a8 100644 --- a/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch +++ b/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch @@ -1,4 +1,4 @@ -From b79d63f6e63664388654ee5dd5c52f005261b113 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:17:38 -0400 Subject: [PATCH] Default loading permissions.yml before plugins @@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe A config option has been added for those who depend on the previous behavior, but I don't expect that. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index f402a29b09..6ef5bb9f32 100644 +index f402a29b0904a0094ffe6e42dbdc6fbc0912d9d9..6ef5bb9f323da7cbf8cb24d094bf43c4735549b0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -213,4 +213,9 @@ public class PaperConfig { @@ -30,7 +30,7 @@ index f402a29b09..6ef5bb9f32 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d5311eb017..8f6eb08a4f 100644 +index d5311eb017fa093c3068e7ea0c24026822b9d638..8f6eb08a4fb74727259b864cad782bf1c5054bdd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -370,6 +370,7 @@ public final class CraftServer implements Server { @@ -50,6 +50,3 @@ index d5311eb017..8f6eb08a4f 100644 helpMap.initializeCommands(); syncCommands(); } --- -2.26.2 - 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 7055784100..234d830bce 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 8fb4742f55e0600c6e4f1aa8bb5ff7ce0656c391 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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,7 +6,7 @@ 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 8f6eb08a4f..2ed74cd9fc 100644 +index 8f6eb08a4fb74727259b864cad782bf1c5054bdd..2ed74cd9fc48ce398e597dfc0bf333d085fe1437 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2089,5 +2089,23 @@ public final class CraftServer implements Server { @@ -33,6 +33,3 @@ index 8f6eb08a4f..2ed74cd9fc 100644 + } // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch index 919991250f..a29b0ebb60 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 87f90f2050a86c072a3d9817d8d1f4e5a056fe41 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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,7 +7,7 @@ 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 2ed74cd9fc..ddb16ca8b6 100644 +index 2ed74cd9fc48ce398e597dfc0bf333d085fe1437..ddb16ca8b69adc6d7e7efda7a7fb906234c19cb4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -825,8 +825,18 @@ public final class CraftServer implements Server { @@ -29,6 +29,3 @@ index 2ed74cd9fc..ddb16ca8b6 100644 resetRecipes(); reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot --- -2.26.2 - diff --git a/Spigot-Server-Patches/0063-Undead-horse-leashing.patch b/Spigot-Server-Patches/0063-Undead-horse-leashing.patch index e15c46d525..4c360f1693 100644 --- a/Spigot-Server-Patches/0063-Undead-horse-leashing.patch +++ b/Spigot-Server-Patches/0063-Undead-horse-leashing.patch @@ -1,4 +1,4 @@ -From 250964e7bf9d44a453df528c21d89e97496cc7ff Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:19:19 -0400 Subject: [PATCH] Undead horse leashing @@ -6,7 +6,7 @@ Subject: [PATCH] Undead horse leashing default false to match vanilla, but option to allow undead horse types to be leashed. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 04430aae52..dd21221534 100644 +index 04430aae52205ee167662004e45c145b9d2e8bed..dd21221534542d0265fa7d2178ab69c236579cf7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -208,4 +208,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 04430aae52..dd21221534 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java -index b611ade248..c56efe035a 100644 +index b611ade24817a7d6a740bf5366816b6694d79713..c56efe035ac87e5ef49ad39d82499c7348ee8d2f 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -107,7 +107,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven @@ -32,6 +32,3 @@ index b611ade248..c56efe035a 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch index d8b9f20561..88d8f68cc6 100644 --- a/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch +++ b/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch @@ -1,4 +1,4 @@ -From f9634dde4e5de99c5e737019f23742b402685c06 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 May 2015 23:00:19 -0400 Subject: [PATCH] Handle Item Meta Inconsistencies @@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the ItemMeta API equivalents, and should deprecate the old API's. diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index aa7501d366..db11c8ec69 100644 +index aa7501d366b15e7f7f64b7d98a1dccff99f731d2..db11c8ec692aaf37fc68fd39b95fcadacf5eda38 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader; @@ -79,7 +79,7 @@ index aa7501d366..db11c8ec69 100644 public boolean hasEnchantments() { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 4a9132c701..3dd912abe3 100644 +index 4a9132c7016b076ab35b5d66ce81bbd247e1a3ce..3dd912abe3fec22adb29d8edfd66b9f5f3bee4f6 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -178,28 +178,11 @@ public final class CraftItemStack extends ItemStack { @@ -194,7 +194,7 @@ index 4a9132c701..3dd912abe3 100644 static Map getEnchantments(net.minecraft.server.ItemStack item) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index f1c19d67dd..854836b839 100644 +index f1c19d67ddaae82a607a3898eaf0b18e6620111f..854836b839ffd650161f5ae7be3080362ac434b7 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableList; @@ -329,6 +329,3 @@ index f1c19d67dd..854836b839 100644 + // Paper end + } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch index b796cbc18c..a0208ed0c6 100644 --- a/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch +++ b/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 8e8d29b7f9cfdb5e9f28b625ab830d71b153237f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 15:12:22 -0400 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate Can set a much shorter despawn rate for arrows that players can not pick up. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index dd21221534..7de7b74ff6 100644 +index dd21221534542d0265fa7d2178ab69c236579cf7..7de7b74ff69bba1cbad24623d7eeff6c79812bab 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -213,4 +213,19 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index dd21221534..7de7b74ff6 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index a9f843aade..2b14b2c3fa 100644 +index a9f843aade2a9a5e7004632c72e5bb1b46d9ad65..2b14b2c3fa21e67ebd8f344a6ee066d67bf53044 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -266,7 +266,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -42,6 +42,3 @@ index a9f843aade..2b14b2c3fa 100644 this.die(); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch index af6594ea40..e684aa5deb 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 f64329dd0808766437089823ae66dfb54772316c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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,7 +6,7 @@ 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 a6b2867094..e7337fc368 100644 +index a6b2867094b6a757b4bc54a947b6972417845f2b..e7337fc368327876139f4610642a45321d0ecce2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -222,6 +222,18 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -29,7 +29,7 @@ index a6b2867094..e7337fc368 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 020e5c171a44f8886395849d718efd6f90659bab..4ee13ac45483022417e08bb7a4461eb34b3ec84a 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 { @@ -40,6 +40,3 @@ index 020e5c171a..4ee13ac454 100644 public boolean a(BlockPosition blockposition) { return (double) (blockposition.getX() + 1) > this.c() && (double) blockposition.getX() < this.e() && (double) (blockposition.getZ() + 1) > this.d() && (double) blockposition.getZ() < this.f(); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch index 8bf98365bc..e982887717 100644 --- a/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch @@ -1,11 +1,11 @@ -From f46b3339e7641d5ff21f758b7591b5ee43e94b5c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:07:20 -0400 Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 591bf14a62..8d14e6aced 100644 +index 591bf14a6270a67e0bf705a90869c1223b9b36fd..8d14e6aced932176600936c5c8b7cb5ae44819e3 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2899,9 +2899,10 @@ public abstract class EntityLiving extends Entity { @@ -41,6 +41,3 @@ index 591bf14a62..8d14e6aced 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch index 054159509e..409531a17c 100644 --- a/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,11 +1,11 @@ -From b4aa85b3b64d30c5f2bd0722931ce3d3e45badc8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 27 Sep 2015 01:18:02 -0400 Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 8d14e6aced..07c8f38f86 100644 +index 8d14e6aced932176600936c5c8b7cb5ae44819e3..07c8f38f86a9d1eed95ccddb4c97892b555faf59 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -496,7 +496,13 @@ public abstract class EntityLiving extends Entity { @@ -44,7 +44,7 @@ index 8d14e6aced..07c8f38f86 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c4c3727850..9a92b96ff1 100644 +index c4c372785045050c878e8df82425bc98c3c498b1..9a92b96ff194e8648aec1ad7db433e4d7550cc5b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1549,6 +1549,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -55,6 +55,3 @@ index c4c3727850..9a92b96ff1 100644 this.health = health; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0069-Waving-banner-workaround.patch b/Spigot-Server-Patches/0069-Waving-banner-workaround.patch index a9849c6734..fa50db8a5d 100644 --- a/Spigot-Server-Patches/0069-Waving-banner-workaround.patch +++ b/Spigot-Server-Patches/0069-Waving-banner-workaround.patch @@ -1,4 +1,4 @@ -From d42809993d8fee3c68b37e174b2170b4e4c3f8fd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Gabscap Date: Sat, 19 Mar 2016 22:25:11 +0100 Subject: [PATCH] Waving banner workaround @@ -6,7 +6,7 @@ Subject: [PATCH] Waving banner workaround This patch is a workaround for MC-63720 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java -index 88c3d7efaf..15af5927f3 100644 +index 88c3d7efaf467c1c1487f589c2cdbfb6aba734ec..15af5927f3d1d41b2a4f86b4267aa6a0485fb53e 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java @@ -4,7 +4,13 @@ import java.io.IOException; @@ -33,6 +33,3 @@ index 88c3d7efaf..15af5927f3 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch index 29f5511d9a..bfb0904463 100644 --- a/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch +++ b/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch @@ -1,4 +1,4 @@ -From 09b79a750e2cdaa0ed026e80f6575f14286e4981 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:33:47 -0400 Subject: [PATCH] Use a Shared Random for Entities @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 10855cec1e..58092a3d92 100644 +index 10855cec1e0bee6af0878bad0d0b05c5a637fad2..58092a3d92820dc790048b42ab11ab15a8bab84e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -58,6 +58,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -40,6 +40,3 @@ index 10855cec1e..58092a3d92 100644 this.fireTicks = -this.getMaxFireTicks(); this.justCreated = true; this.uniqueID = MathHelper.a(this.random); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch index 2e2132c3a7..4db0df7fcd 100644 --- a/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch @@ -1,11 +1,11 @@ -From aecb585f00a83690a97dc9ad9d98e963affb533e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 22 Mar 2016 12:04:28 -0500 Subject: [PATCH] Configurable spawn chances for skeleton horses diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 7de7b74ff6..6ef0e1399e 100644 +index 7de7b74ff69bba1cbad24623d7eeff6c79812bab..6ef0e1399e9ff260712db1a044068c125b1316d3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -228,4 +228,12 @@ public class PaperWorldConfig { @@ -22,7 +22,7 @@ index 7de7b74ff6..6ef0e1399e 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index a34df8ce5d..96ed2da1f8 100644 +index 7d4d59e310aa276c89916d0e706c6c829037eb73..9f801852ead82e7639175ab9342500c06909c20d 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -449,7 +449,7 @@ public class WorldServer extends World { @@ -34,6 +34,3 @@ index a34df8ce5d..96ed2da1f8 100644 if (flag1) { EntityHorseSkeleton entityhorseskeleton = (EntityHorseSkeleton) EntityTypes.SKELETON_HORSE.a((World) this); --- -2.26.2 - 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 c3558ce59b..a4436e059a 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 f986e8a7704f1cd279cfac3c7abad36b88d111ce Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 a3b5793e4824718c8bf3d0a4f963de0ca94a738e..71089442c189336fc0061852a661581784a64013 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 8f3eee5ea8..4b162a768e 100644 +index 8f3eee5ea812320af02e1bb6d2378fbbbef62e3c..4b162a768ed7f0a319309430b081943bf9c39b9c 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -304,12 +304,24 @@ public class Chunk implements IChunkAccess { @@ -64,7 +64,7 @@ index 8f3eee5ea8..4b162a768e 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 638b0e39798a3f75566fcf9ea48b81024e60b471..e056fbcb216977401fd2778fcd3ee7ed5f020214 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,7 +77,7 @@ 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 e7337fc368..6b1ff8f64f 100644 +index e7337fc368327876139f4610642a45321d0ecce2..6b1ff8f64f87e1d5fc98fd9733d6b45d312c1f69 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -171,11 +171,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -94,6 +94,3 @@ index e7337fc368..6b1ff8f64f 100644 } public static boolean b(int i) { --- -2.26.0 - diff --git a/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch index 18509cd796..8818a01d3e 100644 --- a/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch +++ b/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch @@ -1,11 +1,11 @@ -From a8a49f91d3932c9927cb153c05609f1505726c0d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 20 Mar 2016 06:45:01 -0400 Subject: [PATCH] Access items by EquipmentSlot diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java -index 5873b76236..ef4cd7a7b6 100644 +index 5873b76236436faa72a1f39a104ef64a25f36f31..ef4cd7a7b6c88552c40f2438958238fdfddf60da 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java @@ -268,4 +268,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i @@ -63,6 +63,3 @@ index 5873b76236..ef4cd7a7b6 100644 + } + // Paper end } --- -2.26.2 - 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 ec8881b126..44142135bc 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 502e755dbee48a834cc2ec9b4365733b22f5db62 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 ed1da4f4baf705f368247802cba42263030dba73..a6891b9fa7d01628de309e52b0cd8706d405ac36 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 42e86881bd891b176237eeb24492fe8050e36334..6cdce115814690f6e432aea54f69f32da2b4d206 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 11f81ab364..773f93edb7 100644 +index 11f81ab364b3bff8b61650a77eb8369c188e6e30..773f93edb753b505ba7ceb4cacaab8d4fcb13c68 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1147,6 +1147,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 6b1ff8f64f..1edd030865 100644 +index 6b1ff8f64f87e1d5fc98fd9733d6b45d312c1f69..1edd03086535834fc68260f0ee6653d84764ce87 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -369,7 +369,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -66,7 +66,7 @@ index 6b1ff8f64f..1edd030865 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 96ed2da1f8..9d0edf5382 100644 +index 9f801852ead82e7639175ab9342500c06909c20d..3769f0533dc0cfaf23e2411df982f901d788f80b 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 { @@ -77,6 +77,3 @@ index 96ed2da1f8..9d0edf5382 100644 // Add env and gen to constructor public WorldServer(MinecraftServer minecraftserver, Executor executor, WorldNBTStorage worldnbtstorage, WorldData worlddata, DimensionManager dimensionmanager, GameProfilerFiller gameprofilerfiller, WorldLoadListener worldloadlistener, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch index b4e33c6bdf..61c5ec8447 100644 --- a/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,11 +1,11 @@ -From 80a2bc8af10d734cb39781889e1caa58099ea2c7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:32:58 -0400 Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 3769f0533d..f8d1cb0231 100644 +index 3769f0533dc0cfaf23e2411df982f901d788f80b..f8d1cb0231bc3b5a45d7150cb125a8af64a9c0a7 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1146,7 +1146,7 @@ public class WorldServer extends World { @@ -25,6 +25,3 @@ index 3769f0533d..f8d1cb0231 100644 } } --- -2.26.0 - diff --git a/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch b/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch index b634c685cb..3a2bddc746 100644 --- a/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch +++ b/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch @@ -1,4 +1,4 @@ -From c2263eb09808a1b09eb8c356ddb3779a397ad21a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:46:14 -0400 Subject: [PATCH] Configurable Chunk Inhabited Time @@ -11,7 +11,7 @@ For people who want all chunks to be treated equally, you can chose a fixed valu This allows to fine-tune vanilla gameplay. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 6ef0e1399e..5872e6b171 100644 +index 6ef0e1399e9ff260712db1a044068c125b1316d3..5872e6b171416686b11678ac9f65706b83b4e231 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -236,4 +236,14 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index 6ef0e1399e..5872e6b171 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 4b162a768e..6694d0e36c 100644 +index 4b162a768ed7f0a319309430b081943bf9c39b9c..6694d0e36c0a3dc86c5b4e6fc1f132395ac36fc0 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -970,7 +970,7 @@ public class Chunk implements IChunkAccess { @@ -42,6 +42,3 @@ index 4b162a768e..6694d0e36c 100644 } @Override --- -2.26.0 - diff --git a/Spigot-Server-Patches/0077-EntityPathfindEvent.patch b/Spigot-Server-Patches/0077-EntityPathfindEvent.patch index 81ea794bc4..cd3e9cc2d2 100644 --- a/Spigot-Server-Patches/0077-EntityPathfindEvent.patch +++ b/Spigot-Server-Patches/0077-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From 42343eac0abc983d8a61e91b5809fc7bde47e73f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 21:22:26 -0400 Subject: [PATCH] EntityPathfindEvent @@ -6,7 +6,7 @@ Subject: [PATCH] EntityPathfindEvent Fires when an Entity decides to start moving to a location. diff --git a/src/main/java/net/minecraft/server/Navigation.java b/src/main/java/net/minecraft/server/Navigation.java -index 3fdeda0cea..abf450917e 100644 +index 3fdeda0cea0b1df2d1f1051f5654e06bcbccd410..abf450917e605972d84cb603b966feb013ae0002 100644 --- a/src/main/java/net/minecraft/server/Navigation.java +++ b/src/main/java/net/minecraft/server/Navigation.java @@ -60,7 +60,7 @@ public class Navigation extends NavigationAbstract { @@ -19,7 +19,7 @@ index 3fdeda0cea..abf450917e 100644 private int t() { diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index a600ee7654..5e7158ba10 100644 +index a600ee7654aa0898c17c8a433580d92ce447320c..5e7158ba1053ae77fc5c5811d49214e877a5fe30 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -8,7 +8,7 @@ import javax.annotation.Nullable; @@ -85,7 +85,7 @@ index a600ee7654..5e7158ba10 100644 float f = (float) this.p.getValue(); BlockPosition blockposition = flag ? (new BlockPosition(this.a)).up() : new BlockPosition(this.a); diff --git a/src/main/java/net/minecraft/server/NavigationFlying.java b/src/main/java/net/minecraft/server/NavigationFlying.java -index 5b057e96db..f16c6d1faa 100644 +index 5b057e96db5e12bace186f449ae5658b25123000..f16c6d1faac21478cc9b828c478f3f38a90615fc 100644 --- a/src/main/java/net/minecraft/server/NavigationFlying.java +++ b/src/main/java/net/minecraft/server/NavigationFlying.java @@ -25,7 +25,7 @@ public class NavigationFlying extends NavigationAbstract { @@ -97,6 +97,3 @@ index 5b057e96db..f16c6d1faa 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch index 36c319cb8b..ec7d8d24fe 100644 --- a/Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch +++ b/Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch @@ -1,4 +1,4 @@ -From d89f075fe6b7d1c3c9048b2cf41b2dd23398b8a2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Tue, 29 Mar 2016 08:22:55 +0300 Subject: [PATCH] Sanitise RegionFileCache and make configurable. @@ -11,7 +11,7 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap). The maximum size of the RegionFileCache is also made configurable. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 6ef5bb9f32..d500cd75a9 100644 +index 6ef5bb9f323da7cbf8cb24d094bf43c4735549b0..d500cd75a9229584a70bbdbda6de9bce67b836e8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -218,4 +218,9 @@ public class PaperConfig { @@ -25,7 +25,7 @@ index 6ef5bb9f32..d500cd75a9 100644 + } } diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index fd46da95e0..5065ece393 100644 +index fd46da95e0342c0004d82a36a164f3a18f9edac6..5065ece393a47add3c4e888fd7fb3d9ba47acfed 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -25,7 +25,7 @@ public final class RegionFileCache implements AutoCloseable { @@ -37,6 +37,3 @@ index fd46da95e0..5065ece393 100644 ((RegionFile) this.cache.removeLast()).close(); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0079-Do-not-load-chunks-for-Pathfinding.patch b/Spigot-Server-Patches/0079-Do-not-load-chunks-for-Pathfinding.patch index 2fee840082..0383bbef4f 100644 --- a/Spigot-Server-Patches/0079-Do-not-load-chunks-for-Pathfinding.patch +++ b/Spigot-Server-Patches/0079-Do-not-load-chunks-for-Pathfinding.patch @@ -1,11 +1,11 @@ -From 7177740911357c93cc743f8eaf9fbc3a1e148949 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 31 Mar 2016 19:17:58 -0400 Subject: [PATCH] Do not load chunks for Pathfinding diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java -index 53c15c1c0b..29c66b983d 100644 +index 53c15c1c0bf2d902e6b0325e0964f88f6d5fd6a5..29c66b983dc503903a76bab753bb9035ec10f54c 100644 --- a/src/main/java/net/minecraft/server/ChunkCache.java +++ b/src/main/java/net/minecraft/server/ChunkCache.java @@ -27,7 +27,7 @@ public class ChunkCache implements IBlockAccess, ICollisionAccess { @@ -18,7 +18,7 @@ index 53c15c1c0b..29c66b983d 100644 } diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 5e7158ba10..39a0c45bb0 100644 +index 5e7158ba1053ae77fc5c5811d49214e877a5fe30..39a0c45bb0e3d2fcfbcc07192f9e1e61570c922e 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -28,7 +28,7 @@ public abstract class NavigationAbstract { @@ -31,7 +31,7 @@ index 5e7158ba10..39a0c45bb0 100644 public NavigationAbstract(EntityInsentient entityinsentient, World world) { this.g = Vec3D.a; diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java -index 6199570618..67c63cfe33 100644 +index 6199570618d4642b7ca7b2472852cec6af0202d9..67c63cfe333e328cbd00ada970bd81efebfe30b6 100644 --- a/src/main/java/net/minecraft/server/Pathfinder.java +++ b/src/main/java/net/minecraft/server/Pathfinder.java @@ -19,7 +19,7 @@ public class Pathfinder { @@ -44,7 +44,7 @@ index 6199570618..67c63cfe33 100644 public Pathfinder(PathfinderAbstract pathfinderabstract, int i) { this.e = pathfinderabstract; diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java -index ef248ebcc4..4240ca81cb 100644 +index ef248ebcc4419609836c2025548aefb3afcf27d1..4240ca81cb6debecc54dcf9a550e9d916dfa8f9f 100644 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java @@ -365,7 +365,8 @@ public class PathfinderNormal extends PathfinderAbstract { @@ -82,6 +82,3 @@ index ef248ebcc4..4240ca81cb 100644 Block block = iblockdata.getBlock(); Material material = iblockdata.getMaterial(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch index 8e038e2584..709b726f1b 100644 --- a/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch @@ -1,11 +1,11 @@ -From 62abcd15d89ffa11a409e1e3f32823e8e3e3ff15 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:09:16 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java -index 680adbdeb0..3f7697b39c 100644 +index 680adbdeb03acb5471613b6ad9c2ecaba9c402c6..3f7697b39ce31174a14b1f62c6549ee3a2cfcec2 100644 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; @@ -18,7 +18,7 @@ index 680adbdeb0..3f7697b39c 100644 private Vec3D c; private EnumHand d; diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 3c8c9c9cd4..505189c82b 100644 +index 3c8c9c9cd4cf4bc4f8c0da26f139d67fd8c5474b..505189c82b7544d4fbb3922153e9db1503375b0e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1912,6 +1912,16 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -38,6 +38,3 @@ index 3c8c9c9cd4..505189c82b 100644 } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0081-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0081-Fix-reducedDebugInfo-not-initialized-on-client.patch index c6c12b13ef..4ad61fa2a1 100644 --- a/Spigot-Server-Patches/0081-Fix-reducedDebugInfo-not-initialized-on-client.patch +++ b/Spigot-Server-Patches/0081-Fix-reducedDebugInfo-not-initialized-on-client.patch @@ -1,11 +1,11 @@ -From f1d1d42b895ba98532d394c35ceec862886b9c0a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 20:37:03 -0400 Subject: [PATCH] Fix reducedDebugInfo not initialized on client diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 541e3ce830..9691d84f2c 100644 +index 541e3ce83042b4363cdff3baf3dfcd3eba9b4820..9691d84f2c3bef7218ecca57248dafcbba00be83 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -150,6 +150,7 @@ public abstract class PlayerList { @@ -16,6 +16,3 @@ index 541e3ce830..9691d84f2c 100644 this.d(entityplayer); entityplayer.getStatisticManager().c(); entityplayer.B().a(entityplayer); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0082-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0082-Configurable-Grass-Spread-Tick-Rate.patch index 16ec34a3b3..f4c224ea37 100644 --- a/Spigot-Server-Patches/0082-Configurable-Grass-Spread-Tick-Rate.patch +++ b/Spigot-Server-Patches/0082-Configurable-Grass-Spread-Tick-Rate.patch @@ -1,11 +1,11 @@ -From 49e9a07a84c5ecd9a5aa3d63c5963268f2e05837 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 16:28:17 -0400 Subject: [PATCH] Configurable Grass Spread Tick Rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 5872e6b171..47f5f8055e 100644 +index 5872e6b171416686b11678ac9f65706b83b4e231..47f5f8055ed45914309ca9a295ac48b89f192320 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -246,4 +246,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 5872e6b171..47f5f8055e 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java -index 9b25fc2f9e..2b19b6754a 100644 +index 9b25fc2f9e3990acf4e8e4b325fe7a67a4b4d804..2b19b6754acd1b5ed60faee154b5af2b6635645e 100644 --- a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java +++ b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java @@ -29,6 +29,7 @@ public abstract class BlockDirtSnowSpreadable extends BlockDirtSnow { @@ -31,6 +31,3 @@ index 9b25fc2f9e..2b19b6754a 100644 if (!b(iblockdata, (IWorldReader) worldserver, blockposition)) { // CraftBukkit start if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(worldserver, blockposition, Blocks.DIRT.getBlockData()).isCancelled()) { --- -2.26.2 - 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 ed03744aef..a53ee4bf9a 100644 --- a/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -1,11 +1,11 @@ -From 1cefaa9a672b3e58591c2ac43356124db0d8e250 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 1edd030865..aaedbaf4d7 100644 +index 1edd03086535834fc68260f0ee6653d84764ce87..aaedbaf4d7eb7750b356e184ac4a4f5e38d91b54 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -439,6 +439,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -16,6 +16,3 @@ index 1edd030865..aaedbaf4d7 100644 this.a(blockposition.west(), block, blockposition); this.a(blockposition.east(), block, blockposition); this.a(blockposition.down(), block, blockposition); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0084-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0084-Remove-Debug-checks-from-DataBits.patch index f619251c9e..c8465b02d2 100644 --- a/Spigot-Server-Patches/0084-Remove-Debug-checks-from-DataBits.patch +++ b/Spigot-Server-Patches/0084-Remove-Debug-checks-from-DataBits.patch @@ -1,4 +1,4 @@ -From cec31418064a1a10421fa38960d93e81bafa54d0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 21:38:58 -0400 Subject: [PATCH] Remove Debug checks from DataBits @@ -9,7 +9,7 @@ Before: http://i.imgur.com/nQsMzAE.png After: http://i.imgur.com/nJ46crB.png diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java -index 2edd9b8714..f9680b6830 100644 +index 2edd9b87146a3d1b6623b0efb17b28b524f18c2f..f9680b6830c77f31e1eb8b6845dd6d58d04f624a 100644 --- a/src/main/java/net/minecraft/server/DataBits.java +++ b/src/main/java/net/minecraft/server/DataBits.java @@ -15,7 +15,7 @@ public class DataBits { @@ -52,6 +52,3 @@ index 2edd9b8714..f9680b6830 100644 int j = i * this.b; int k = j >> 6; int l = (i + 1) * this.b - 1 >> 6; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch index 7726dc95cc..d3e909972e 100644 --- a/Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch +++ b/Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch @@ -1,4 +1,4 @@ -From b0aeb42715aa2222b1a2628054587922b009a709 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 6 Apr 2016 01:04:23 -0500 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names @@ -12,7 +12,7 @@ for this on CB at one point but I can't find it. We may need to do this ourselves at some point in the future. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 47f5f8055e..b1d1a3c1f8 100644 +index 47f5f8055ed45914309ca9a295ac48b89f192320..b1d1a3c1f84e0d2153de257183687502c8f393d1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -252,4 +252,9 @@ public class PaperWorldConfig { @@ -26,7 +26,7 @@ index 47f5f8055e..b1d1a3c1f8 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 505189c82b..669d9a41d6 100644 +index 505189c82b7544d4fbb3922153e9db1503375b0e..669d9a41d6a6b4226ba4bee7084f8cfe804e0b1a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1648,7 +1648,16 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -48,7 +48,7 @@ index 505189c82b..669d9a41d6 100644 if (((LazyPlayerSet) event.getRecipients()).isLazy()) { for (Object recipient : minecraftServer.getPlayerList().players) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 9691d84f2c..9212501b8b 100644 +index 9691d84f2c3bef7218ecca57248dafcbba00be83..9212501b8b1cdf8102a752deda1cf38257fbd358 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -165,7 +165,7 @@ public abstract class PlayerList { @@ -60,6 +60,3 @@ index 9691d84f2c..9212501b8b 100644 playerconnection.a(entityplayer.locX(), entityplayer.locY(), entityplayer.locZ(), entityplayer.yaw, entityplayer.pitch); this.players.add(entityplayer); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0086-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0086-Workaround-for-setting-passengers-on-players.patch index 6ade6b8844..bf66c2fd4c 100644 --- a/Spigot-Server-Patches/0086-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0086-Workaround-for-setting-passengers-on-players.patch @@ -1,4 +1,4 @@ -From 5944abbca04dc1991485a3f8caf188f5af9502f6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 10 Apr 2016 03:23:32 -0500 Subject: [PATCH] Workaround for setting passengers on players @@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players SPIGOT-1915 & GH-114 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 9a92b96ff1..a392632a72 100644 +index 9a92b96ff194e8648aec1ad7db433e4d7550cc5b..a392632a72e63cffc1e22527b995b638ca20724a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -768,6 +768,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -27,6 +27,3 @@ index 9a92b96ff1..a392632a72 100644 @Override public void setSneaking(boolean sneak) { getHandle().setSneaking(sneak); --- -2.26.2 - 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 6d2d39eb2b..c1a95a641b 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 a4f8c250978dfb502b0fb75ef5b15bf9481f0e9a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 aaedbaf4d7..0e8d31babd 100644 +index aaedbaf4d7eb7750b356e184ac4a4f5e38d91b54..0e8d31babd39857c2754c19ddc780f8c840a443c 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 { @@ -67,7 +67,7 @@ index aaedbaf4d7..0e8d31babd 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index f8d1cb0231..f46da0e8a0 100644 +index f8d1cb0231bc3b5a45d7150cb125a8af64a9c0a7..f46da0e8a0c5b060b2424c59c4a205294c657889 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1631,7 +1631,7 @@ public class WorldServer extends World { @@ -88,6 +88,3 @@ index f8d1cb0231..f46da0e8a0 100644 while (iterator.hasNext()) { TileEntity tileentity = (TileEntity) iterator.next(); --- -2.26.0 - diff --git a/Spigot-Server-Patches/0088-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0088-Don-t-tick-Skulls-unused-code.patch index dcc7ea1794..067640d7e0 100644 --- a/Spigot-Server-Patches/0088-Don-t-tick-Skulls-unused-code.patch +++ b/Spigot-Server-Patches/0088-Don-t-tick-Skulls-unused-code.patch @@ -1,11 +1,11 @@ -From 43fe866388e181882a33f5bc40a3d2bf1e5accdd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:30:10 -0400 Subject: [PATCH] Don't tick Skulls - unused code diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java -index 99442bb130..177cceb77f 100644 +index 99442bb130220cf00e728e3a0da7fd6a04aa8994..177cceb77f8783fe93ba7e4342de9c589f155c1b 100644 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java @@ -24,7 +24,7 @@ import com.mojang.authlib.ProfileLookupCallback; @@ -26,6 +26,3 @@ index 99442bb130..177cceb77f 100644 public void tick() { Block block = this.getBlock().getBlock(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch index 3ac11b043e..f3c92f631a 100644 --- a/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch @@ -1,11 +1,11 @@ -From a0482f792d823cfb102cbbb3a7089f8e1ca93870 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index d500cd75a9..e4f0db64c0 100644 +index d500cd75a9229584a70bbdbda6de9bce67b836e8..e4f0db64c061af684c28f50f0a37fbca693af7be 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -223,4 +223,9 @@ public class PaperConfig { @@ -19,7 +19,7 @@ index d500cd75a9..e4f0db64c0 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 773f93edb7..36d20d5e3a 100644 +index 773f93edb753b505ba7ceb4cacaab8d4fcb13c68..36d20d5e3a622bb944f89c37e8b9050ccea2c86d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -454,6 +454,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 13 Apr 2016 20:21:38 -0700 Subject: [PATCH] Add handshake event to allow plugins to handle client @@ -6,7 +6,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 963dbd0648..d0b9c6e3dc 100644 +index 963dbd0648ea9295fe603bc683ffef0d2e22d62d..d0b9c6e3dcae76d802e095731c78fb9693982f90 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -73,8 +73,33 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -44,6 +44,3 @@ index 963dbd0648..d0b9c6e3dc 100644 String[] split = packethandshakinginsetprotocol.hostname.split("\00"); if ( split.length == 3 || split.length == 4 ) { packethandshakinginsetprotocol.hostname = split[0]; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch index 3fb2a027ae..a32a2c1d3c 100644 --- a/Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch +++ b/Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch @@ -1,4 +1,4 @@ -From 2f6eb4e6e9fa1f88646a2026a1d3330e79f36d50 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Apr 2016 00:39:33 -0400 Subject: [PATCH] Configurable RCON IP address @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable RCON IP address For servers with multiple IP's, ability to bind to a specific interface. diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java -index ad1e3508a7..0c3ec83570 100644 +index ad1e3508a736504399b525a6ea322d3292b870b7..0c3ec8357039035e63fe9e97ea5ceb952330ef6e 100644 --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java +++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java @@ -54,6 +54,8 @@ public class DedicatedServerProperties extends PropertyManager> { @@ -45,7 +45,7 @@ index d7e81a6d99..729455ce53 100644 } diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java -index e48d6dcd74..2ce490be00 100644 +index e48d6dcd749aa26e55ae3c02bfca172e97a205de..2ce490be00409c0bc96f8ad92ada4f6dcca50a8a 100644 --- a/src/main/java/net/minecraft/server/RemoteControlListener.java +++ b/src/main/java/net/minecraft/server/RemoteControlListener.java @@ -25,7 +25,7 @@ public class RemoteControlListener extends RemoteConnectionThread { @@ -57,6 +57,3 @@ index e48d6dcd74..2ce490be00 100644 if (this.i.isEmpty()) { this.i = "0.0.0.0"; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0092-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0092-Prevent-Fire-from-loading-chunks.patch index 342a24c0f6..433093dddb 100644 --- a/Spigot-Server-Patches/0092-Prevent-Fire-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0092-Prevent-Fire-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 61f260d5704920bcccc81697511e86a7a7036fba Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 17 Apr 2016 17:27:09 -0400 Subject: [PATCH] Prevent Fire from loading chunks @@ -7,7 +7,7 @@ This causes the nether to spam unload/reload chunks, plus overall bad behavior. diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java -index 2909f78f87..d32857c872 100644 +index 2909f78f87b3d8870740f166e82d5e97b0ebdd48..d32857c8724f97c7625208cf815c275264179209 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -78,7 +78,7 @@ public class BlockFire extends Block { @@ -79,6 +79,3 @@ index 2909f78f87..d32857c872 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch index 335e5cabfa..c740043549 100644 --- a/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch @@ -1,11 +1,11 @@ -From 2a4220303570d469fb079084ef8db82a8b020e54 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 540048627e..aca885db36 100644 +index 540048627ef5716be2c9115b162a6eeaf9951ad9..aca885db36a8c93e32b3a2e40c407e4fdd5c97e4 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -37,7 +37,7 @@ import org.bukkit.inventory.MainHand; @@ -40,7 +40,7 @@ index 540048627e..aca885db36 100644 this.ci = packetplayinsettings.e(); this.getDataWatcher().set(EntityPlayer.bq, (byte) packetplayinsettings.f()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a392632a72..764a8ef952 100644 +index a392632a72e63cffc1e22527b995b638ca20724a..764a8ef952b6f3a38ae8430c0648ad1694aa89b9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1733,8 +1733,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -64,6 +64,3 @@ index a392632a72..764a8ef952 100644 public Set getHiddenPlayers() { Set ret = new HashSet(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch index 63e12ee671..e79c9532f5 100644 --- a/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,4 +1,4 @@ -From 34bdf0dafec4d014f808715594a14ddd83db6da4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API @@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API Don't even get me started diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 07c8f38f86..56c8b56b06 100644 +index 07c8f38f86a9d1eed95ccddb4c97892b555faf59..56c8b56b06a67e90c05f21c8141e61df7c9aafb1 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -924,10 +924,16 @@ public abstract class EntityLiving extends Entity { @@ -28,7 +28,7 @@ index 07c8f38f86..56c8b56b06 100644 if (this.valid) { this.world.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java -index 01d702d5ca..c3a9a9bd45 100644 +index 01d702d5ca3b09460a53f612ffdcc08a69724d4f..c3a9a9bd458ade65211730237177b1dadb6d1269 100644 --- a/src/main/java/net/minecraft/server/FoodMetaData.java +++ b/src/main/java/net/minecraft/server/FoodMetaData.java @@ -69,7 +69,7 @@ public class FoodMetaData { @@ -40,6 +40,3 @@ index 01d702d5ca..c3a9a9bd45 100644 this.a(f); this.foodTickTimer = 0; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0095-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0095-Add-ability-to-configure-frosted_ice-properties.patch index f3e8264539..44ec2804bf 100644 --- a/Spigot-Server-Patches/0095-Add-ability-to-configure-frosted_ice-properties.patch +++ b/Spigot-Server-Patches/0095-Add-ability-to-configure-frosted_ice-properties.patch @@ -1,11 +1,11 @@ -From 78d82eb02a7b1f6cb7b3ec388d930f7a5f31abfd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 21 Apr 2016 23:51:55 -0700 Subject: [PATCH] Add ability to configure frosted_ice properties diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b1d1a3c1f8..9e0c489540 100644 +index b1d1a3c1f84e0d2153de257183687502c8f393d1..9e0c4895403a264f927292db2ac06b00731986e3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -257,4 +257,14 @@ public class PaperWorldConfig { @@ -24,7 +24,7 @@ index b1d1a3c1f8..9e0c489540 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java -index af17aba8b8..5e414138e4 100644 +index af17aba8b8573b4f946e79a00a1443e6edc425a1..5e414138e4e542c16508d679e571aac72c082e7b 100644 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java @@ -13,6 +13,7 @@ public class BlockIceFrost extends BlockIce { @@ -53,6 +53,3 @@ index af17aba8b8..5e414138e4 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0096-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0096-remove-null-possibility-for-getServer-singleton.patch index 80a2f320b5..03303f40d4 100644 --- a/Spigot-Server-Patches/0096-remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/0096-remove-null-possibility-for-getServer-singleton.patch @@ -1,4 +1,4 @@ -From c9ad13a021cfb749f8be0ba04e1f35603fe335f9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Apr 2016 00:57:27 -0400 Subject: [PATCH] remove null possibility for getServer singleton @@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton to stop IDE complaining about potential NPE diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 36d20d5e3a..a5aa6553cc 100644 +index 36d20d5e3a622bb944f89c37e8b9050ccea2c86d..a5aa6553cc5d44ad9be41a4f35de73a1c5bf3cb8 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -68,6 +68,7 @@ import org.spigotmc.SlackActivityAccountant; // Spigot @@ -34,6 +34,3 @@ index 36d20d5e3a..a5aa6553cc 100644 } // CraftBukkit end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index cfc12e9265..ed6f1c00fe 100644 --- a/Spigot-Server-Patches/0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/Spigot-Server-Patches/0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -1,4 +1,4 @@ -From 2915b6164a366517b15f6ba175b76e949c3c19b1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Apr 2016 20:02:00 -0400 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes @@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 1f20fbbf92..0e8ba05455 100644 +index 1f20fbbf92c9d2937594c924837fff0bb9ee9238..0e8ba05455161883c86df6606104fab3529c3c0c 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -615,6 +615,12 @@ public abstract class EntityHuman extends EntityLiving { @@ -30,7 +30,7 @@ index 1f20fbbf92..0e8ba05455 100644 return entityitem; } diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java -index a56ac3da80..2f1be1995d 100644 +index a56ac3da806035e853bb912ab874265ecbcd2753..2f1be1995d1a188da5be792abd7ac6f126332f49 100644 --- a/src/main/java/net/minecraft/server/WorldMap.java +++ b/src/main/java/net/minecraft/server/WorldMap.java @@ -31,6 +31,7 @@ public class WorldMap extends PersistentBase { @@ -102,7 +102,7 @@ index a56ac3da80..2f1be1995d 100644 for ( org.bukkit.map.MapCursor cursor : render.cursors) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index f46da0e8a0..6271fb2092 100644 +index f46da0e8a0c5b060b2424c59c4a205294c657889..6271fb20920036958efcc3c8bd7a254e9a97a804 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1108,6 +1108,7 @@ public class WorldServer extends World { @@ -114,7 +114,7 @@ index f46da0e8a0..6271fb2092 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java -index 256a131781..5768cd512e 100644 +index 256a131781721c86dd6cdbc329335964570cbe8c..5768cd512ec166f1e8d1f4a28792015347297c3f 100644 --- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java +++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java @@ -5,7 +5,7 @@ import org.bukkit.map.MapCursor; @@ -126,6 +126,3 @@ index 256a131781..5768cd512e 100644 public final ArrayList cursors; public RenderData() { --- -2.26.0 - diff --git a/Spigot-Server-Patches/0098-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0098-LootTable-API-Replenishable-Lootables-Feature.patch index 80aebb5d04..aaf9e045e8 100644 --- a/Spigot-Server-Patches/0098-LootTable-API-Replenishable-Lootables-Feature.patch +++ b/Spigot-Server-Patches/0098-LootTable-API-Replenishable-Lootables-Feature.patch @@ -1,4 +1,4 @@ -From 8c1b8e54193775a9e2ed13bb9b26b8b74a737b67 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 21:19:14 -0400 Subject: [PATCH] LootTable API & Replenishable Lootables Feature @@ -11,7 +11,7 @@ This feature is good for long term worlds so that newer players do not suffer with "Every chest has been looted" diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 9e0c489540..6db1312035 100644 +index 9e0c4895403a264f927292db2ac06b00731986e3..6db1312035807c04b98408100fb0a5c04c07aff4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -267,4 +267,26 @@ public class PaperWorldConfig { @@ -43,7 +43,7 @@ index 9e0c489540..6db1312035 100644 } diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java new file mode 100644 -index 0000000000..d6fce3112e +index 0000000000000000000000000000000000000000..d6fce3112ebd8ef208c6fe45e0d887ec778fc092 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java @@ -0,0 +1,33 @@ @@ -82,7 +82,7 @@ index 0000000000..d6fce3112e +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java new file mode 100644 -index 0000000000..5e637782d5 +index 0000000000000000000000000000000000000000..5e637782d555cd68952e8bdbd47a63a636348ec6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java @@ -0,0 +1,28 @@ @@ -116,7 +116,7 @@ index 0000000000..5e637782d5 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java new file mode 100644 -index 0000000000..856843fc91 +index 0000000000000000000000000000000000000000..856843fc917ff6a7252b7900f7772cc9debe3649 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java @@ -0,0 +1,71 @@ @@ -193,7 +193,7 @@ index 0000000000..856843fc91 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java new file mode 100644 -index 0000000000..b5401eaf97 +index 0000000000000000000000000000000000000000..b5401eaf974857455c17c3f9cfdedf2eb4bde321 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java @@ -0,0 +1,179 @@ @@ -378,7 +378,7 @@ index 0000000000..b5401eaf97 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java new file mode 100644 -index 0000000000..f9fbc221bd +index 0000000000000000000000000000000000000000..f9fbc221bd8f9b04276611ef5b800595f23dedd7 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java @@ -0,0 +1,64 @@ @@ -448,7 +448,7 @@ index 0000000000..f9fbc221bd +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java new file mode 100644 -index 0000000000..d50410532c +index 0000000000000000000000000000000000000000..d50410532c27bd2aa932c2a3f5765ca1eede5304 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java @@ -0,0 +1,67 @@ @@ -520,7 +520,7 @@ index 0000000000..d50410532c + } +} diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 58092a3d92..7b295f4673 100644 +index 58092a3d92820dc790048b42ab11ab15a8bab84e..7b295f467315b50a62e177526354d1a87d96b375 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -73,6 +73,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -532,7 +532,7 @@ index 58092a3d92..7b295f4673 100644 public CraftEntity getBukkitEntity() { diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java -index 34ceace23f..60efd439af 100644 +index 34ceace23f82e2c0bbaaad01eaef0fd0045cf8e2..60efd439af8fa8ed46d81d703271aa945c19d77e 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java @@ -15,10 +15,11 @@ public abstract class EntityMinecartContainer extends EntityMinecartAbstract imp @@ -591,7 +591,7 @@ index 34ceace23f..60efd439af 100644 if (entityhuman != null) { diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java -index f5316a4045..d4cbce3243 100644 +index f5316a4045efdd6bffba226b4a6244961a8b245d..d4cbce3243fe1f4973c9c0ae0dbdab10e3390897 100644 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java @@ -6,8 +6,9 @@ import javax.annotation.Nullable; @@ -646,7 +646,7 @@ index f5316a4045..d4cbce3243 100644 if (entityhuman != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index 2831419446..17d80b5c6e 100644 +index 2831419446f4bd531f614f59308c8f5b61933507..17d80b5c6e512e0c582b05c92bb795b004ba27c2 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -64,7 +64,7 @@ public class CraftBlockEntityState extends CraftBlockState @@ -659,7 +659,7 @@ index 2831419446..17d80b5c6e 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java -index 6beb992622..019fa71181 100644 +index 6beb992622ba90dd37159124107b48426e5d7776..019fa71181ade0037598ace6288db587d16b5179 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java @@ -11,8 +11,9 @@ import org.bukkit.craftbukkit.CraftWorld; @@ -674,7 +674,7 @@ index 6beb992622..019fa71181 100644 public CraftChest(final Block block) { super(block, TileEntityChest.class); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java -index e1ad26a242..678aa09d47 100644 +index e1ad26a242b9bff8f5a567c24cf58b2150c24144..678aa09d477f653461276e5eab277e1abc253dd8 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java @@ -1,5 +1,6 @@ @@ -703,7 +703,7 @@ index e1ad26a242..678aa09d47 100644 getSnapshot().setLootTable(key, seed); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java -index e05624e643..ab4807b2cd 100644 +index e05624e6432f55c3efff3f9d765975557d1be16f..ab4807b2cd3cdcd61d8ac4ae2825df69dd2b7c64 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java @@ -1,5 +1,6 @@ @@ -723,7 +723,7 @@ index e05624e643..ab4807b2cd 100644 public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java -index 2d776b520b..fcc9787848 100644 +index 2d776b520bd9b0b8f7475f10e59b02b2ad7b9d8b..fcc9787848c0a0a4025bdf698debf9592c818bff 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java @@ -47,7 +47,7 @@ public abstract class CraftMinecartContainer extends CraftMinecart implements Lo @@ -736,7 +736,7 @@ index 2d776b520b..fcc9787848 100644 getHandle().setLootTable(newKey, seed); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java -index 334bd5bb3f..f5b31237fc 100644 +index 334bd5bb3ffc8b2bcdfca3995cdbe543cee8f311..f5b31237fc6e62345edcc3d6b02ff9e94237ae31 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java @@ -1,5 +1,6 @@ @@ -755,6 +755,3 @@ index 334bd5bb3f..f5b31237fc 100644 private final CraftInventory inventory; public CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch index c6bf61d2a2..0bade466af 100644 --- a/Spigot-Server-Patches/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch +++ b/Spigot-Server-Patches/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch @@ -1,11 +1,11 @@ -From 67a608c152230f5c5e3459a40413771a226085ed Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 May 2016 23:33:08 -0400 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index e4f0db64c0..67f35fe66b 100644 +index e4f0db64c061af684c28f50f0a37fbca693af7be..67f35fe66b33a4b461a310b6ce4fdedb5eaf1ac4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -228,4 +228,9 @@ public class PaperConfig { @@ -19,7 +19,7 @@ index e4f0db64c0..67f35fe66b 100644 + } } diff --git a/src/main/java/net/minecraft/server/PersistentScoreboard.java b/src/main/java/net/minecraft/server/PersistentScoreboard.java -index 1eab0c310d..6bf66972f9 100644 +index 1eab0c310d330ce37658bffb24e519c51cb24dbf..6bf66972f9ea2c3c9ee53a904a753453ebf0a69e 100644 --- a/src/main/java/net/minecraft/server/PersistentScoreboard.java +++ b/src/main/java/net/minecraft/server/PersistentScoreboard.java @@ -174,6 +174,7 @@ public class PersistentScoreboard extends PersistentBase { @@ -30,6 +30,3 @@ index 1eab0c310d..6bf66972f9 100644 NBTTagCompound nbttagcompound = new NBTTagCompound(); nbttagcompound.setString("Name", scoreboardteam.getName()); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch index 35936d65ef..0a646f4c8b 100644 --- a/Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch +++ b/Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch @@ -1,11 +1,11 @@ -From 4d0faf8e4e7f5d5624935cf833db8eafd501c1c1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 12 May 2016 23:02:58 -0500 Subject: [PATCH] System property for disabling watchdoge diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index d961000611..121c7ff601 100644 +index d9610006113e5f67c2feeea332b2920230822d41..121c7ff60195f9904b8afb3a305e97bbcb80a738 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -57,7 +57,7 @@ public class WatchdogThread extends Thread @@ -17,6 +17,3 @@ index d961000611..121c7ff601 100644 { Logger log = Bukkit.getServer().getLogger(); log.log( Level.SEVERE, "------------------------------" ); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch index 34c6a3a30c..422bb8476a 100644 --- a/Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch +++ b/Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch @@ -1,4 +1,4 @@ -From ec8f872ec6d8766f5f5c088ba89d7906a3f7bbd6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 20:47:41 -0400 Subject: [PATCH] Optimize UserCache / Thread Safe @@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase the user never changed the default setting for Spigot's save on stop only. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a5aa6553cc..35d31a9c36 100644 +index a5aa6553cc5d44ad9be41a4f35de73a1c5bf3cb8..35d31a9c36e837fcc361e8ba82c89aaee319b73d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -760,7 +760,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 16 May 2016 23:19:16 -0400 Subject: [PATCH] Avoid blocking on Network Manager creation @@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation Per Paper issue 294 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java -index e7e2168508..37a22ba6f7 100644 +index e7e216850894e764a3b5d92bf86d5a530a0fa503..37a22ba6f7a2ac54759428d23d5ea9787bb557f7 100644 --- a/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -39,6 +39,15 @@ public class ServerConnection { @@ -42,6 +42,3 @@ index e7e2168508..37a22ba6f7 100644 // This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 ) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch index 52f55a2fe4..150c0065be 100644 --- a/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch +++ b/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch @@ -1,11 +1,11 @@ -From ad3a24ae6121d99c3f4daed4878346628c2f676f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 22 May 2016 20:20:55 -0500 Subject: [PATCH] Optional TNT doesn't move in water diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 6db1312035..8cf3076f4e 100644 +index 6db1312035807c04b98408100fb0a5c04c07aff4..8cf3076f4e0d8d7e81158881c763f89ebda7e678 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -2,7 +2,6 @@ package com.destroystokyo.paper; @@ -32,7 +32,7 @@ index 6db1312035..8cf3076f4e 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7b295f4673..1aade318ef 100644 +index 7b295f467315b50a62e177526354d1a87d96b375..1aade318ef9b2ecd867a0301c79fb082a78d45c7 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2719,6 +2719,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -49,7 +49,7 @@ index 7b295f4673..1aade318ef 100644 } diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index 7f8b8f5a36..9c31edade2 100644 +index 7f8b8f5a365d44f03cb4dd60a7403721f9859446..9c31edade247baac6811ef3ec98e88a332bcffba 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -80,7 +80,27 @@ public class EntityTNTPrimed extends Entity { @@ -94,7 +94,7 @@ index 7f8b8f5a36..9c31edade2 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index a13fd9b340..3ff7a7b4a8 100644 +index a13fd9b3404381879663c1f694a5d1903d1fd884..3ff7a7b4a853068eba2fb034246a58116a846523 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -36,7 +36,7 @@ public class EntityTrackerEntry { @@ -106,6 +106,3 @@ index a13fd9b340..3ff7a7b4a8 100644 // Paper start private java.util.Map trackedPlayerMap = null; --- -2.26.2 - 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 ee2f961fba..4d89dbe102 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 22f9fbc6d5e5f74244f4daa7803a1ca297f1b956 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 98a255ae578d4cdc6c0081c5fe7991a8a9b574f2..4c3062ece97409056b614cf36fefea22ad22864d 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,7 +77,7 @@ 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 0e8d31babd..86de3c634d 100644 +index 0e8d31babd39857c2754c19ddc780f8c840a443c..86de3c634de0e9b9a320e1e71d2fb01fddd1a1e8 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -84,6 +84,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -88,6 +88,3 @@ index 0e8d31babd..86de3c634d 100644 public CraftWorld getWorld() { return this.world; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0105-Add-server-name-parameter.patch b/Spigot-Server-Patches/0105-Add-server-name-parameter.patch index 6607394941..0d4fa9b3aa 100644 --- a/Spigot-Server-Patches/0105-Add-server-name-parameter.patch +++ b/Spigot-Server-Patches/0105-Add-server-name-parameter.patch @@ -1,11 +1,11 @@ -From 48366d69c03dc877f1738ddd8e106e422cf938f0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Sat, 28 May 2016 16:54:03 +0200 Subject: [PATCH] Add server-name parameter diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 1ee4050609..afbe711acb 100644 +index 1ee40506095ed14f50b4b8031bb882e9bea475b5..afbe711acbd1cbaf307513d4fede44bb17b3caae 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -137,6 +137,14 @@ public class Main { @@ -23,6 +23,3 @@ index 1ee4050609..afbe711acb 100644 } }; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0106-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0106-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch index d979446e90..90eea7b3c9 100644 --- a/Spigot-Server-Patches/0106-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch +++ b/Spigot-Server-Patches/0106-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch @@ -1,4 +1,4 @@ -From f141e318dd22df3d6fdc2eb58f4e3d5447fdb4f8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 31 May 2016 22:53:50 -0400 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world @@ -6,7 +6,7 @@ Subject: [PATCH] Only send Dragon/Wither Death sounds to same world Also fix view distance lookup diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index d4fd58414c..8762577696 100644 +index d4fd58414c98a0ba10bbea7fc0ecef44e8ac8d60..87625776963d6143d570cda8e72fda6b3f50047f 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -572,8 +572,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -24,7 +24,7 @@ index d4fd58414c..8762577696 100644 double deltaZ = this.locZ() - player.locZ(); double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index 2edf466ee2..2e95069c19 100644 +index 2edf466ee24841cf1cc3b6a8c896ea82f09c17fd..2e95069c1907df951680f2a00441a72500c48430 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -207,8 +207,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity { @@ -41,6 +41,3 @@ index 2edf466ee2..2e95069c19 100644 double deltaX = this.locX() - player.locX(); double deltaZ = this.locZ() - player.locZ(); double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0107-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0107-Fix-Double-World-Add-issues.patch index cd14a64cf2..d3853688e6 100644 --- a/Spigot-Server-Patches/0107-Fix-Double-World-Add-issues.patch +++ b/Spigot-Server-Patches/0107-Fix-Double-World-Add-issues.patch @@ -1,4 +1,4 @@ -From c645776c533b1d5a34749e7882d577dfbe87d117 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 21 Jun 2016 22:54:34 -0400 Subject: [PATCH] Fix Double World Add issues @@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added. Also add debug if something else tries to, and abort before world gets bad state diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6271fb2092..3508fd7084 100644 +index 6271fb20920036958efcc3c8bd7a254e9a97a804..3508fd7084db5dc908c5cddc790bb37f44a50e25 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -997,6 +997,7 @@ public class WorldServer extends World { @@ -19,6 +19,3 @@ index 6271fb2092..3508fd7084 100644 if (entity.dead) { // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit return false; --- -2.26.0 - diff --git a/Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch index 97d817ff74..9a5e3b777b 100644 --- a/Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch +++ b/Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch @@ -1,4 +1,4 @@ -From 8ee372396e90b9726ce78e193b6215290e45300a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 17 Jun 2016 20:50:11 -0400 Subject: [PATCH] Fix Old Sign Conversion @@ -9,7 +9,7 @@ Subject: [PATCH] Fix Old Sign Conversion This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java -index dad966825d..8c411ff074 100644 +index dad966825d988f275ed30c6f8f80d54d12d35c66..8c411ff074425138dd21f1577d8ecd19c355fb93 100644 --- a/src/main/java/net/minecraft/server/DefinedStructure.java +++ b/src/main/java/net/minecraft/server/DefinedStructure.java @@ -203,9 +203,11 @@ public class DefinedStructure { @@ -25,7 +25,7 @@ index dad966825d..8c411ff074 100644 } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index e2f3cec742..630b279158 100644 +index e2f3cec7420edbd284b531ca7d1d121459fc098c..630b279158f26902ebdcc6e5c810b189ce49c910 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -20,6 +20,7 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -37,7 +37,7 @@ index e2f3cec742..630b279158 100644 @Nullable protected World world; diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 4a48c09e96..03f6ddf000 100644 +index 4a48c09e96ec5c2002ba297870ee5f06191f95f2..03f6ddf0003f0ef44ede31cf7a3491580ff0b5de 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -55,13 +55,14 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // @@ -57,6 +57,3 @@ index 4a48c09e96..03f6ddf000 100644 if (this.world instanceof WorldServer) { try { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0109-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0109-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch index 59529544bd..4d9ee673c5 100644 --- a/Spigot-Server-Patches/0109-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch +++ b/Spigot-Server-Patches/0109-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch @@ -1,11 +1,11 @@ -From ce653accafa8063528892b6926d01c3380613418 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 16 Jul 2016 19:11:17 -0500 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index d32bec70d0..581199e6dc 100644 +index d32bec70d0c03f8d0e8888e7544637729a1bef08..581199e6dcddb3692ccc6b6cf6c42fa5ef1f5e7e 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -86,7 +86,7 @@ public class UserCache { @@ -17,6 +17,3 @@ index d32bec70d0..581199e6dc 100644 UUID uuid = EntityHuman.a(new GameProfile((UUID) null, s)); GameProfile gameprofile = new GameProfile(uuid, s); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0110-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0110-More-informative-vehicle-moved-wrongly-message.patch index d777f05d32..52aff467ef 100644 --- a/Spigot-Server-Patches/0110-More-informative-vehicle-moved-wrongly-message.patch +++ b/Spigot-Server-Patches/0110-More-informative-vehicle-moved-wrongly-message.patch @@ -1,11 +1,11 @@ -From 10f597b4f668d81719a369172d09d60a26df4c6f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Jul 2016 17:58:53 -0500 Subject: [PATCH] More informative vehicle moved wrongly message diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 669d9a41d6..7476f07aa1 100644 +index 669d9a41d6a6b4226ba4bee7084f8cfe804e0b1a..7476f07aa148f3f050213416a522cf7f9ab234d3 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -365,7 +365,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -17,6 +17,3 @@ index 669d9a41d6..7476f07aa1 100644 } Location curPos = this.getPlayer().getLocation(); // Spigot --- -2.26.2 - diff --git a/Spigot-Server-Patches/0111-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0111-Add-setting-for-proxy-online-mode-status.patch index 79eed5190f..4d768029f5 100644 --- a/Spigot-Server-Patches/0111-Add-setting-for-proxy-online-mode-status.patch +++ b/Spigot-Server-Patches/0111-Add-setting-for-proxy-online-mode-status.patch @@ -1,11 +1,11 @@ -From c773110496df7bacfb632c22a52695037fe942a9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 67f35fe66b..53f96a1576 100644 +index 67f35fe66b33a4b461a310b6ce4fdedb5eaf1ac4..53f96a1576582fce83999a1f7e9a2624506ed51f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -22,6 +22,7 @@ import org.bukkit.configuration.InvalidConfigurationException; @@ -31,7 +31,7 @@ index 67f35fe66b..53f96a1576 100644 + } } diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java -index 1422503e11..d3c2e1bedf 100644 +index 1422503e11ac632c7b94640d59d9aaa0c5cb2f8f..d3c2e1bedfde39c19fe293941036641ea72c1bcd 100644 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java @@ -58,7 +58,8 @@ public class NameReferencingFileConverter { @@ -45,7 +45,7 @@ index 1422503e11..d3c2e1bedf 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 ddb16ca8b6..a27783dcf3 100644 +index ddb16ca8b69adc6d7e7efda7a7fb906234c19cb4..a27783dcf3f7575b8527aefc60a15621520cbf19 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1399,7 +1399,8 @@ public final class CraftServer implements Server { @@ -58,6 +58,3 @@ index ddb16ca8b6..a27783dcf3 100644 { profile = console.getUserCache().getProfile( name ); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0112-Optimise-BlockState-s-hashCode-equals.patch b/Spigot-Server-Patches/0112-Optimise-BlockState-s-hashCode-equals.patch index 5fb894a0e0..4db5da51d8 100644 --- a/Spigot-Server-Patches/0112-Optimise-BlockState-s-hashCode-equals.patch +++ b/Spigot-Server-Patches/0112-Optimise-BlockState-s-hashCode-equals.patch @@ -1,4 +1,4 @@ -From 1cb6313f502ddae207028d16431f9c324bb6041f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 19 Aug 2016 01:52:56 +0100 Subject: [PATCH] Optimise BlockState's hashCode/equals @@ -9,7 +9,7 @@ object identity checks safely. Use a simpler optimized hashcode diff --git a/src/main/java/net/minecraft/server/BlockState.java b/src/main/java/net/minecraft/server/BlockState.java -index 0ce77d9230..00e67b567f 100644 +index 0ce77d9230f3d1c53df7c5b72a380a2fa0c6d882..00e67b567f00824b25b45e5ff5ecd62c87ea0309 100644 --- a/src/main/java/net/minecraft/server/BlockState.java +++ b/src/main/java/net/minecraft/server/BlockState.java @@ -28,23 +28,13 @@ public abstract class BlockState> implements IBlockState @@ -41,7 +41,7 @@ index 0ce77d9230..00e67b567f 100644 public int c() { diff --git a/src/main/java/net/minecraft/server/BlockStateBoolean.java b/src/main/java/net/minecraft/server/BlockStateBoolean.java -index d8738447d7..7ca302b522 100644 +index d8738447d794f6967307daa1271473903b76a632..7ca302b522df081755120c597a08d589193c57a6 100644 --- a/src/main/java/net/minecraft/server/BlockStateBoolean.java +++ b/src/main/java/net/minecraft/server/BlockStateBoolean.java @@ -30,8 +30,7 @@ public class BlockStateBoolean extends BlockState { @@ -55,7 +55,7 @@ index d8738447d7..7ca302b522 100644 return true; } else if (object instanceof BlockStateBoolean && super.equals(object)) { diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java -index 1486d460c8..7cdadc6b6a 100644 +index 1486d460c8ec3d117b4dc3d28b2c3f1b632e187b..7cdadc6b6abd069f9a1bc000a8f116f73b90e029 100644 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java @@ -49,8 +49,7 @@ public class BlockStateEnum & INamable> extends BlockState @@ -69,7 +69,7 @@ index 1486d460c8..7cdadc6b6a 100644 return true; } else if (object instanceof BlockStateEnum && super.equals(object)) { diff --git a/src/main/java/net/minecraft/server/BlockStateInteger.java b/src/main/java/net/minecraft/server/BlockStateInteger.java -index 6f35c365f9..0499a71705 100644 +index 6f35c365f9086a2289e17b4d8e73757ad2c7f87b..0499a71705f3bdac6c94a8dc340cc15e96d9586e 100644 --- a/src/main/java/net/minecraft/server/BlockStateInteger.java +++ b/src/main/java/net/minecraft/server/BlockStateInteger.java @@ -38,8 +38,7 @@ public class BlockStateInteger extends BlockState { @@ -82,6 +82,3 @@ index 6f35c365f9..0499a71705 100644 if (this == object) { return true; } else if (object instanceof BlockStateInteger && super.equals(object)) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0113-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0113-Configurable-packet-in-spam-threshold.patch index 5d912a4d1d..58a9a15ffd 100644 --- a/Spigot-Server-Patches/0113-Configurable-packet-in-spam-threshold.patch +++ b/Spigot-Server-Patches/0113-Configurable-packet-in-spam-threshold.patch @@ -1,11 +1,11 @@ -From ec00ef4b1c1c3af3cb1732472a58105d9354d942 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 11 Sep 2016 14:30:57 -0500 Subject: [PATCH] Configurable packet in spam threshold diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 53f96a1576..010b17d2e7 100644 +index 53f96a1576582fce83999a1f7e9a2624506ed51f..010b17d2e7a27ace6ff8b15edff577c4164d2e81 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -243,4 +243,13 @@ public class PaperConfig { @@ -23,7 +23,7 @@ index 53f96a1576..010b17d2e7 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 7476f07aa1..f057ebda81 100644 +index 7476f07aa148f3f050213416a522cf7f9ab234d3..f057ebda81250b4502f6d28443bec62cf861687a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1204,13 +1204,14 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -43,6 +43,3 @@ index 7476f07aa1..f057ebda81 100644 lastLimitedPacket = timestamp; limitedPackets = 0; return true; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0114-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0114-Configurable-flying-kick-messages.patch index 9c7cdf0db9..b5b3824335 100644 --- a/Spigot-Server-Patches/0114-Configurable-flying-kick-messages.patch +++ b/Spigot-Server-Patches/0114-Configurable-flying-kick-messages.patch @@ -1,11 +1,11 @@ -From 8df499ad8fa76fbdc030ae20aaaace12da1a23a2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 20 Sep 2016 00:58:01 +0000 Subject: [PATCH] Configurable flying kick messages diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 010b17d2e7..5a83fc21cb 100644 +index 010b17d2e7a27ace6ff8b15edff577c4164d2e81..5a83fc21cb6801d597a01fb4a83d30488f30bdb6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -252,4 +252,11 @@ public class PaperConfig { @@ -21,7 +21,7 @@ index 010b17d2e7..5a83fc21cb 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f057ebda81..5b304c04bc 100644 +index f057ebda81250b4502f6d28443bec62cf861687a..5b304c04bc77a0786aa362ceffea4c89bc4bb1e2 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -147,7 +147,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -42,6 +42,3 @@ index f057ebda81..5b304c04bc 100644 return; } } else { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0115-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0115-Chunk-registration-fixes.patch index dee6367a69..fc4516b592 100644 --- a/Spigot-Server-Patches/0115-Chunk-registration-fixes.patch +++ b/Spigot-Server-Patches/0115-Chunk-registration-fixes.patch @@ -1,4 +1,4 @@ -From e647e4285927a922c060a85f5d9282058d4cca2c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 22:54:28 -0400 Subject: [PATCH] Chunk registration fixes @@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr Keep them consistent diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 3004270455..eb99f3a967 100644 +index 3508fd7084db5dc908c5cddc790bb37f44a50e25..7417725363a09500215d5e5e3be1d3a4458dd5e4 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -696,7 +696,7 @@ public class WorldServer extends World { @@ -20,6 +20,3 @@ index 3004270455..eb99f3a967 100644 int k = MathHelper.floor(entity.locZ() / 16.0D); if (!entity.inChunk || entity.chunkX != i || entity.chunkY != j || entity.chunkZ != k) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch index 7e9c33ec27..541110605b 100644 --- a/Spigot-Server-Patches/0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch +++ b/Spigot-Server-Patches/0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch @@ -1,11 +1,11 @@ -From 499d387857d107c99875de30d18d3bcc5f617166 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 16 Jun 2016 00:17:23 -0400 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java -index 257ce11664..d45bba0c97 100644 +index 257ce11664e7388ec004f8fad62ad2fce2aeb791..d45bba0c97961eff6b5107ade63f897263eeff47 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java @@ -66,4 +66,15 @@ public class CraftFishHook extends AbstractProjectile implements FishHook { @@ -24,6 +24,3 @@ index 257ce11664..d45bba0c97 100644 + // Paper end + } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0117-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0117-Auto-fix-bad-Y-levels-on-player-login.patch index b3a535c01a..1f124f3728 100644 --- a/Spigot-Server-Patches/0117-Auto-fix-bad-Y-levels-on-player-login.patch +++ b/Spigot-Server-Patches/0117-Auto-fix-bad-Y-levels-on-player-login.patch @@ -1,4 +1,4 @@ -From 2bad213558c63e7cbf97dc68d6ae0983e4b8896f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 23:48:39 -0400 Subject: [PATCH] Auto fix bad Y levels on player login @@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login Bring down to a saner Y level if super high, as this can cause the server to crash diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index aca885db36..83ffee35fb 100644 +index aca885db36a8c93e32b3a2e40c407e4fdd5c97e4..83ffee35fb2f7de14dbaf06f62d2019eaf68814c 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -197,6 +197,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -17,6 +17,3 @@ index aca885db36..83ffee35fb 100644 if (nbttagcompound.hasKeyOfType("playerGameType", 99)) { if (this.getMinecraftServer().getForceGamemode()) { this.playerInteractManager.setGameMode(this.getMinecraftServer().getGamemode()); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0118-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0118-Option-to-remove-corrupt-tile-entities.patch index 45eb0f5831..1b93e5ea1e 100644 --- a/Spigot-Server-Patches/0118-Option-to-remove-corrupt-tile-entities.patch +++ b/Spigot-Server-Patches/0118-Option-to-remove-corrupt-tile-entities.patch @@ -1,11 +1,11 @@ -From cd4ec6fc6a45b34dc15ad63f669bd12e8bc91be5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 5 Oct 2016 16:27:36 -0500 Subject: [PATCH] Option to remove corrupt tile entities diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 8cf3076f4e..721eceeffc 100644 +index 8cf3076f4e0d8d7e81158881c763f89ebda7e678..721eceeffc843da8b9da1ccc2d07f3bcc901db76 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -298,4 +298,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 8cf3076f4e..721eceeffc 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 6694d0e36c..87d68a3e21 100644 +index 6694d0e36c0a3dc86c5b4e6fc1f132395ac36fc0..87d68a3e2161798b7496542093f09b2b739ad45b 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -630,6 +630,12 @@ public class Chunk implements IChunkAccess { @@ -35,6 +35,3 @@ index 6694d0e36c..87d68a3e21 100644 // Paper end // CraftBukkit end } --- -2.26.0 - diff --git a/Spigot-Server-Patches/0119-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0119-Add-EntityZapEvent.patch index a94adc69b3..68b28d0de0 100644 --- a/Spigot-Server-Patches/0119-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0119-Add-EntityZapEvent.patch @@ -1,11 +1,11 @@ -From d95f4ff8e1d12beaa62aeb7e3246e727caf18f45 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:30 -0700 Subject: [PATCH] Add EntityZapEvent diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java -index 5c24e22c7d..8d277566e9 100644 +index 5c24e22c7d0eb1f10b45fc782151f1d7606d5383..8d277566e9df010b6f86385bc8f018e4c8c2d3bf 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -164,6 +164,12 @@ public class EntityPig extends EntityAnimal { @@ -22,7 +22,7 @@ index 5c24e22c7d..8d277566e9 100644 if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) { return; diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index f723470503..5e3835851d 100644 +index f72347050302e4cb99d4c9b71b7e8acab545ea59..5e3835851d8c5e804542c256a54187e4ed05bace 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -681,6 +681,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -39,7 +39,7 @@ index f723470503..5e3835851d 100644 entitywitch.prepare(this.world, this.world.getDamageScaler(new BlockPosition(entitywitch)), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null); entitywitch.setNoAI(this.isNoAI()); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index c7ad049d12..a09de16554 100644 +index c7ad049d1214a2950bc604439b298aafab933da0..a09de165544ca3c5623d7dd735f0701612b0975b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1052,6 +1052,14 @@ public class CraftEventFactory { @@ -57,6 +57,3 @@ index c7ad049d12..a09de16554 100644 public static HorseJumpEvent callHorseJumpEvent(Entity horse, float power) { HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power); horse.getBukkitEntity().getServer().getPluginManager().callEvent(event); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch index f75a8ebe34..96c2424f9f 100644 --- a/Spigot-Server-Patches/0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch +++ b/Spigot-Server-Patches/0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch @@ -1,11 +1,11 @@ -From fc9b468c5ac3f558ecd43b5a615b7c99e085fa65 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 12 Nov 2016 23:25:22 -0600 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 721eceeffc..bff2e9d26d 100644 +index 721eceeffc843da8b9da1ccc2d07f3bcc901db76..bff2e9d26dc8057c3950d1b57ee2e7469e7f943c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -2,6 +2,7 @@ package com.destroystokyo.paper; @@ -30,7 +30,7 @@ index 721eceeffc..bff2e9d26d 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index e64722f63b..6683f7c5f3 100644 +index e64722f63bab6bc1ce97ca63d4fde7599f6c1296..6683f7c5f31b88187961335c5f708b8a4f77b5af 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -233,6 +233,15 @@ public class EntityFallingBlock extends Entity { @@ -49,6 +49,3 @@ index e64722f63b..6683f7c5f3 100644 this.ticksLived = nbttagcompound.getInt("Time"); if (nbttagcompound.hasKeyOfType("HurtEntities", 99)) { this.hurtEntities = nbttagcompound.getBoolean("HurtEntities"); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch index 6b6d49677b..a6db0fb77d 100644 --- a/Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch +++ b/Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch @@ -1,11 +1,11 @@ -From 1b1ff569739b0423592d8e291cf45b52d3b291d0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 08:31:45 -0500 Subject: [PATCH] Cache user authenticator threads diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 83ffee35fb..482d7b7cb6 100644 +index 83ffee35fb2f7de14dbaf06f62d2019eaf68814c..482d7b7cb6b89d79b2ce54338130481f9f1c8c24 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -4,7 +4,9 @@ import com.google.common.collect.Lists; @@ -66,6 +66,3 @@ index 83ffee35fb..482d7b7cb6 100644 this.cm = entityplayer.cm; this.cr = entityplayer.cr; this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft()); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0122-Optimise-removeQueue.patch b/Spigot-Server-Patches/0122-Optimise-removeQueue.patch index efbd200abb..f3dfb500c6 100644 --- a/Spigot-Server-Patches/0122-Optimise-removeQueue.patch +++ b/Spigot-Server-Patches/0122-Optimise-removeQueue.patch @@ -1,11 +1,11 @@ -From a905881b6d8c40a334db33e69861bf12dc6e7e6a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 25 Nov 2016 13:22:40 +0000 Subject: [PATCH] Optimise removeQueue diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index c6fd50daa8..19e72da6d9 100644 +index c6fd50daa842aae7558ae14196483b544c377c29..19e72da6d9a8bf43d1d25c1be3aa23c75dd6e5d7 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -97,6 +97,12 @@ public class LoginListener implements PacketLoginInListener { @@ -65,6 +65,3 @@ index c6fd50daa8..19e72da6d9 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0123-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0123-Allow-Reloading-of-Command-Aliases.patch index 71f6a41100..9052d5858c 100644 --- a/Spigot-Server-Patches/0123-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-Server-Patches/0123-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From db3026a6dd32a4b49e38ed655140d043ebd45ed7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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,7 +6,7 @@ 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 a27783dcf3..3cb57c3b8c 100644 +index a27783dcf3f7575b8527aefc60a15621520cbf19..3cb57c3b8ca8f29437bea52e9cf3512985f56eb5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2118,5 +2118,24 @@ public final class CraftServer implements Server { @@ -34,6 +34,3 @@ index a27783dcf3..3cb57c3b8c 100644 + } // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch index 4de41a648f..5d9e9b7fb7 100644 --- a/Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch @@ -1,11 +1,11 @@ -From 8abe0015fc29b079610b7534f624dad75b649535 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:48:33 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index f72bb0c138..0447800d9d 100644 +index f72bb0c13806c3fadcbbf345f3533c115a200a7f..0447800d9dc341af647a928abd8b79938eddbd6f 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -193,7 +193,7 @@ public class EntityExperienceOrb extends Entity { @@ -18,7 +18,7 @@ index f72bb0c138..0447800d9d 100644 this.die(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index a09de16554..0ed6611ac4 100644 +index a09de165544ca3c5623d7dd735f0701612b0975b..0ed6611ac4c4cb2fa324cd7d29107f0ff9c6a1f9 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -117,6 +117,7 @@ import org.bukkit.entity.ThrownPotion; @@ -47,6 +47,3 @@ index a09de16554..0ed6611ac4 100644 public static boolean handleBlockGrowEvent(World world, BlockPosition pos, IBlockData block) { return handleBlockGrowEvent(world, pos, block, 3); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0125-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0125-Don-t-let-fishinghooks-use-portals.patch index 5b21decd2b..1bab52c0ae 100644 --- a/Spigot-Server-Patches/0125-Don-t-let-fishinghooks-use-portals.patch +++ b/Spigot-Server-Patches/0125-Don-t-let-fishinghooks-use-portals.patch @@ -1,11 +1,11 @@ -From 23fa74cd73f85ca708127c9e169b9bcdfbff76ec Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 16 Dec 2016 16:03:19 -0600 Subject: [PATCH] Don't let fishinghooks use portals diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1aade318ef..3b948d0805 100644 +index 1aade318ef9b2ecd867a0301c79fb082a78d45c7..3b948d0805c86e2fbaf58b06736144c87cadf179 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -161,7 +161,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index 1aade318ef..3b948d0805 100644 public DimensionManager dimension; protected BlockPosition ai; diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 40bdcf4e75..39e3bd3795 100644 +index 40bdcf4e75bb36385e82ba8b8f2471760072705a..39e3bd37956d7e0a4d5f784a581e17a77b71f78b 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -160,6 +160,12 @@ public class EntityFishingHook extends Entity { @@ -34,6 +34,3 @@ index 40bdcf4e75..39e3bd3795 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch index 27e114b94a..a4a96b1ff7 100644 --- a/Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch @@ -1,11 +1,11 @@ -From be379d4bd4b66d56bdb9b87a7ea37f62872c1cbc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 2b14b2c3fa..634e2bd304 100644 +index 2b14b2c3fa21e67ebd8f344a6ee066d67bf53044..634e2bd3049d65bbef4ef12e2264049a6980fd71 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -187,6 +187,17 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -27,7 +27,7 @@ index 2b14b2c3fa..634e2bd304 100644 this.a((MovingObjectPosition) object); this.impulse = true; diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java -index 078cc25231..6756c79b31 100644 +index 078cc252313faca997e3a716fed5c5d2261c086c..6756c79b31aa04a110eeedd3c44b11abc34f4b5f 100644 --- a/src/main/java/net/minecraft/server/EntityFireball.java +++ b/src/main/java/net/minecraft/server/EntityFireball.java @@ -67,7 +67,16 @@ public abstract class EntityFireball extends Entity { @@ -49,7 +49,7 @@ index 078cc25231..6756c79b31 100644 // CraftBukkit start - Fire ProjectileHitEvent diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 39e3bd3795..807ec3394d 100644 +index 39e3bd37956d7e0a4d5f784a581e17a77b71f78b..807ec3394db7bef29bf92f2c200fd76f96df03ab 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -214,7 +214,16 @@ public class EntityFishingHook extends Entity { @@ -71,7 +71,7 @@ index 39e3bd3795..807ec3394d 100644 if (movingobjectposition.getType() == MovingObjectPosition.EnumMovingObjectType.ENTITY) { this.hooked = ((MovingObjectPositionEntity) movingobjectposition).getEntity(); diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java -index 2e4c9d4267..724b78b5d2 100644 +index 2e4c9d42677d3e48a8f8ad559a723fc4eeec07e3..724b78b5d2d7f4ce8de31c763d2d95b986c1b7f6 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -99,7 +99,16 @@ public abstract class EntityProjectile extends Entity implements IProjectile { @@ -93,7 +93,7 @@ index 2e4c9d4267..724b78b5d2 100644 this.c(((MovingObjectPositionBlock) movingobjectposition).getBlockPosition()); } else { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 0ed6611ac4..e6d4f7a06b 100644 +index 0ed6611ac4c4cb2fa324cd7d29107f0ff9c6a1f9..e6d4f7a06bf803054b14eb7af8b624175ff377a9 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1156,6 +1156,16 @@ public class CraftEventFactory { @@ -113,6 +113,3 @@ index 0ed6611ac4..e6d4f7a06b 100644 public static ProjectileLaunchEvent callProjectileLaunchEvent(Entity entity) { Projectile bukkitEntity = (Projectile) entity.getBukkitEntity(); ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0127-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0127-Prevent-Pathfinding-out-of-World-Border.patch index f58d711ed5..8b69127385 100644 --- a/Spigot-Server-Patches/0127-Prevent-Pathfinding-out-of-World-Border.patch +++ b/Spigot-Server-Patches/0127-Prevent-Pathfinding-out-of-World-Border.patch @@ -1,4 +1,4 @@ -From 0e1a904edeb60437632d29dcd1a6e4a83dc6c5f9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 19 Dec 2016 23:07:42 -0500 Subject: [PATCH] Prevent Pathfinding out of World Border @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border This prevents Entities from trying to run outside of the World Border diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 39a0c45bb0..bdd092e49d 100644 +index 39a0c45bb0e3d2fcfbcc07192f9e1e61570c922e..bdd092e49da13960cd8a65e989a351d65cb620f7 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -123,7 +123,7 @@ public abstract class NavigationAbstract { @@ -18,6 +18,3 @@ index 39a0c45bb0..bdd092e49d 100644 MCUtil.toLocation(getEntity().world, possibleTarget), target == null ? null : target.getBukkitEntity()).callEvent()) { if (!copiedSet) { copiedSet = true; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0128-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0128-Optimize-World.isLoaded-BlockPosition-Z.patch index 7da8fa61b2..d330c98763 100644 --- a/Spigot-Server-Patches/0128-Optimize-World.isLoaded-BlockPosition-Z.patch +++ b/Spigot-Server-Patches/0128-Optimize-World.isLoaded-BlockPosition-Z.patch @@ -1,4 +1,4 @@ -From 7228c835c503f73c39a3ceb9e4e9be0543e7aa2f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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,7 +6,7 @@ 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 86de3c634d..9632839598 100644 +index 86de3c634de0e9b9a320e1e71d2fb01fddd1a1e8..9632839598c0d6a24894780dd2f68b9abeb33a31 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -224,6 +224,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -21,6 +21,3 @@ index 86de3c634d..9632839598 100644 public boolean isLoadedAndInBounds(BlockPosition blockposition) { return getWorldBorder().isInBounds(blockposition) && getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch index 788ca8ff0a..b8f08716ca 100644 --- a/Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch +++ b/Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch @@ -1,4 +1,4 @@ -From 00ace7e06a151758f29a76ccb6a96735d94f1ced Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:15:11 -0500 Subject: [PATCH] Bound Treasure Maps to World Border @@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable one is in border that would of been missed. diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java -index 0f248b6de3..e8ce2ecf23 100644 +index 0f248b6de3b822642389eba2ce3569a6538bdece..e8ce2ecf23e58d82febf6b9441e0004e69cdc858 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -108,6 +108,7 @@ public abstract class StructureGenerator @@ -23,7 +23,7 @@ index 0f248b6de3..e8ce2ecf23 100644 if (structurestart != null && structurestart.e()) { diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java -index 4ee13ac454..5f10c4338e 100644 +index 4ee13ac45483022417e08bb7a4461eb34b3ec84a..5f10c4338e4f8feffd8f0145dee7550c4db6c9e0 100644 --- a/src/main/java/net/minecraft/server/WorldBorder.java +++ b/src/main/java/net/minecraft/server/WorldBorder.java @@ -24,6 +24,18 @@ public class WorldBorder { @@ -45,6 +45,3 @@ index 4ee13ac454..5f10c4338e 100644 public boolean isInBounds(ChunkCoordIntPair chunkcoordintpair) { return (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e() && (double) chunkcoordintpair.g() > this.d() && (double) chunkcoordintpair.e() < this.f(); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch index d89549929b..bccc901d2b 100644 --- a/Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch +++ b/Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch @@ -1,4 +1,4 @@ -From 7e84f51a74528165304c030d5ce13751d5db6ddd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:26:27 -0500 Subject: [PATCH] Configurable Cartographer Treasure Maps @@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's which are limited in quantity. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bff2e9d26d..f164844f33 100644 +index bff2e9d26dc8057c3950d1b57ee2e7469e7f943c..f164844f339793860e773c499443ce160d0a6830 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -312,4 +312,14 @@ public class PaperWorldConfig { @@ -28,7 +28,7 @@ index bff2e9d26d..f164844f33 100644 + } } diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java -index 3bcf0b385d..4764ffef77 100644 +index 3bcf0b385d1f707176dae9c3ee49370e2e6dd481..4764ffef77bf0a73018017a07103186a9ce55b8f 100644 --- a/src/main/java/net/minecraft/server/VillagerTrades.java +++ b/src/main/java/net/minecraft/server/VillagerTrades.java @@ -92,7 +92,8 @@ public class VillagerTrades { @@ -41,6 +41,3 @@ index 3bcf0b385d..4764ffef77 100644 if (blockposition != null) { ItemStack itemstack = ItemWorldMap.createFilledMapView(worldserver, blockposition.getX(), blockposition.getZ(), (byte) 2, true, true); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch index a4dc09376c..0f34b8cd1e 100644 --- a/Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch +++ b/Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch @@ -1,4 +1,4 @@ -From 60d3f0e9a0e8537ae6b7b3f99977001d91157a19 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Dec 2016 03:48:29 -0500 Subject: [PATCH] Optimize ItemStack.isEmpty() @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty() Remove hashMap lookup every check, simplify code to remove ternary diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index db11c8ec69..854cffe6c9 100644 +index db11c8ec692aaf37fc68fd39b95fcadacf5eda38..854cffe6c98956cbafa2ead9b831e39209a76c8d 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -150,7 +150,7 @@ public final class ItemStack { @@ -18,6 +18,3 @@ index db11c8ec69..854cffe6c9 100644 } public ItemStack cloneAndSubtract(int i) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch index 3239816a59..18dc2682d1 100644 --- a/Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,11 +1,11 @@ -From 86b880de6662f3ddeb6baba22b844ff78a0d40e1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:47:25 -0600 Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index ed6092f65a..176af6c889 100644 +index ed6092f65a57b696d1343b5b6c061422bd1220b1..176af6c889fa29d5df7c822f888cdc26f81110e6 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -43,6 +43,7 @@ public class EntityArmorStand extends EntityLiving { @@ -31,7 +31,7 @@ index ed6092f65a..176af6c889 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index 2b66a08ade..124c3185bc 100644 +index 2b66a08aded172164079952850f43a84c3f514b2..124c3185bc5c344555f684629c8818130d80ab3d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -211,4 +211,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { @@ -51,6 +51,3 @@ index 2b66a08ade..124c3185bc 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch index a8e459188d..a2af26f66d 100644 --- a/Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From 4d9d231abd06072ffbb2009b888d49a3bab160a9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Tue, 27 Dec 2016 01:57:57 +0000 Subject: [PATCH] Properly fix item duplication bug @@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug Credit to prplz for figuring out the real issue diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 482d7b7cb6..bf32997c42 100644 +index 482d7b7cb6b89d79b2ce54338130481f9f1c8c24..bf32997c422d478699c32ce0539a65c35fbf0d12 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1795,7 +1795,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -19,7 +19,7 @@ index 482d7b7cb6..bf32997c42 100644 @Override diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5b304c04bc..f367a76e82 100644 +index 5b304c04bc77a0786aa362ceffea4c89bc4bb1e2..f367a76e8286eb92814ff9287819c4d7da16f922 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2526,7 +2526,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -31,6 +31,3 @@ index 5b304c04bc..f367a76e82 100644 } // CraftBukkit end --- -2.26.2 - diff --git a/Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch index 2746345051..2bd7216984 100644 --- a/Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch @@ -1,11 +1,11 @@ -From 70269c1864d6ea0b5b7743546690de9f4894cfe4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Dec 2016 15:02:42 -0500 Subject: [PATCH] String based Action Bar API diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 9fb9a96ccb..48f88eaba4 100644 +index 9fb9a96ccb37f5c7f39403e24e7b3bdb9279fe81..48f88eaba40b54cdf24da794ae5dc692c33553c7 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -42,7 +42,7 @@ index 9fb9a96ccb..48f88eaba4 100644 public static boolean isMainThread() { return MinecraftServer.getServer().isMainThread(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 764a8ef952..d349f0c87b 100644 +index 764a8ef952b6f3a38ae8430c0648ad1694aa89b9..d349f0c87bfad19cf0bddb4709f1d7b0dd4b4a36 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -216,6 +216,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -64,6 +64,3 @@ index 764a8ef952..d349f0c87b 100644 @Override public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) { if (header != null) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0135-Firework-API-s.patch b/Spigot-Server-Patches/0135-Firework-API-s.patch index 0e6e6d6202..48fc515adb 100644 --- a/Spigot-Server-Patches/0135-Firework-API-s.patch +++ b/Spigot-Server-Patches/0135-Firework-API-s.patch @@ -1,11 +1,11 @@ -From 092b2b08642f45676a922bffd5f25beb8853ad11 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 28 Dec 2016 07:18:33 +0100 Subject: [PATCH] Firework API's diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java -index 4f51b9b654..278ef79d89 100644 +index 4f51b9b654e4a9c9ee43261edb241bcf3c346be2..278ef79d8962cc5d337e34891c7ea3a606336cbb 100644 --- a/src/main/java/net/minecraft/server/EntityFireworks.java +++ b/src/main/java/net/minecraft/server/EntityFireworks.java @@ -3,6 +3,8 @@ package net.minecraft.server; @@ -53,7 +53,7 @@ index 4f51b9b654..278ef79d89 100644 @Override diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java -index 313076d6d8..7be41c8698 100644 +index 313076d6d8aa130451c4d6cc2795d34fd39f3e5d..7be41c8698e86727978db7d72b3dd3fbfe6b7272 100644 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java @@ -199,6 +199,7 @@ public class ItemCrossbow extends ItemProjectileWeapon { @@ -65,7 +65,7 @@ index 313076d6d8..7be41c8698 100644 object = a(world, entityliving, itemstack, itemstack1); if (flag || f3 != 0.0F) { diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java -index 058c016b7b..92dac35ec4 100644 +index 058c016b7b12cea106916dbd81a231d29c67bc0f..92dac35ec4eefe0d5794d8205bc872d23a62e3cb 100644 --- a/src/main/java/net/minecraft/server/ItemFireworks.java +++ b/src/main/java/net/minecraft/server/ItemFireworks.java @@ -18,6 +18,7 @@ public class ItemFireworks extends Item { @@ -90,7 +90,7 @@ index 058c016b7b..92dac35ec4 100644 itemstack.subtract(1); } diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java -index 75604dbc69..98deaba12c 100644 +index 75604dbc69d0a416dc9d56ae3f795ed03e120af8..98deaba12ceb25f59d1b56420fb544a64b417ddd 100644 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java @@ -136,7 +136,7 @@ public class NBTTagCompound implements NBTBase { @@ -103,7 +103,7 @@ index 75604dbc69..98deaba12c 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java -index 475b7b004b..de74e7214a 100644 +index 475b7b004b7b30ee9e7d0dad92c4691ecd4afbdc..de74e7214a02a07e3ebdd099036c70bbc84c60e1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java @@ -2,6 +2,7 @@ package org.bukkit.craftbukkit.entity; @@ -144,6 +144,3 @@ index 475b7b004b..de74e7214a 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch index 4ef8f7fee6..0478b625bf 100644 --- a/Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 34f72c9416eb31d88837ed4065faa9c94e8f1d9a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 31 Dec 2016 21:44:50 -0500 Subject: [PATCH] PlayerTeleportEndGatewayEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent Allows you to access the Gateway being used in a teleport event diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java -index b907a3c4d8..78fba79378 100644 +index b907a3c4d8dcf0d6dadb98807779fdfe1d706a52..78fba79378173dc2c4290e048c3497e206332458 100644 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java @@ -133,7 +133,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick @@ -18,6 +18,3 @@ index b907a3c4d8..78fba79378 100644 Bukkit.getPluginManager().callEvent(teleEvent); if (teleEvent.isCancelled()) { return; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch index 1068e8d6c8..7eb6fa96ad 100644 --- a/Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From fbd5facd1e525a2128a68af57d7dfd527b47006b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:24:46 -0500 Subject: [PATCH] Provide E/TE/Chunk count stat methods @@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 3f420be58a..32e96bc057 100644 +index 3f420be58afb3721cef9caa413a2292a57406d19..32e96bc05704f10ac4830a661bd6abb71b71f487 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -278,6 +278,48 @@ public class CraftWorld implements World { @@ -59,6 +59,3 @@ index 3f420be58a..32e96bc057 100644 private static final Random rand = new Random(); public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch index 7e21241ac1..b25f3d1912 100644 --- a/Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch +++ b/Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch @@ -1,4 +1,4 @@ -From bc31fa9fd6d8ac4e68e16e61766ec8da84b32360 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:41:58 -0500 Subject: [PATCH] Enforce Sync Player Saves @@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 643e588394..2932519886 100644 +index 643e5883949de11d0205116e5ff11b4cc560ecb9..2932519886d0b8af83c1e92d4af23753d4782ba5 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -918,11 +918,13 @@ public abstract class PlayerList { @@ -24,6 +24,3 @@ index 643e588394..2932519886 100644 } public WhiteList getWhitelist() { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch index a0c4f52868..f92d4296fe 100644 --- a/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch @@ -1,11 +1,11 @@ -From e0021ddac8496e7b8997332ed030e3733ce7e909 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Sun, 8 Jan 2017 04:31:36 +0000 Subject: [PATCH] Don't allow entities to ride themselves - #572 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3b948d0805..3b02a65ba2 100644 +index 3b948d0805c86e2fbaf58b06736144c87cadf179..3b02a65ba2df5c01515c9cbf03b39b3c518451dc 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2029,6 +2029,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -16,6 +16,3 @@ index 3b948d0805..3b02a65ba2 100644 if (entity.getVehicle() != this) { throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)"); } else { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index ae616ba652..c01af3f6b4 100644 --- a/Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From 750408e59c59503d126a0e02b9809c26172fc8cc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:31:46 -0500 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player @@ -8,7 +8,7 @@ Adds lots of information about why this orb exists. Replaces isFromBottle() with logic that persists entity reloads too. diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 5de881371a..5f261b9b92 100644 +index 5de881371a485957fd8fadc7540a2b549b20dd65..5f261b9b92de4ca8638f41fa2947016cf590cf05 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -511,13 +511,13 @@ public class Block implements IMaterial { @@ -28,7 +28,7 @@ index 5de881371a..5f261b9b92 100644 } diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java -index 2d2cd09ad1..ed88e208d0 100644 +index 2d2cd09ad1126b3b6b7a979b8e4dd450806d58d3..ed88e208d00f3b19b5c5916cf87513ab511a5fb1 100644 --- a/src/main/java/net/minecraft/server/ContainerGrindstone.java +++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java @@ -81,7 +81,7 @@ public class ContainerGrindstone extends Container { @@ -41,7 +41,7 @@ index 2d2cd09ad1..ed88e208d0 100644 world.triggerEffect(1042, blockposition, 0); diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 8762577696..138e2ea56a 100644 +index 87625776963d6143d570cda8e72fda6b3f50047f..138e2ea56a91e519a34fd3be9c0ab111a4b17544 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -616,7 +616,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -54,7 +54,7 @@ index 8762577696..138e2ea56a 100644 } diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index 0447800d9d..d4275e733d 100644 +index 0447800d9dc341af647a928abd8b79938eddbd6f..d4275e733d9996d121efd95ae1ff4676a1ebfbb5 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -16,9 +16,59 @@ public class EntityExperienceOrb extends Entity { @@ -134,7 +134,7 @@ index 0447800d9d..d4275e733d 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 807ec3394d..73f5961aa3 100644 +index 807ec3394db7bef29bf92f2c200fd76f96df03ab..73f5961aa331aa94fbbc57c5b4db9bc43ee5cdde 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -401,7 +401,7 @@ public class EntityFishingHook extends Entity { @@ -147,7 +147,7 @@ index 807ec3394d..73f5961aa3 100644 // CraftBukkit end if (itemstack1.getItem().a(TagsItem.FISHES)) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 56c8b56b06..306435c1c6 100644 +index 56c8b56b06a67e90c05f21c8141e61df7c9aafb1..306435c1c6f28ad1a891d4ee8c124b14a83ae25b 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1379,7 +1379,8 @@ public abstract class EntityLiving extends Entity { @@ -161,7 +161,7 @@ index 56c8b56b06..306435c1c6 100644 this.expToDrop = 0; } diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java -index 0bfc0a773d..ba2f90cc6a 100644 +index 0bfc0a773da3e26cb0188adc8369215dcc953b62..ba2f90cc6ae617fe9bb8e08656b64ded924afa60 100644 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java @@ -43,7 +43,7 @@ public class EntityThrownExpBottle extends EntityProjectileThrowable { @@ -174,7 +174,7 @@ index 0bfc0a773d..ba2f90cc6a 100644 this.die(); diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index c73cc9ae4b..76296119a1 100644 +index c73cc9ae4b1f1f24e017b336b4e0e52275807c8b..76296119a197a433747ee2481079b36aebdb085c 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -510,7 +510,7 @@ public class EntityTurtle extends EntityAnimal { @@ -187,7 +187,7 @@ index c73cc9ae4b..76296119a1 100644 } diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 5e3835851d..6ca4fa43c4 100644 +index 5e3835851d8c5e804542c256a54187e4ed05bace..6ca4fa43c41ad555c093b90cf08cfdb1e73fda22 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -509,7 +509,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -200,7 +200,7 @@ index 5e3835851d..6ca4fa43c4 100644 } diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java -index 530c699964..2ad8dba5c0 100644 +index 530c69996470ad79b93254ed39aa1b101c007c89..2ad8dba5c0f8424becacda44232813c5f4451fd4 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java @@ -147,7 +147,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract { @@ -213,7 +213,7 @@ index 530c699964..2ad8dba5c0 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java -index 1ab2668e91..2b708761d0 100644 +index 1ab2668e910dca6c02d03b88b27fe709cbee785c..2b708761d0401ead80d8ff832decc8d725c5f61c 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java @@ -117,7 +117,7 @@ public class PathfinderGoalBreed extends PathfinderGoal { @@ -226,7 +226,7 @@ index 1ab2668e91..2b708761d0 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index f6c6ea4aaf..dff3eb1188 100644 +index f6c6ea4aaf16fae057c356bc4f42fb3a86c63f91..dff3eb118856bb4b79e4378b5c39100d65a09767 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -374,7 +374,7 @@ public class PlayerInteractManager { @@ -239,7 +239,7 @@ index f6c6ea4aaf..dff3eb1188 100644 return true; diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java -index d2698e847c..edc4a5c34e 100644 +index d2698e847cfcbc4d2f91b4f5d66b38b47f86c10e..edc4a5c34e8064d900668d132b3496e354408eaf 100644 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java @@ -2,7 +2,7 @@ package net.minecraft.server; @@ -252,7 +252,7 @@ index d2698e847c..edc4a5c34e 100644 public SlotFurnaceResult(EntityHuman entityhuman, IInventory iinventory, int i, int j, int k) { diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index 8dc47452a4..560e2f42b7 100644 +index 8dc47452a453023e332303575b36732417abd84e..560e2f42b702c5c4870640ad7da3aa48c3f4b1eb 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -554,7 +554,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I @@ -265,7 +265,7 @@ index 8dc47452a4..560e2f42b7 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 32e96bc057..265af7ac7f 100644 +index 32e96bc05704f10ac4830a661bd6abb71b71f487..265af7ac7fba984ed3d486d6c5d01b54dd2592d9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1799,7 +1799,7 @@ public class CraftWorld implements World { @@ -278,7 +278,7 @@ index 32e96bc057..265af7ac7f 100644 entity = new EntityLightning(world, x, y, z, false); } else if (Firework.class.isAssignableFrom(clazz)) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java -index 1b512cc45c..fbad045675 100644 +index 1b512cc45c7a185b8a7950ff9882e1f2af171cc8..fbad0456757cadea4d7f50c63dbb07bad7e8baa9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java @@ -20,6 +20,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb { @@ -300,6 +300,3 @@ index 1b512cc45c..fbad045675 100644 @Override public EntityExperienceOrb getHandle() { return (EntityExperienceOrb) entity; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch index 27352b22d5..59ef779b79 100644 --- a/Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From a1ec5a8f6f55ddcb50322130ad363eab26c9ad85 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 22 Jan 2017 18:07:56 -0500 Subject: [PATCH] Cap Entity Collisions @@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped. You can set this to 0 to disable collisions. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f164844f33..751551f173 100644 +index f164844f339793860e773c499443ce160d0a6830..751551f173338217f6682532a9a5e1a269415177 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -322,4 +322,10 @@ public class PaperWorldConfig { @@ -27,7 +27,7 @@ index f164844f33..751551f173 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3b02a65ba2..0d7dcc1463 100644 +index 3b02a65ba2df5c01515c9cbf03b39b3c518451dc..0d7dcc1463efa395458e95f1236a20241ff66abe 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -39,7 +39,7 @@ index 3b02a65ba2..0d7dcc1463 100644 // Spigot end diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 306435c1c6..639d113de3 100644 +index 306435c1c6f28ad1a891d4ee8c124b14a83ae25b..639d113de3fa1bbb610c596b84121ccde58f2622 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2626,8 +2626,11 @@ public abstract class EntityLiving extends Entity { @@ -55,6 +55,3 @@ index 306435c1c6..639d113de3 100644 this.C(entity); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch index 07a76cbfa9..f44fe4accf 100644 --- a/Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch +++ b/Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch @@ -1,4 +1,4 @@ -From a35f6e41f024a41879cc8e4336d92a1fd8c6ce88 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 5 Feb 2017 00:04:04 -0500 Subject: [PATCH] Remove CraftScheduler Async Task Debugger @@ -9,7 +9,7 @@ One report of a suspected memory leak with the system. This adds additional overhead to asynchronous task dispatching diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index d05a9ae0fb..8c48130db0 100644 +index d05a9ae0fbdc8c9d86109a631d059299e51a2a39..8c48130db03e1baffa341222caa6a82b29525671 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -420,7 +420,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -46,6 +46,3 @@ index d05a9ae0fb..8c48130db0 100644 } @Deprecated --- -2.26.2 - diff --git a/Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch index 768ca1399a..05402127f0 100644 --- a/Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch +++ b/Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch @@ -1,11 +1,11 @@ -From a87b8cf80a36016fbd3dcd7bec2fd18a97dfb30d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 7 Feb 2017 16:55:35 -0600 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 6374bf8785..0edba59675 100644 +index 6374bf8785f7d99ab8750deba79867433d31eb5f..0edba596754c6d5379c3c1eb0469aee447b7113f 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -132,7 +132,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -36,6 +36,3 @@ index 6374bf8785..0edba59675 100644 runnable.run(); } --- -2.26.0 - diff --git a/Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch index 71e5766816..a23d9d8a1e 100644 --- a/Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch @@ -1,11 +1,11 @@ -From 7ec60a5af380c5e04364415e3b8d9f7ca0e4cace Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 18 Feb 2017 19:29:58 -0600 Subject: [PATCH] Do not let armorstands drown diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 176af6c889..992d7bfb0f 100644 +index 176af6c889fa29d5df7c822f888cdc26f81110e6..992d7bfb0fd26540fbdeaf8d7845e8c2c81d608b 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -826,5 +826,10 @@ public class EntityArmorStand extends EntityLiving { @@ -20,7 +20,7 @@ index 176af6c889..992d7bfb0f 100644 // Paper end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 639d113de3..e6b48cc0ea 100644 +index 639d113de3fa1bbb610c596b84121ccde58f2622..e6b48cc0eafc4612181495a1f412fd4f411ab0e5 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -227,6 +227,7 @@ public abstract class EntityLiving extends Entity { @@ -40,6 +40,3 @@ index 639d113de3..e6b48cc0ea 100644 this.setAirTicks(this.l(this.getAirTicks())); if (this.getAirTicks() == -20) { this.setAirTicks(0); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch index 8645845407..c561044671 100644 --- a/Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch @@ -1,4 +1,4 @@ -From 260deda1f274cc80fd7c887f953d6d30a35ea578 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 12 May 2017 23:34:11 -0500 Subject: [PATCH] Properly handle async calls to restart the server @@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result in corruption/dataloss. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 35d31a9c36..8d6a089007 100644 +index 35d31a9c36e837fcc361e8ba82c89aaee319b73d..8d6a0890073adbbb39db202f80d4b83cef2ceca9 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -88,6 +88,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 13 May 2017 20:11:21 -0500 Subject: [PATCH] Add system property to disable book size limits @@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without limiting incoming data from packets in some other way. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -index bf17acbafd..e3adcc0c72 100644 +index bf17acbafd8a08b4c0eb84636a5708697735c560..e3adcc0c72b9e3b971e42b5dc1c60b862ed2bce3 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java @@ -35,6 +35,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { @@ -56,6 +56,3 @@ index bf17acbafd..e3adcc0c72 100644 page = page.substring(0, MAX_PAGE_LENGTH); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index 4f8e433f2e..2f1df97269 100644 --- a/Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -1,4 +1,4 @@ -From 9e36c2094cacd51abb15815246f4b43306e42378 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 16 May 2017 21:29:08 -0500 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement @@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release. To be converted into a Paper-API event at some point in the future? diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 751551f173..eae1690cc6 100644 +index 751551f173338217f6682532a9a5e1a269415177..eae1690cc6db99b2f3af70a121f83b455b0fb20d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -328,4 +328,10 @@ public class PaperWorldConfig { @@ -26,7 +26,7 @@ index 751551f173..eae1690cc6 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 0e8ba05455..ad79e4521c 100644 +index 0e8ba05455161883c86df6606104fab3529c3c0c..ad79e4521cee699de86a94885b27356339bcb866 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -463,7 +463,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -39,7 +39,7 @@ index 0e8ba05455..ad79e4521c 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f367a76e82..046ef418f8 100644 +index f367a76e8286eb92814ff9287819c4d7da16f922..046ef418f8e16a8d50846f140d7147a3178ebca2 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1773,6 +1773,13 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -56,6 +56,3 @@ index f367a76e82..046ef418f8 100644 break; case RELEASE_SHIFT_KEY: this.player.setSneaking(false); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch index 763ef23e46..4cbe763be8 100644 --- a/Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From 3e406ea2d3a38c88264fe49a53fd4e70952226aa Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 9 Jun 2017 07:24:34 -0700 Subject: [PATCH] Add configuration option to prevent player names from being @@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 5a83fc21cb..295b8390cb 100644 +index 5a83fc21cb6801d597a01fb4a83d30488f30bdb6..295b8390cbc31fc1fcb225f80ec2ff8f0df44321 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -259,4 +259,9 @@ public class PaperConfig { @@ -20,7 +20,7 @@ index 5a83fc21cb..295b8390cb 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3cb57c3b8c..9eb4acf93c 100644 +index 3cb57c3b8ca8f29437bea52e9cf3512985f56eb5..9eb4acf93c65a1473e385be317e5d93cd4571d41 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2137,5 +2137,10 @@ public final class CraftServer implements Server { @@ -34,6 +34,3 @@ index 3cb57c3b8c..9eb4acf93c 100644 + } // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch index 571f89a224..5a1b82c959 100644 --- a/Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -1,4 +1,4 @@ -From e85a62542d8c3b655573da398360b9eb03bf297a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 @@ -19,7 +19,7 @@ Other changes: configuration diff --git a/pom.xml b/pom.xml -index 6cc18aa360..01dcaf4f4b 100644 +index 6cc18aa360c20448fca59cf5490d69267c8e2521..01dcaf4f4bbe03a118958e494544d7fc4a92e300 100644 --- a/pom.xml +++ b/pom.xml @@ -44,10 +44,27 @@ @@ -75,7 +75,7 @@ index 6cc18aa360..01dcaf4f4b 100644 org.apache.maven.plugins diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java new file mode 100644 -index 0000000000..cd6e259239 +index 0000000000000000000000000000000000000000..cd6e259239b068f1e1b33f45004cf5d37ac5a1a3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -0,0 +1,40 @@ @@ -121,7 +121,7 @@ index 0000000000..cd6e259239 +} diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java new file mode 100644 -index 0000000000..685deaa0e5 +index 0000000000000000000000000000000000000000..685deaa0e5d1ddc13e3a7c0471b1cfcf1710c869 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java @@ -0,0 +1,17 @@ @@ -143,7 +143,7 @@ index 0000000000..685deaa0e5 + +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 4b1f8c5373..d34f772fae 100644 +index 4b1f8c53737f998fa57859146d5ddb999cdc8d41..d34f772fae3543cec6a130831b1f3eaa67934944 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -86,6 +86,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -185,7 +185,7 @@ index 4b1f8c5373..d34f772fae 100644 System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true)); System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true)); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8d6a089007..284793e4bf 100644 +index 8d6a0890073adbbb39db202f80d4b83cef2ceca9..284793e4bf04cddae3e070a1fa0afdd18001fd2e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -57,7 +57,7 @@ import org.apache.commons.lang3.Validate; @@ -244,7 +244,7 @@ index 8d6a089007..284793e4bf 100644 public KeyPair getKeyPair() { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 56266a7729..77f1ddc8a8 100644 +index 56266a77296bc9a84de1d853a6d739337608b995..77f1ddc8a8d6fa816488de5d8c821bfa59f6c729 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -76,8 +76,7 @@ public abstract class PlayerList { @@ -258,7 +258,7 @@ index 56266a7729..77f1ddc8a8 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 9eb4acf93c..681a84e5b3 100644 +index 9eb4acf93c65a1473e385be317e5d93cd4571d41..681a84e5b3e7594a43fac0d47f1df2eef310bf81 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -42,7 +42,7 @@ import java.util.function.Consumer; @@ -285,7 +285,7 @@ index 9eb4acf93c..681a84e5b3 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 afbe711acb..fc07fdb590 100644 +index afbe711acbd1cbaf307513d4fede44bb17b3caae..fc07fdb590475ccaa09875b8fcbb81adc0db5e66 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; @@ -335,7 +335,7 @@ index afbe711acb..fc07fdb590 100644 MinecraftServer.main(options); } catch (Throwable t) { diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java -index e0bd5adc19..aae615c13b 100644 +index e0bd5adc19de0d4ab156bac95d3b4b2a86f89490..aae615c13b36f8e72b12260de8996317912fa917 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java @@ -2,15 +2,15 @@ package org.bukkit.craftbukkit.command; @@ -366,7 +366,7 @@ index e0bd5adc19..aae615c13b 100644 + }*/ // Paper } diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java -index befcc19f9b..5510266fb1 100644 +index befcc19f9b56df9096b98a23b0020f1db793ea5b..5510266fb114954322823b72e3199f33c4d7a9a7 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java @@ -4,20 +4,31 @@ import java.util.Collections; @@ -449,7 +449,7 @@ index befcc19f9b..5510266fb1 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java -index 70f8d42992..449e99d1b6 100644 +index 70f8d42992aa348ef7b2d03d22cdd59d7c73f0fe..449e99d1b673870ed6892f6ab2c715a2db35c35d 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java @@ -17,7 +17,7 @@ public class ServerShutdownThread extends Thread { @@ -462,7 +462,7 @@ index 70f8d42992..449e99d1b6 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java -index 99564fed7c..9a2da548b8 100644 +index 99564fed7ce77e29dbdc591bcfe656af741acf8a..9a2da548b8860b496e396564b2c8f6383f020193 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java @@ -5,12 +5,12 @@ import java.io.IOException; @@ -491,13 +491,13 @@ index 99564fed7c..9a2da548b8 100644 } diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties new file mode 100644 -index 0000000000..0694b21465 +index 0000000000000000000000000000000000000000..0694b21465fb9e4164e71862ff24b62241b191f2 --- /dev/null +++ b/src/main/resources/log4j2.component.properties @@ -0,0 +1 @@ +log4j.skipJansi=true diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 722ca84968..620b9490e5 100644 +index 722ca84968cbbbdeffd09939abff0cccd0a84010..620b9490e5f159080e50289d127404a1b56adbef 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -1,17 +1,14 @@ @@ -534,6 +534,3 @@ index 722ca84968..620b9490e5 100644 --- -2.26.2 - diff --git a/Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch index f4e8888d2d..94c367f99e 100644 --- a/Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch +++ b/Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch @@ -1,4 +1,4 @@ -From d7053f8d253427e736355b66282d61f9ef034903 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Jun 2017 21:01:18 +0100 Subject: [PATCH] provide a configurable option to disable creeper lingering @@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index eae1690cc6..39ab545756 100644 +index eae1690cc6db99b2f3af70a121f83b455b0fb20d..39ab5457569684bc66cd67f5f9d2505ef9f304ab 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -334,4 +334,10 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index eae1690cc6..39ab545756 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index cc9887d040..374cf28fb4 100644 +index cc9887d040c06e453f11e94bb260a4504a607301..374cf28fb42b13152f58fd63c4f0cb25eae6a2d9 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -228,7 +228,7 @@ public class EntityCreeper extends EntityMonster { @@ -33,6 +33,3 @@ index cc9887d040..374cf28fb4 100644 EntityAreaEffectCloud entityareaeffectcloud = new EntityAreaEffectCloud(this.world, this.locX(), this.locY(), this.locZ()); entityareaeffectcloud.setSource(this); // CraftBukkit --- -2.26.2 - diff --git a/Spigot-Server-Patches/0151-Item-canEntityPickup.patch b/Spigot-Server-Patches/0151-Item-canEntityPickup.patch index d9c64d9aa5..cfb76ecb2f 100644 --- a/Spigot-Server-Patches/0151-Item-canEntityPickup.patch +++ b/Spigot-Server-Patches/0151-Item-canEntityPickup.patch @@ -1,11 +1,11 @@ -From e06f91d4710249f1c61283faa5d93f5495654e20 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 5 May 2017 03:57:17 -0500 Subject: [PATCH] Item#canEntityPickup diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 1732c1ae95..b5816dc89e 100644 +index 1732c1ae9537957c51da5e484b55febb6e9f0091..b5816dc89ede5f5f1780d3086d9b1a41fba2b19d 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -521,6 +521,11 @@ public abstract class EntityInsentient extends EntityLiving { @@ -21,7 +21,7 @@ index 1732c1ae95..b5816dc89e 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 208dad2a34..97c6a8b6bd 100644 +index 208dad2a34de2b898c3811af6e5363009f97a55f..97c6a8b6bd0bf9738428c2fda24b9e2586a783dd 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -20,6 +20,7 @@ public class EntityItem extends Entity { @@ -33,7 +33,7 @@ index 208dad2a34..97c6a8b6bd 100644 public EntityItem(EntityTypes entitytypes, World world) { super(entitytypes, world); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -index cc593fbc99..3f552b5905 100644 +index cc593fbc995dfc11f8006588059d67c42a7429cd..3f552b5905e5ed51c887ad02410297dd5e2e165f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java @@ -48,6 +48,16 @@ public class CraftItem extends CraftEntity implements Item { @@ -53,6 +53,3 @@ index cc593fbc99..3f552b5905 100644 @Override public String toString() { return "CraftItem"; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch index 6a33ad3e8f..5e6f47cbab 100644 --- a/Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,11 +1,11 @@ -From 53311c76dc151e2ae27c847de84b8d0b659ba2d2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 May 2017 06:26:09 -0500 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 97c6a8b6bd..8747dc7075 100644 +index 97c6a8b6bd0bf9738428c2fda24b9e2586a783dd..8747dc7075ebe178f3b9ad3cb56f52847fd194b5 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -322,6 +322,7 @@ public class EntityItem extends Entity { @@ -44,6 +44,3 @@ index 97c6a8b6bd..8747dc7075 100644 if (itemstack.isEmpty()) { this.die(); itemstack.setCount(i); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch index e8b3540a0c..ee15d11ed1 100644 --- a/Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch @@ -1,11 +1,11 @@ -From 560e77d7536fa930419acb3e9980b309f16e4cf3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 11 Jun 2017 16:30:30 -0500 Subject: [PATCH] PlayerAttemptPickupItemEvent diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 8747dc7075..5efcc50ab9 100644 +index 8747dc7075ebe178f3b9ad3cb56f52847fd194b5..5efcc50ab9e8a99d88a9d2e7f15ecbcc4439b93e 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -9,6 +9,7 @@ import javax.annotation.Nullable; @@ -39,6 +39,3 @@ index 8747dc7075..5efcc50ab9 100644 if (this.pickupDelay <= 0 && canHold > 0) { itemstack.setCount(canHold); // Call legacy event --- -2.26.2 - diff --git a/Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch index 3a55d7fa20..2dfe5a6c90 100644 --- a/Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch +++ b/Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch @@ -1,11 +1,11 @@ -From 29018764457bdff7ec677bfa8925e0cb61c5d8dd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 681a84e5b3..f01bd38d0b 100644 +index 681a84e5b3e7594a43fac0d47f1df2eef310bf81..f01bd38d0b600a69224f610fd77a542ec6d1c322 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -80,6 +80,7 @@ import net.minecraft.server.WorldServer; @@ -39,6 +39,3 @@ index 681a84e5b3..f01bd38d0b 100644 } // Spigot end --- -2.26.2 - diff --git a/Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch index 7976b24b0c..da330a5c82 100644 --- a/Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch +++ b/Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 3a31c71eacf63fb409a1c3dd849652e94f4328bf Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 22:11:48 -0500 Subject: [PATCH] Basic PlayerProfile API @@ -7,7 +7,7 @@ Establishes base extension of profile systems for future edits too diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java new file mode 100644 -index 0000000000..b151a13c1b +index 0000000000000000000000000000000000000000..b151a13c1b9058eb057081ef8a64558028443a07 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java @@ -0,0 +1,280 @@ @@ -293,7 +293,7 @@ index 0000000000..b151a13c1b +} diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java new file mode 100644 -index 0000000000..25836b975b +index 0000000000000000000000000000000000000000..25836b975b51af701d4b9523ab398fbf157b82fd --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java @@ -0,0 +1,30 @@ @@ -329,7 +329,7 @@ index 0000000000..25836b975b +} diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java new file mode 100644 -index 0000000000..3bcdb8f93f +index 0000000000000000000000000000000000000000..3bcdb8f93f1930ee53395470ffb3833e2bd75222 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java @@ -0,0 +1,17 @@ @@ -352,7 +352,7 @@ index 0000000000..3bcdb8f93f +} diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java new file mode 100644 -index 0000000000..4b2a67423f +index 0000000000000000000000000000000000000000..4b2a67423f57b70d316115e4525e3841a415b1cc --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java @@ -0,0 +1,29 @@ @@ -387,7 +387,7 @@ index 0000000000..4b2a67423f +} diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java new file mode 100644 -index 0000000000..3aceb0ea8a +index 0000000000000000000000000000000000000000..3aceb0ea8a1a3ed94dd8a9e954c52ecd341c6bd1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java @@ -0,0 +1,11 @@ @@ -403,7 +403,7 @@ index 0000000000..3aceb0ea8a + } +} diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 48f88eaba4..9d0b0c9fc3 100644 +index 48f88eaba40b54cdf24da794ae5dc692c33553c7..9d0b0c9fc3c9e5e73506a43d7195b139cbcb30cf 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -1,7 +1,10 @@ @@ -429,7 +429,7 @@ index 48f88eaba4..9d0b0c9fc3 100644 * Calculates distance between 2 entities * @param e1 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 284793e4bf..1f27939670 100644 +index 284793e4bf04cddae3e070a1fa0afdd18001fd2e..1f2793967045d0bea59e62d9d9d39b03dbdef6c8 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1301,7 +1301,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 17 Jun 2017 15:18:30 -0400 Subject: [PATCH] Shoulder Entities Release API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index ad79e4521c..8e5edd2c9b 100644 +index ad79e4521cee699de86a94885b27356339bcb866..8e5edd2c9b7cc9a441969efeb666061515188486 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1901,20 +1901,44 @@ public abstract class EntityHuman extends EntityLiving { @@ -58,7 +58,7 @@ index ad79e4521c..8e5edd2c9b 100644 @Override public abstract boolean isSpectator(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 2c20a7b924..191bb7345e 100644 +index 2c20a7b924e055794f6d3a296db754129052c3fe..191bb7345e06cbad7bef416e4e849df3727bdac0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -518,6 +518,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -94,6 +94,3 @@ index 2c20a7b924..191bb7345e 100644 @Override public boolean discoverRecipe(NamespacedKey recipe) { return discoverRecipes(Arrays.asList(recipe)) != 0; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0157-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0157-Profile-Lookup-Events.patch index b857a46b19..f2898230e9 100644 --- a/Spigot-Server-Patches/0157-Profile-Lookup-Events.patch +++ b/Spigot-Server-Patches/0157-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From bb23dca68742aac69f18e6122455492acb85206d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 17:00:32 -0400 Subject: [PATCH] Profile Lookup Events @@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p profiles that had to be looked up. diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java -index 3bcdb8f93f..bb9894318e 100644 +index 3bcdb8f93f1930ee53395470ffb3833e2bd75222..bb9894318e1ff75f0c5611a65d3e4d9969eab1fb 100644 --- a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java @@ -1,17 +1,68 @@ @@ -80,6 +80,3 @@ index 3bcdb8f93f..bb9894318e 100644 + } } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch index 9a4db4ecfc..6c06f31282 100644 --- a/Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch +++ b/Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch @@ -1,11 +1,11 @@ -From 1069f8cbc2aa3496fa4066a32e0574028754a1b1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 2 Jul 2017 21:35:56 -0500 Subject: [PATCH] Block player logins during server shutdown diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 19e72da6d9..234451ebc8 100644 +index 19e72da6d9a8bf43d1d25c1be3aa23c75dd6e5d7..234451ebc89fe47cffebdcbbc96a5163620b6124 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -49,6 +49,12 @@ public class LoginListener implements PacketLoginInListener { @@ -21,6 +21,3 @@ index 19e72da6d9..234451ebc8 100644 if (this.g == LoginListener.EnumProtocolState.READY_TO_ACCEPT) { this.c(); } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch index 83637aa344..69851f8a2f 100644 --- a/Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch +++ b/Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch @@ -1,11 +1,11 @@ -From a4999e29e9a71e373ef2d4654d6a80f327db3cb9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 18 Jun 2017 18:17:05 -0500 Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0d7dcc1463..153bfd07fa 100644 +index 0d7dcc1463efa395458e95f1236a20241ff66abe..153bfd07fafec177e3772c9d9531cbea188ea3f7 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -37,7 +37,7 @@ index 0d7dcc1463..153bfd07fa 100644 } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index b249af20c4..ab5d83d34d 100644 +index b249af20c4712a89e5f340eb922291557099058a..ab5d83d34d9314a253353d6d01fdcd2bed964933 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -140,6 +140,7 @@ public abstract class MobSpawnerAbstract { @@ -49,7 +49,7 @@ index b249af20c4..ab5d83d34d 100644 if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockposition).isCancelled()) { Entity vehicle = entity.getVehicle(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 1d02e9acb9..440bc4513b 100644 +index 1d02e9acb94c972f3dc178a15ed0963a9c80539e..440bc4513b91c72e01bdd2a106a84e82ab72ac97 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1047,5 +1047,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -63,6 +63,3 @@ index 1d02e9acb9..440bc4513b 100644 + } // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch index a7af57ca6c..ddb33b7d96 100644 --- a/Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch +++ b/Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch @@ -1,4 +1,4 @@ -From 5913f504b1f8cadbbee1a987a3975b5d1d60f9aa Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Dec 2016 16:24:06 -0500 Subject: [PATCH] Improve the Saddle API for Horses @@ -7,7 +7,7 @@ Not all horses with Saddles have armor. This lets us break up the horses with sa and access their saddle state separately from an interface shared with Armor. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java -index 09016e3547..9952db3eb5 100644 +index 09016e35473069ac61572c4edf97c06077b0cf3b..9952db3eb5ba94547f5e786c473fb59dfec616ab 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java @@ -6,6 +6,7 @@ import net.minecraft.server.EntityHorseAbstract; @@ -27,7 +27,7 @@ index 09016e3547..9952db3eb5 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java -index 63991bf4be..9a47a1adc1 100644 +index 63991bf4be23cddd3f3e1082aa5e5513ff0e4e44..9a47a1adc1dd21f4409609c8c73e8b0e2434c176 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java @@ -4,7 +4,7 @@ import net.minecraft.server.IInventory; @@ -41,7 +41,7 @@ index 63991bf4be..9a47a1adc1 100644 super(inventory); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java new file mode 100644 -index 0000000000..99cfbaf90b +index 0000000000000000000000000000000000000000..99cfbaf90b5ccd828834b33b3c658206efd6ac21 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java @@ -0,0 +1,15 @@ @@ -60,6 +60,3 @@ index 0000000000..99cfbaf90b + } + +} --- -2.26.2 - diff --git a/Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch index 53e97617ae..e1ebc0e4ea 100644 --- a/Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch +++ b/Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch @@ -1,4 +1,4 @@ -From a98b708ebf3883124461b8a7a17ad5f98f6036e4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 22:43:12 -0400 Subject: [PATCH] Implement ensureServerConversions API @@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr to ensure it meets latest minecraft expectations. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 01ab19434a..8b219b5fa2 100644 +index 01ab19434a39a7062c813b1696e8d35cb2712b46..8b219b5fa2746d73d6d3acb0b61d13218a2c6ea8 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -335,4 +335,10 @@ public final class CraftItemFactory implements ItemFactory { @@ -21,6 +21,3 @@ index 01ab19434a..8b219b5fa2 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch index ebc823e96e..60bfe74154 100644 --- a/Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch +++ b/Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch @@ -1,4 +1,4 @@ -From a8b0bfa58103401cf1dc62114d4601d012f4fe1f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:59:38 -0400 Subject: [PATCH] Implement getI18NDisplayName @@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this, You must replace the language file embedded in the server jar. diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java -index c0c13798f8..6012739331 100644 +index c0c13798f84029565e623fdd8cb85ffcd3504559..6012739331add8a77c6684b58a669f39bf183f5b 100644 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java @@ -65,10 +65,12 @@ public class LocaleLanguage { @@ -25,7 +25,7 @@ index c0c13798f8..6012739331 100644 return this.c(s); } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 8b219b5fa2..23d7756456 100644 +index 8b219b5fa2746d73d6d3acb0b61d13218a2c6ea8..23d7756456fdd650914a3a49c653182a68924a5c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -340,5 +340,18 @@ public final class CraftItemFactory implements ItemFactory { @@ -47,6 +47,3 @@ index 8b219b5fa2..23d7756456 100644 + } // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch index 7703d43462..d26b0ea702 100644 --- a/Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch @@ -1,11 +1,11 @@ -From ae80c701bfa1e7ed563e2fedd071e0be89dcb1fa Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Jul 2017 18:11:10 -0500 Subject: [PATCH] ProfileWhitelistVerifyEvent diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 77f1ddc8a8..a61815c794 100644 +index 77f1ddc8a8d6fa816488de5d8c821bfa59f6c729..a61815c794885d7192eec62d05a54e765fb8c838 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -509,9 +509,9 @@ public abstract class PlayerList { @@ -47,6 +47,3 @@ index 77f1ddc8a8..a61815c794 100644 public boolean isOp(GameProfile gameprofile) { return this.operators.d(gameprofile) || this.server.a(gameprofile) && this.server.getWorldServer(DimensionManager.OVERWORLD).getWorldData().t() || this.u; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch index a7051986f8..e5fb521c2e 100644 --- a/Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch +++ b/Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch @@ -1,4 +1,4 @@ -From 97e95b8cb6b1ae20e64ed0fc6a1e1d9582381b8b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: DemonWav Date: Sun, 6 Aug 2017 17:17:53 -0500 Subject: [PATCH] Fix this stupid bullshit @@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa and to provide some level of hint without being disruptive. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index fc07fdb590..bf0a020189 100644 +index fc07fdb590475ccaa09875b8fcbb81adc0db5e66..bf0a020189425d6507fa75f68f8e754723c58818 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -218,10 +218,12 @@ public class Main { @@ -28,6 +28,3 @@ index fc07fdb590..bf0a020189 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch index e2cbcae95f..459cbd7c04 100644 --- a/Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch +++ b/Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch @@ -1,11 +1,11 @@ -From 3fa3249bc11c300cacaf67f9f9663c226878e702 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:54:40 -0500 Subject: [PATCH] Ocelot despawns should honor nametags and leash diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java -index 0624114553..d9a7b8ac1e 100644 +index 06241145537d311b1994a2d672ca975177d03a53..d9a7b8ac1eac58e02607f4df0c9413239fcec3a4 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -81,7 +81,7 @@ public class EntityOcelot extends EntityAnimal { @@ -17,6 +17,3 @@ index 0624114553..d9a7b8ac1e 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch index d210f6563e..931728e67c 100644 --- a/Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch +++ b/Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch @@ -1,11 +1,11 @@ -From 3d66ebaa4dccb0bf6e9a0c73688bb188dc073e73 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:45:19 -0500 Subject: [PATCH] Reset spawner timer when spawner event is cancelled diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index ab5d83d34d..c38295a09d 100644 +index ab5d83d34d9314a253353d6d01fdcd2bed964933..c38295a09d99221cb196f9785ce674fe11120825 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -142,6 +142,7 @@ public abstract class MobSpawnerAbstract { @@ -25,6 +25,3 @@ index ab5d83d34d..c38295a09d 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch index 92ff908c65..8e8043de1f 100644 --- a/Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch +++ b/Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch @@ -1,11 +1,11 @@ -From eb3143636afc41b6bbfbc4c93132918ab321de3e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 9632839598..14c97a163c 100644 +index 9632839598c0d6a24894780dd2f68b9abeb33a31..14c97a163c53a9ca0fae55a01d2ca861712b1c07 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -647,7 +647,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -21,6 +21,3 @@ index 9632839598..14c97a163c 100644 //this.tileEntityList.removeAll(this.tileEntityListUnload); // Paper - remove unused list this.tileEntityListUnload.clear(); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch index d0924d1c62..20b70895ae 100644 --- a/Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch +++ b/Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch @@ -1,4 +1,4 @@ -From 90b4227188043a36feca8a87e8e5ccf57071caaf Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 17 Aug 2017 16:08:20 -0700 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick @@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 295b8390cb..5884b04f7e 100644 +index 295b8390cbc31fc1fcb225f80ec2ff8f0df44321..5884b04f7e84048a9710736bd14237140ebf2cf7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -1,5 +1,6 @@ @@ -27,7 +27,7 @@ index 295b8390cb..5884b04f7e 100644 + } } diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 234451ebc8..758fe77489 100644 +index 234451ebc89fe47cffebdcbbc96a5163620b6124..758fe774897245148befeb26ddd65cf4c1a8301b 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -247,6 +247,10 @@ public class LoginListener implements PacketLoginInListener { @@ -41,6 +41,3 @@ index 234451ebc8..758fe77489 100644 LoginListener.this.disconnect(new ChatMessage("multiplayer.disconnect.authservers_down", new Object[0])); LoginListener.LOGGER.error("Couldn't verify username because servers are unavailable"); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0169-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0169-LivingEntity-setKiller.patch index f3c912ba67..7389c25b87 100644 --- a/Spigot-Server-Patches/0169-LivingEntity-setKiller.patch +++ b/Spigot-Server-Patches/0169-LivingEntity-setKiller.patch @@ -1,11 +1,11 @@ -From a324e97a247c4f6d3e2a3cc2db7352bea6ae1c5b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:49:48 -0500 Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index e6b48cc0ea..88688be668 100644 +index e6b48cc0eafc4612181495a1f412fd4f411ab0e5..88688be66880d406705a89efabbd7c509b7e7b8c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity { @@ -18,7 +18,7 @@ index e6b48cc0ea..88688be668 100644 protected int ticksFarFromPlayer; protected float aR; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index da86ee4149..1760dfa7a3 100644 +index da86ee41499b02959755328544307aed39752483..1760dfa7a312b63d7608d890c977452ad995d7ae 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -318,6 +318,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -38,6 +38,3 @@ index da86ee4149..1760dfa7a3 100644 @Override public boolean addPotionEffect(PotionEffect effect) { return addPotionEffect(effect, false); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch index a5b9fcde71..94d2fdb211 100644 --- a/Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch +++ b/Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch @@ -1,4 +1,4 @@ -From c887b954dc5767cb7ad7963731796a3b1ad4f643 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Mon, 18 Sep 2017 12:00:03 +0200 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger @@ -12,7 +12,7 @@ results in a separate line, even though it should not result in a line break. Log4j's implementation handles it correctly. diff --git a/pom.xml b/pom.xml -index 01dcaf4f4b..f4fbd5c016 100644 +index 01dcaf4f4bbe03a118958e494544d7fc4a92e300..f4fbd5c016b61fdff916d51ce856c8e91fd22ff0 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,11 @@ @@ -28,7 +28,7 @@ index 01dcaf4f4b..f4fbd5c016 100644 org.ow2.asm asm diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index d34f772fae..ec257ba31f 100644 +index d34f772fae3543cec6a130831b1f3eaa67934944..ec257ba31f012d3d3576bbff41326df13ede6776 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -155,8 +155,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -44,6 +44,3 @@ index d34f772fae..ec257ba31f 100644 // CraftBukkit end thread.setDaemon(true); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch index ba7f15e8c5..c9b42c6ecd 100644 --- a/Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -1,4 +1,4 @@ -From a8476f48529b567e1195dbc90c7b68f95e87efdb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:14:55 +0200 Subject: [PATCH] Handle plugin prefixes using Log4J configuration @@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/pom.xml b/pom.xml -index f4fbd5c016..4585ee5bea 100644 +index f4fbd5c016b61fdff916d51ce856c8e91fd22ff0..4585ee5bead0a82e7ec04d3d3b11fad1d6c09c29 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ @@ -28,7 +28,7 @@ index f4fbd5c016..4585ee5bea 100644 org.apache.logging.log4j diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index fdca34346a..6d77bbc5aa 100644 +index fdca34346a31a6096b8005670464a4c42ae2f73b..6d77bbc5aa98ec7c3977b1d36b13c96cc6582e01 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -286,7 +286,7 @@ public class SpigotConfig @@ -41,7 +41,7 @@ index fdca34346a..6d77bbc5aa 100644 public static int playerShuffle; diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 620b9490e5..a8bdaaeaa1 100644 +index 620b9490e5f159080e50289d127404a1b56adbef..a8bdaaeaa1a9316848416f0533739b9b083ca151 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -5,10 +5,22 @@ @@ -69,6 +69,3 @@ index 620b9490e5..a8bdaaeaa1 100644 --- -2.26.2 - diff --git a/Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch index a66b426220..4c7bf0f9e5 100644 --- a/Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch +++ b/Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch @@ -1,11 +1,11 @@ -From 0e36585d1f1b408791a0e3e25e6c0f833fe97674 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:35 +0200 Subject: [PATCH] Include Log4J2 SLF4J implementation diff --git a/pom.xml b/pom.xml -index 4585ee5bea..6fe4eff84b 100644 +index 4585ee5bead0a82e7ec04d3d3b11fad1d6c09c29..6fe4eff84b8a4476538bba144ef186d93345e284 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,12 @@ @@ -21,6 +21,3 @@ index 4585ee5bea..6fe4eff84b 100644 org.apache.logging.log4j log4j-iostreams --- -2.26.2 - diff --git a/Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch index 77fee2f3a5..7b93806523 100644 --- a/Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch +++ b/Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch @@ -1,4 +1,4 @@ -From d0e8b7108a2a694d0b3177d300ef10f74f773de6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sat, 23 Sep 2017 21:07:20 +0200 Subject: [PATCH] Disable logger prefix for various plugins bypassing the @@ -11,7 +11,7 @@ log. Disable the logger prefix for these plugins so the messages show up correctly. diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index a8bdaaeaa1..a9bb987652 100644 +index a8bdaaeaa1a9316848416f0533739b9b083ca151..a9bb987652b4b239322fb83b009ef8533eaa4555 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -8,7 +8,8 @@ @@ -34,6 +34,3 @@ index a8bdaaeaa1..a9bb987652 100644 pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n" /> --- -2.26.2 - diff --git a/Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch index ede7739ce6..9cac1797c2 100644 --- a/Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch +++ b/Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch @@ -1,11 +1,11 @@ -From ca5bb26513d8ed1ccdd4b8ad854d67edd735b83b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Sep 2017 17:21:44 -0400 Subject: [PATCH] Add PlayerJumpEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 046ef418f8..b0651dcfbf 100644 +index 046ef418f8e16a8d50846f140d7147a3178ebca2..b0651dcfbfccab63108ece34304700db9af407b6 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory; @@ -53,6 +53,3 @@ index 046ef418f8..b0651dcfbf 100644 } this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9)); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch index b1f05cfee7..ca07802299 100644 --- a/Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch +++ b/Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch @@ -1,4 +1,4 @@ -From e8b912ff90975d3e72ee03929f02f0a97ba4e6de Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 5 Oct 2017 01:54:07 +0100 Subject: [PATCH] handle PacketPlayInKeepAlive async @@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing random disconnections for clients. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b0651dcfbf..d4a649a83f 100644 +index b0651dcfbfccab63108ece34304700db9af407b6..d4a649a83f8e0497898108c52faf4baf9ba824f9 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2487,14 +2487,18 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -39,6 +39,3 @@ index b0651dcfbf..d4a649a83f 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch index d6d3c97a86..e80d5177c4 100644 --- a/Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch @@ -1,4 +1,4 @@ -From 03c3446ce4ecf5401fce7d14c282a36cffbc4fa6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 10 Oct 2017 18:45:20 +0200 Subject: [PATCH] Expose client protocol version and virtual host @@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java new file mode 100644 -index 0000000000..5caca6439d +index 0000000000000000000000000000000000000000..5caca6439d2135e34880d501397fe2ea197d7249 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java @@ -0,0 +1,50 @@ @@ -61,7 +61,7 @@ index 0000000000..5caca6439d + +} diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index d0b9c6e3dc..8928d93e49 100644 +index d0b9c6e3dcae76d802e095731c78fb9693982f90..8928d93e49bec174e86a2b451ac40f3946193009 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -84,7 +84,7 @@ index d0b9c6e3dc..8928d93e49 100644 @Override diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 3ccf166366..e2d8ed88f0 100644 +index 3ccf1663669c79a63a6b3a9f6dc17a6e25e91915..e2d8ed88f05bf8cb214329ea27ac2b67f43e071a 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -60,6 +60,10 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -99,7 +99,7 @@ index 3ccf166366..e2d8ed88f0 100644 public NetworkManager(EnumProtocolDirection enumprotocoldirection) { this.h = enumprotocoldirection; diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java -index 4f008e4723..8545146fb1 100644 +index 4f008e4723d2cb0bcabb2d5621203d63c40c4923..8545146fb1f093f821e3b966d9337049575c6773 100644 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java @@ -35,6 +35,7 @@ public class PacketHandshakingInSetProtocol implements Packet Date: Sun, 15 Oct 2017 00:29:07 +0100 Subject: [PATCH] revert serverside behavior of keepalives @@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients, at the cost of dead connections being kept open for longer. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index d4a649a83f..2a3771d065 100644 +index d4a649a83f8e0497898108c52faf4baf9ba824f9..2a3771d0650b404dd0729c63dd0bacb40213197d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -70,7 +70,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -73,6 +73,3 @@ index d4a649a83f..2a3771d065 100644 this.minecraftServer.getMethodProfiler().exit(); // CraftBukkit start --- -2.26.2 - diff --git a/Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch index 0e5761fd53..d50437eb16 100644 --- a/Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch +++ b/Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch @@ -1,4 +1,4 @@ -From 2b55c43eb698c6633bdf520a698a5bae6720711b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 8e5edd2c9b..542f935b4e 100644 +index 8e5edd2c9b7cc9a441969efeb666061515188486..542f935b4e7a027b3df82f037fcd6523286c5106 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,7 +72,7 @@ index 8e5edd2c9b..542f935b4e 100644 entity.extinguish(); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 14c97a163c..a956dbc3d4 100644 +index 14c97a163c53a9ca0fae55a01d2ca861712b1c07..a956dbc3d4ea1f20b0be28ed4f54f55474e89a5c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -584,6 +584,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -87,6 +87,3 @@ index 14c97a163c..a956dbc3d4 100644 public abstract void playSound(@Nullable EntityHuman entityhuman, double d0, double d1, double d2, SoundEffect soundeffect, SoundCategory soundcategory, float f, float f1); public abstract void playSound(@Nullable EntityHuman entityhuman, Entity entity, SoundEffect soundeffect, SoundCategory soundcategory, float f, float f1); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch index 786c33f439..0f78966b29 100644 --- a/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -1,11 +1,11 @@ -From 1393d33b21745550837bf3cc7a82c11b1147b375 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 10 Nov 2017 23:03:12 -0500 Subject: [PATCH] Option for maximum exp value when merging orbs diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 39ab545756..d2582d981f 100644 +index 39ab5457569684bc66cd67f5f9d2505ef9f304ab..d2582d981f859b55ba5086540963c01ed49e4c15 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -340,4 +340,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 39ab545756..d2582d981f 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e6d4f7a06b..ce44dc4292 100644 +index e6d4f7a06bf803054b14eb7af8b624175ff377a9..ce44dc4292dbd55bae189267d610e2bcd8af25fa 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -549,16 +549,32 @@ public class CraftEventFactory { @@ -59,6 +59,3 @@ index e6d4f7a06b..ce44dc4292 100644 } // Spigot end } else if (!(entity instanceof EntityPlayer)) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch index a55f77bfa4..1100cc9e16 100644 --- a/Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch @@ -1,11 +1,11 @@ -From e16ac1056e7e37036a8cbc615d189881d9532047 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: pkt77 Date: Fri, 10 Nov 2017 23:46:34 -0500 Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 88688be668..c5c0fc3877 100644 +index 88688be66880d406705a89efabbd7c509b7e7b8c..c5c0fc3877fa6c8602e4468d5702612d986891f9 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1,5 +1,6 @@ @@ -30,7 +30,7 @@ index 88688be668..c5c0fc3877 100644 if (!itemstack.isEmpty()) { this.getAttributeMap().a(itemstack.a(enumitemslot)); diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java -index 02a7ae6785..60b235f16f 100644 +index 02a7ae6785b0539e4aa567fca377d727184fd019..60b235f16f5e762d635efa1578b715db445513a5 100644 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java @@ -16,6 +16,7 @@ public enum EnumItemSlot { @@ -41,6 +41,3 @@ index 02a7ae6785..60b235f16f 100644 public EnumItemSlot.Function a() { return this.g; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch index 3d41580ae9..9d33fdb2ea 100644 --- a/Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch +++ b/Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch @@ -1,4 +1,4 @@ -From 75dd02cfdc3ee1d52e1e6f10878188f716197262 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: killme Date: Sun, 12 Nov 2017 19:40:01 +0100 Subject: [PATCH] Prevent logins from being processed when the player has @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 758fe77489..1fb609dcfc 100644 +index 758fe774897245148befeb26ddd65cf4c1a8301b..1fb609dcfc61adfc63f0d32dc87a5e144a5013cf 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -56,7 +56,11 @@ public class LoginListener implements PacketLoginInListener { @@ -22,6 +22,3 @@ index 758fe77489..1fb609dcfc 100644 } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) { EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId()); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch index 6137aae46e..f38b5ac734 100644 --- a/Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch +++ b/Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch @@ -1,4 +1,4 @@ -From 1fdf327946f0b6f512ac3316098f628f110a4c8a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 a956dbc3d4..2f57c7bc76 100644 +index a956dbc3d4ea1f20b0be28ed4f54f55474e89a5c..2f57c7bc76ddd8fd4b796d85eaa7200d8da41865 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 { @@ -57,6 +57,3 @@ index a956dbc3d4..2f57c7bc76 100644 if (previous != null) { return previous.getHandle(); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch index 3cb8109def..88b848434c 100644 --- a/Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From 85bd82d6140ede4e085017f7c1dded9e3d586dbd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 6 Nov 2017 21:08:22 -0500 Subject: [PATCH] API to get a BlockState without a snapshot @@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE If Tile Entity was null, correct Sign to return empty lines instead of null diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 630b279158..958279249f 100644 +index 630b279158f26902ebdcc6e5c810b189ce49c910..958279249fdadfe5c2808d2a046636f06c3bd500 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -231,7 +231,12 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -39,7 +39,7 @@ index 630b279158..958279249f 100644 return null; } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 5c1c4d5837..ef81c1d3a9 100644 +index 5c1c4d5837bb65bc0509c7cb5a9d7f9a72dfe444..ef81c1d3a9679b0e65b453431de3cd0216f05bb6 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -308,6 +308,20 @@ public class CraftBlock implements Block { @@ -64,7 +64,7 @@ index 5c1c4d5837..ef81c1d3a9 100644 switch (material) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index 17d80b5c6e..f6401e2cde 100644 +index 17d80b5c6e512e0c582b05c92bb795b004ba27c2..f6401e2cde9d56547cee7f8d9e4b2a58764ee895 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -26,20 +26,40 @@ public class CraftBlockEntityState extends CraftBlockState @@ -114,7 +114,7 @@ index 17d80b5c6e..f6401e2cde 100644 private T createSnapshot(T tileEntity) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java -index 15022ada0c..af15656cc4 100644 +index 15022ada0c2fd0f4302b45c55f46d0fdd3bfd57f..af15656cc4b4c1e9da4fc8a5bfffa95eb6caf903 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java @@ -17,10 +17,12 @@ public class CraftSign extends CraftBlockEntityState implements @@ -130,6 +130,3 @@ index 15022ada0c..af15656cc4 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch index b74802c940..351cd3dfb4 100644 --- a/Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch +++ b/Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From 351dde850ad87a0fbd867e53cd5c6a3b888117d9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 2a3771d065..64f789d7c4 100644 +index 2a3771d0650b404dd0729c63dd0bacb40213197d..64f789d7c44ee186d28911b91cd070b15ca0a824 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,7 +72,7 @@ index 2a3771d065..64f789d7c4 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 95f4abddf5..3697b3298f 100644 +index 95f4abddf57eb8c59cb5a5410b8d551d39f94fd7..3697b3298feaec30c305e3da011790f2406e12d7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1710,7 +1710,7 @@ public final class CraftServer implements Server { @@ -85,7 +85,7 @@ index 95f4abddf5..3697b3298f 100644 return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions(); diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java -index 5510266fb1..a51202ed53 100644 +index 5510266fb114954322823b72e3199f33c4d7a9a7..a51202ed53d8ba99b364e8797fe32fa8aeb4fc87 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java @@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer { @@ -128,6 +128,3 @@ index 5510266fb1..a51202ed53 100644 // Paper end Waitable> waitable = new Waitable>() { @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch index 2625e16510..3fbc4202da 100644 --- a/Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch +++ b/Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch @@ -1,11 +1,11 @@ -From 3b033ce676ca0316ce058d8fb6088d66cf33cfa5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 29 Nov 2017 22:18:54 -0500 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java -index eafdcb916a..d37a2fa0ab 100644 +index eafdcb916af55978672c139b7ccdf5feba383264..d37a2fa0ab3cbf4b76be90079c083e208843fe6e 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java @@ -55,7 +55,7 @@ public class PathfinderGoalTempt extends PathfinderGoal { @@ -17,6 +17,3 @@ index eafdcb916a..d37a2fa0ab 100644 // CraftBukkit end } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch index 0588e94bc9..00a43cac85 100644 --- a/Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch +++ b/Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch @@ -1,4 +1,4 @@ -From a85ac33ec798a8cd41925dba5a415515975d0889 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:02:53 -0500 Subject: [PATCH] PlayerPickupExperienceEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent Allows plugins to cancel a player picking up an experience orb diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index d4275e733d..b3edb69a96 100644 +index d4275e733d9996d121efd95ae1ff4676a1ebfbb5..b3edb69a967058392f5027fbdc7fadff7e1dc6e2 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -222,7 +222,7 @@ public class EntityExperienceOrb extends Entity { @@ -18,6 +18,3 @@ index d4275e733d..b3edb69a96 100644 entityhuman.bC = 2; entityhuman.receive(this, 1); Entry entry = EnchantmentManager.b(Enchantments.MENDING, (EntityLiving) entityhuman); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch index b640c1102b..2fb7f02944 100644 --- a/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch +++ b/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From 23f3b2c20f91f5129f8facb7ec906030a6a633e8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:57:26 -0500 Subject: [PATCH] ExperienceOrbMergeEvent @@ -8,7 +8,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index ce44dc4292..f059e502e4 100644 +index ce44dc4292dbd55bae189267d610e2bcd8af25fa..f059e502e47e96e27514127ff1e56a85944a8b43 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -559,7 +559,7 @@ public class CraftEventFactory { @@ -20,6 +20,3 @@ index ce44dc4292..f059e502e4 100644 long newTotal = (long)xp.value + (long)loopItem.value; if ((int) newTotal < 0) continue; // Overflow if (maxValue > 0 && newTotal > (long)maxValue) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch index 6e61d33793..f96c3990d2 100644 --- a/Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch @@ -1,4 +1,4 @@ -From c0a4e23a6235828968979537e42e4e4ad87533a5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 17:36:49 -0500 Subject: [PATCH] Ability to apply mending to XP API @@ -10,7 +10,7 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java -index 1822178e8d..d96c03a1a1 100644 +index 1822178e8dd67bb063f5eab60335de9852b9a71c..d96c03a1a164799f49fdb3309594e7592a8d2206 100644 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java @@ -246,6 +246,11 @@ public class EnchantmentManager { @@ -26,7 +26,7 @@ index 1822178e8d..d96c03a1a1 100644 public static Entry b(Enchantment enchantment, EntityLiving entityliving) { Map map = enchantment.a(entityliving); diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index b3edb69a96..87c6b77ce3 100644 +index b3edb69a967058392f5027fbdc7fadff7e1dc6e2..87c6b77ce3b1446893a0d617b63f925a403e09cc 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -254,10 +254,12 @@ public class EntityExperienceOrb extends Entity { @@ -43,7 +43,7 @@ index b3edb69a96..87c6b77ce3 100644 return i * 2; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b999821bbe..4375eb0139 100644 +index b999821bbe5cbc5645c9b55eead88c3c65a4c62d..4375eb013953e8fdfdf85aed238f84ba81a75413 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1018,8 +1018,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -85,6 +85,3 @@ index b999821bbe..4375eb0139 100644 getHandle().giveExp(exp); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch index 0d2b68fac1..5a0f752d27 100644 --- a/Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch +++ b/Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch @@ -1,4 +1,4 @@ -From 53f25b8ab63b06d8c703ac7317d619c73f12a162 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 11 Jan 2018 16:47:28 -0600 Subject: [PATCH] Make max squid spawn height configurable @@ -7,7 +7,7 @@ I don't know why upstream made only the minimum height configurable but whatever diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index d2582d981f..92e6891502 100644 +index d2582d981f859b55ba5086540963c01ed49e4c15..92e6891502ef6dc276ed5b371124f24d5237b26b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -346,4 +346,9 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index d2582d981f..92e6891502 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 8c4f3b2c2e..1c1ff2069d 100644 +index 8c4f3b2c2e6e4e354562e32931b3fbf3d705a278..1c1ff2069d6daaf866a3e80a9b3ce78b19941384 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -171,7 +171,8 @@ public class EntitySquid extends EntityWaterAnimal { @@ -34,6 +34,3 @@ index 8c4f3b2c2e..1c1ff2069d 100644 } public void a(float f, float f1, float f2) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch index 3dbf6d1002..db46076d7d 100644 --- a/Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch +++ b/Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From a8b0861ae0590786277259cda44596ddb3112d6a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:01:31 -0500 Subject: [PATCH] PreCreatureSpawnEvent @@ -15,7 +15,7 @@ instead and save a lot of server resources. See: https://github.com/PaperMC/Paper/issues/917 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index c38295a09d..43c491f71b 100644 +index c38295a09d99221cb196f9785ce674fe11120825..43c491f71b7739c782b46ee77ff8debe44213f11 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -105,6 +105,27 @@ public abstract class MobSpawnerAbstract { @@ -47,7 +47,7 @@ index c38295a09d..43c491f71b 100644 entity1.setPositionRotation(d3, d4, d5, entity1.yaw, entity1.pitch); return entity1; diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 02157d051f..224443e03c 100644 +index 02157d051f3ecfc05f23ae8631cf01b6133ad159..224443e03c9e55af2744eebd7e754e2a1b3fa296 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -38,7 +38,7 @@ public final class SpawnerCreature { @@ -85,6 +85,3 @@ index 02157d051f..224443e03c 100644 try { Entity entity = entitytypes.a((World) worldserver); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch index 0ef5cfa913..ceca554c42 100644 --- a/Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From ca9958e43d57e7f1c3d78791a939fe61a3e1ac71 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:36:02 -0500 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent @@ -9,7 +9,7 @@ from triggering monster spawns on a server. Also a highly more effecient way to blanket block spawns in a world diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index fa4ad0b6dc..8c6550433c 100644 +index fa4ad0b6dcd2cb428d87047340b81594b271e4b2..8c6550433c20c54cbe390219821ce393c5720da8 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -589,6 +589,15 @@ public class ChunkProviderServer extends IChunkProvider { @@ -29,7 +29,7 @@ index fa4ad0b6dc..8c6550433c 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 bf32997c42..88692d9eae 100644 +index bf32997c422d478699c32ce0539a65c35fbf0d12..88692d9eaea57a4d172d537a6cf2a3bffe058d54 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 bf32997c42..88692d9eae 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 0edba59675..7804cc0f6a 100644 +index 0edba596754c6d5379c3c1eb0469aee447b7113f..7804cc0f6a02d14f4adbe05b37e8470a382c0d26 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -882,12 +882,23 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -77,6 +77,3 @@ index 0edba59675..7804cc0f6a 100644 }); } --- -2.26.0 - diff --git a/Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch index 501b9fe0a4..03e42d479a 100644 --- a/Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch @@ -1,4 +1,4 @@ -From fdcf9bec7f1ab69d129a5357010ad5e6112e430a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 19 Jan 2018 00:36:25 -0500 Subject: [PATCH] Add setPlayerProfile API for Skulls @@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo which commonly cause rate limit issues with Mojang API diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java -index 2058859838..ecc32c2fb1 100644 +index 20588598386a4f479e6a58b294149bed789c63ce..ecc32c2fb1e8e1ac03074102b982adb4cda169db 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java @@ -1,5 +1,7 @@ @@ -48,7 +48,7 @@ index 2058859838..ecc32c2fb1 100644 public BlockFace getRotation() { BlockData blockData = getBlockData(); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index 4fb27cc7ed..96d62bbf88 100644 +index 4fb27cc7ed062696239f75b6f85ddb0a31866568..96d62bbf883cf589509d51ac02fbe11a452dce64 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -3,6 +3,8 @@ package org.bukkit.craftbukkit.inventory; @@ -88,6 +88,3 @@ index 4fb27cc7ed..96d62bbf88 100644 @Override public OfflinePlayer getOwningPlayer() { if (hasOwner()) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch index fd96ec33ea..b70eaeb177 100644 --- a/Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch +++ b/Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch @@ -1,4 +1,4 @@ -From 771a14998159dea3bbe640854a95a632ad26ed0e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 2 Jan 2018 00:31:26 -0500 Subject: [PATCH] Fill Profile Property Events @@ -11,7 +11,7 @@ If Mojang API does need to be hit, event fire so you can get the results. This is useful for implementing a ProfileCache for Player Skulls diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java -index 4b2a67423f..61cfdf73c8 100644 +index 4b2a67423f57b70d316115e4525e3841a415b1cc..61cfdf73c8a5b0dcf2f9903ebbb2f4132ba1f0dd 100644 --- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java @@ -1,5 +1,7 @@ @@ -39,6 +39,3 @@ index 4b2a67423f..61cfdf73c8 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch index 9a18291c26..c1c57794e6 100644 --- a/Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch +++ b/Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch @@ -1,11 +1,11 @@ -From 3ae3b9fe84480daf3226cbfdc50058aa0702d94a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Jan 2018 08:15:29 -0600 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -index ca661f3933..c41e138472 100644 +index ca661f3933dad81150654551de4679fe2baeb138..c41e1384724ab150f43dc43fe2a453c9b1262e48 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java @@ -276,6 +276,12 @@ public class AdvancementDataPlayer { @@ -21,6 +21,3 @@ index ca661f3933..c41e138472 100644 this.d(advancement); this.i.add(advancement); flag = true; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch index ab97b571d8..d10b3e1365 100644 --- a/Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch +++ b/Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch @@ -1,4 +1,4 @@ -From 90f35b89805cd64425f999346377fb9fff30a02c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 27 Jan 2018 17:04:14 -0500 Subject: [PATCH] Add ArmorStand Item Meta @@ -13,7 +13,7 @@ starting point for future additions in this area. Fixes GH-559 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java -index f700522840..3723faccac 100644 +index f700522840ee0dfd90871b1b0c8973d7d62a9353..3723faccac00afe19e59d71008ba1604fc9d8630 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java @@ -8,13 +8,39 @@ import org.bukkit.Material; @@ -267,7 +267,7 @@ index f700522840..3723faccac 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 854836b839..15d27001e8 100644 +index 854836b839ffd650161f5ae7be3080362ac434b7..15d27001e8d574e5a4b2bd808e3d17e0cb823f6c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -1429,7 +1429,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { @@ -288,7 +288,7 @@ index 854836b839..15d27001e8 100644 } return HANDLED_TAGS; diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java -index e4305ce522..ba4cc98f1e 100644 +index e4305ce522e1cec438baae50487d2a737c75051a..ba4cc98f1ec39ccfd433aeadf4b5c7018a1d40cc 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java @@ -6,6 +6,7 @@ import java.util.ArrayList; @@ -307,6 +307,3 @@ index e4305ce522..ba4cc98f1e 100644 cleanStack.setItemMeta(meta); return cleanStack; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch index ddfffc5617..74811bc0fb 100644 --- a/Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch +++ b/Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch @@ -1,4 +1,4 @@ -From a3220aef5f98a897a43d377b78919be420e82f9a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Feb 2018 10:43:46 +0000 Subject: [PATCH] Extend Player Interact cancellation @@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds when cancelling interaction. diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index dff3eb1188..e2e5c17c24 100644 +index dff3eb118856bb4b79e4378b5c39100d65a09767..e2e5c17c24c8f5e9807ca879b1025d13cb195226 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -137,6 +137,11 @@ public class PlayerInteractManager { @@ -54,6 +54,3 @@ index dff3eb1188..e2e5c17c24 100644 ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-2867 enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS; } else if (this.gamemode == EnumGamemode.SPECTATOR) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch index b459830ab0..d27adf73e1 100644 --- a/Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch +++ b/Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 0e9ec3a5ebf224d4bb29ac534caace3fd2d11cd3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 24 Feb 2018 01:14:55 -0500 Subject: [PATCH] Tameable#getOwnerUniqueId API @@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java -index 9952db3eb5..1aea5f3f05 100644 +index 9952db3eb5ba94547f5e786c473fb59dfec616ab..1aea5f3f05794b444ca592cf518e29f76ccbd397 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java @@ -90,6 +90,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac @@ -21,7 +21,7 @@ index 9952db3eb5..1aea5f3f05 100644 return getHandle().getOwnerUUID(); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java -index bff9854f30..286d1194f2 100644 +index bff9854f3088649e6718ba8096abb170915f9d84..286d1194f2d46a8715a095ecaed276f657e5214b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java @@ -17,6 +17,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat @@ -34,6 +34,3 @@ index bff9854f30..286d1194f2 100644 public UUID getOwnerUUID() { try { return getHandle().getOwnerUUID(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch index dfb10b0a3c..d9c9f0df75 100644 --- a/Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch +++ b/Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch @@ -1,11 +1,11 @@ -From 6e714e5e0e8dbb70e6733fa341505859e83d2c58 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Sat, 10 Mar 2018 00:50:24 +0100 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 92e6891502..77cdbfadf9 100644 +index 92e6891502ef6dc276ed5b371124f24d5237b26b..77cdbfadf9c3eddb6a02460c321fa816d1bab8ac 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -187,6 +187,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 92e6891502..77cdbfadf9 100644 private void allChunksAreSlimeChunks() { allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false); diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 542f935b4e..55d08d7748 100644 +index 542f935b4e7a027b3df82f037fcd6523286c5106..55d08d77480fda81e0155aa1e0287fddc827b67a 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1063,6 +1063,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -32,6 +32,3 @@ index 542f935b4e..55d08d7748 100644 flag2 = flag2 && !this.isSprinting(); if (flag2) { f *= 1.5F; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch index 21526a1ffa..87e6aa309d 100644 --- a/Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch +++ b/Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch @@ -1,4 +1,4 @@ -From 94fb8fa4a9dce547b3b8ce2f12651f340515e004 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Mar 2018 13:03:49 +0000 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened @@ -6,7 +6,7 @@ Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java -index 5a9ac3960d..fd31b9a6dc 100644 +index 5a9ac3960de199b166ba481794529f8801cdebb7..fd31b9a6dcf6aba4041f9f08e49a9b464b956843 100644 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java @@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder; @@ -26,6 +26,3 @@ index 5a9ac3960d..fd31b9a6dc 100644 return new Location(this.a.getWorld().getWorld(), this.a.getPosition().getX(), this.a.getPosition().getY(), this.a.getPosition().getZ()); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch index 7df807cf27..bb2a2bba47 100644 --- a/Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch +++ b/Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch @@ -1,11 +1,11 @@ -From a3a2c99fa23304d3bed0411e8c39d5d3c7af9082 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Mar 2018 16:33:15 -0500 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java -index 5e414138e4..638a0aa5ae 100644 +index 5e414138e4e542c16508d679e571aac72c082e7b..638a0aa5ae80da2df9e640060272b83c6fc986ae 100644 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java @@ -26,8 +26,8 @@ public class BlockIceFrost extends BlockIce { @@ -28,6 +28,3 @@ index 5e414138e4..638a0aa5ae 100644 ++j; if (j >= i) { boolean flag = false; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch index ba8771accd..dfe29e706d 100644 --- a/Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch +++ b/Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch @@ -1,4 +1,4 @@ -From b44064204be279bfe95634720108a9342054fade Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 11 Mar 2018 14:13:33 -0400 Subject: [PATCH] Disable Explicit Network Manager Flushing @@ -12,7 +12,7 @@ flushing on the netty event loop, so it won't do the flush on the main thread. Renable flushing by passing -Dpaper.explicit-flush=true diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index e2d8ed88f0..08e314af7c 100644 +index e2d8ed88f05bf8cb214329ea27ac2b67f43e071a..08e314af7cbd6523bbd0bd5a5ad0a0fff2f080be 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -63,6 +63,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -32,6 +32,3 @@ index e2d8ed88f0..08e314af7c 100644 } if (this.t++ % 20 == 0) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch index bd6fd65660..f3b4ea7542 100644 --- a/Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch +++ b/Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 4eeb502b0f4a874db6cf181131cf3032b0de1be8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 15:56:26 +0200 Subject: [PATCH] Implement extended PaperServerListPingEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Implement extended PaperServerListPingEvent diff --git a/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java new file mode 100644 -index 0000000000..c1a8e295b6 +index 0000000000000000000000000000000000000000..c1a8e295b66501e0580bcfc041bca51e69109062 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java @@ -0,0 +1,31 @@ @@ -43,7 +43,7 @@ index 0000000000..c1a8e295b6 +} diff --git a/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java new file mode 100644 -index 0000000000..a2a409e635 +index 0000000000000000000000000000000000000000..a2a409e635dde08f7c53e67164b967a000511e94 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java @@ -0,0 +1,11 @@ @@ -60,7 +60,7 @@ index 0000000000..a2a409e635 +} diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java new file mode 100644 -index 0000000000..a85466bc7e +index 0000000000000000000000000000000000000000..a85466bc7e0a8aa54b9eff14077fe6c992ae2902 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java @@ -0,0 +1,112 @@ @@ -177,7 +177,7 @@ index 0000000000..a85466bc7e + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1f27939670..c502aedb8d 100644 +index 1f2793967045d0bea59e62d9d9d39b03dbdef6c8..c502aedb8dc4e7a5d7ba9d16a200c20ca3d24cd4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1,6 +1,9 @@ @@ -200,7 +200,7 @@ index 1f27939670..c502aedb8d 100644 for (int k = 0; k < agameprofile.length; ++k) { diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java -index 658ea609cb..4bb21c48bd 100644 +index 658ea609cb4927b29a3d5303006f2adf2847e06b..4bb21c48bd50353370ec3c3546a00a5d20e4b9d8 100644 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java @@ -37,6 +37,8 @@ public class PacketStatusListener implements PacketStatusInListener { @@ -223,7 +223,7 @@ index 658ea609cb..4bb21c48bd 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java -index aa125a52dc..ea52e89bd9 100644 +index aa125a52dcdf4f137cfe17c5dc808b17d5e9de0b..ea52e89bd965afbd74f15b0e2974657319c28e4a 100644 --- a/src/main/java/net/minecraft/server/ServerPing.java +++ b/src/main/java/net/minecraft/server/ServerPing.java @@ -29,6 +29,7 @@ public class ServerPing { @@ -248,7 +248,7 @@ index aa125a52dc..ea52e89bd9 100644 this.c = agameprofile; } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 6d77bbc5aa..1cf214eaca 100644 +index 6d77bbc5aa98ec7c3977b1d36b13c96cc6582e01..1cf214eaca80feae283f6524605976022f856116 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -285,7 +285,7 @@ public class SpigotConfig @@ -260,6 +260,3 @@ index 6d77bbc5aa..1cf214eaca 100644 Bukkit.getLogger().log( Level.INFO, "Server Ping Player Sample Count: {0}", playerSample ); // Paper - Use logger } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch index 8a80c7dba1..eb99009069 100644 --- a/Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch +++ b/Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch @@ -1,4 +1,4 @@ -From 596a4006a951ec62758c12c151ef6e7d973f6178 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Mar 2018 22:59:43 -0400 Subject: [PATCH] Improved Async Task Scheduler @@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue. diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java new file mode 100644 -index 0000000000..3c1992e212 +index 0000000000000000000000000000000000000000..3c1992e212a6d6f1db4d5b807b38d71913619fc0 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java @@ -0,0 +1,122 @@ @@ -159,7 +159,7 @@ index 0000000000..3c1992e212 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 8c48130db0..b116a41595 100644 +index 8c48130db03e1baffa341222caa6a82b29525671..b116a415958c35951c738faf0b3f413b469e30ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -62,7 +62,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -368,6 +368,3 @@ index 8c48130db0..b116a41595 100644 } private boolean isReady(final int currentTick) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index 9cd6f32b9c..9081b53c9b 100644 --- a/Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -1,4 +1,4 @@ -From e1a03b98e088cc5aa1affbeae61f0cb470b6abfa Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 11:45:57 -0400 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent This will allow you to change the players name or skin on login. diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 1fb609dcfc..1b43f92164 100644 +index 1fb609dcfc61adfc63f0d32dc87a5e144a5013cf..1b43f921646e3c1bfdca22ef7d3719c72aaf4520 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -1,5 +1,7 @@ @@ -43,6 +43,3 @@ index 1fb609dcfc..1b43f92164 100644 if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) { final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch index e7d643975c..e0f8b7342e 100644 --- a/Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 0087a8e8d4ba94b763f156530fa64f86279db2ea Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 12:29:48 -0400 Subject: [PATCH] Player.setPlayerProfile API @@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API This can be useful for changing name or skins after a player has logged in. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 55d08d7748..fda1b3d91b 100644 +index 55d08d77480fda81e0155aa1e0287fddc827b67a..fda1b3d91b14080bf04a02c1340c63a6eb37911d 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -66,7 +66,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -19,7 +19,7 @@ index 55d08d7748..fda1b3d91b 100644 private final ItemCooldown bW; @Nullable diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 1b43f92164..1c4ac7bf7a 100644 +index 1b43f921646e3c1bfdca22ef7d3719c72aaf4520..1c4ac7bf7ac4d864ba6efd46d8c562c238dad2bc 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -37,7 +37,7 @@ public class LoginListener implements PacketLoginInListener { @@ -48,7 +48,7 @@ index 1b43f92164..1c4ac7bf7a 100644 uniqueId = i.getId(); // Paper end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4375eb0139..37422a0953 100644 +index 4375eb013953e8fdfdf85aed238f84ba81a75413..37422a0953853673cea2bbc5f2b742b5499801fc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,6 +1,8 @@ @@ -140,6 +140,3 @@ index 4375eb0139..37422a0953 100644 public void removeDisconnectingPlayer(Player player) { hiddenPlayers.remove(player.getUniqueId()); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch index 6195094d23..3de215fd61 100644 --- a/Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch +++ b/Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch @@ -1,4 +1,4 @@ -From 3c29ae447afe27fc132a399a56deea55dae6723e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Mar 2018 20:52:07 -0400 Subject: [PATCH] Fix Dragon Server Crashes @@ -7,7 +7,7 @@ If the dragon tries to find "ground" and hits a hole, or off edge, it will infinitely keep looking for non air and eventually crash. diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java -index c42de9771e..40a8beff55 100644 +index c42de9771e96f0b1bc8fbe9fe76572ab18d5d98c..40a8beff556873a5db108e44fd053e8de80e36a6 100644 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java @@ -54,7 +54,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded @@ -19,6 +19,3 @@ index c42de9771e..40a8beff55 100644 --d3; if (d3 < 0.0D) { d3 = d2; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch index 0c6504c7df..1646869da0 100644 --- a/Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch +++ b/Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 739ab6ab88fc77d4b15e02443ebf63e9db8a6065 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:40:24 -0400 Subject: [PATCH] getPlayerUniqueId API @@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3697b3298f..0ec8460989 100644 +index 3697b3298feaec30c305e3da011790f2406e12d7..0ec84609896dd53a0c2c232f45e5c8f83558a37c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1403,6 +1403,26 @@ public final class CraftServer implements Server { @@ -39,6 +39,3 @@ index 3697b3298f..0ec8460989 100644 @Override @Deprecated public OfflinePlayer getOfflinePlayer(String name) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch index 76135bf45e..e096021ccb 100644 --- a/Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch +++ b/Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch @@ -1,11 +1,11 @@ -From ce9ff542192c4f968f716955c97589ba82e730b2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 26 Mar 2018 18:30:53 +0300 Subject: [PATCH] Make player data saving configurable diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 5884b04f7e..ba341e0174 100644 +index 5884b04f7e84048a9710736bd14237140ebf2cf7..ba341e0174cdc3b5b8bc83b7430270181ea92793 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -270,4 +270,13 @@ public class PaperConfig { @@ -23,7 +23,7 @@ index 5884b04f7e..ba341e0174 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index a0254d8e51..e60e10c57d 100644 +index a0254d8e519fa8b19dc282f3abf33b8ebe4f0aba..e60e10c57d5acaecb70e89c83c34f1f8870091c2 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -138,6 +138,7 @@ public class WorldNBTStorage implements IPlayerFileData { @@ -34,6 +34,3 @@ index a0254d8e51..e60e10c57d 100644 try { NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound()); File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat.tmp"); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch index b135a1ca72..a318f5d9ee 100644 --- a/Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch +++ b/Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch @@ -1,4 +1,4 @@ -From 3fbe82d1fd890f810182fab3cc4322f8ad851cef Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 18:22:50 +0200 Subject: [PATCH] Make legacy ping handler more reliable @@ -28,7 +28,7 @@ respond to the request. [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java -index 9ee5a1ff02..063efe9bbe 100644 +index 9ee5a1ff026d413c21da86643732f859b6123916..063efe9bbe3a95da91ef1e504033e29ccf3300af 100644 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java @@ -14,6 +14,7 @@ public class LegacyPingHandler extends ChannelInboundHandlerAdapter { @@ -166,6 +166,3 @@ index 9ee5a1ff02..063efe9bbe 100644 private void a(ChannelHandlerContext channelhandlercontext, ByteBuf bytebuf) { channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch index e6eed6b437..fd1e33fc40 100644 --- a/Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch +++ b/Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch @@ -1,4 +1,4 @@ -From 6e5caec0925007be9a5febd63c2942e9b0b1a7fb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 19:30:51 +0200 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings @@ -6,7 +6,7 @@ Subject: [PATCH] Call PaperServerListPingEvent for legacy pings diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java new file mode 100644 -index 0000000000..74c012fd40 +index 0000000000000000000000000000000000000000..74c012fd40491f1d870fbc1aa8c318a2197eb106 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java @@ -0,0 +1,73 @@ @@ -84,7 +84,7 @@ index 0000000000..74c012fd40 + +} diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java -index 063efe9bbe..4a49fe4cc6 100644 +index 063efe9bbe3a95da91ef1e504033e29ccf3300af..4a49fe4cc600e2b70963302ddae0c4479849f3f5 100644 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java @@ -1,5 +1,7 @@ @@ -152,6 +152,3 @@ index 063efe9bbe..4a49fe4cc6 100644 this.a(ctx, this.a(response)); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch index c9124d4a32..7c3e17146b 100644 --- a/Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch +++ b/Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch @@ -1,4 +1,4 @@ -From 4871eb7ac7266d76d9d00defd9b8ca6041d44e48 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 31 Mar 2018 17:04:26 +0100 Subject: [PATCH] Flag to disable the channel limit @@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs. provide an optional flag to disable this check, at your own risk. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 37422a0953..c69b3b33d8 100644 +index 37422a0953853673cea2bbc5f2b742b5499801fc..c69b3b33d82bac830ea55d30961017339af6aa7e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -138,6 +138,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -29,6 +29,3 @@ index 37422a0953..c69b3b33d8 100644 channel = StandardMessenger.validateAndCorrectChannel(channel); if (channels.add(channel)) { server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel)); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch index 7280d92c15..159ab07d69 100644 --- a/Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch +++ b/Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch @@ -1,11 +1,11 @@ -From b994c2d99063dcc174045c4c7c3b8d81c4cc44c1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 1 Apr 2018 02:29:37 +0300 Subject: [PATCH] Add method to open already placed sign diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 191bb7345e..20f0783025 100644 +index 191bb7345e06cbad7bef416e4e849df3727bdac0..20f0783025516048851aedef0a70759c2953ae47 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -617,4 +617,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -26,6 +26,3 @@ index 191bb7345e..20f0783025 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch index b588b19f86..4ccc72a2c6 100644 --- a/Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch +++ b/Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch @@ -1,4 +1,4 @@ -From bfbbb11eb7a27c639aa50ef824d72a174286e407 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Sat, 14 Apr 2018 20:20:46 +0200 Subject: [PATCH] Configurable sprint interruption on attack @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack If the sprint interruption is disabled players continue sprinting when they attack entities. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 77cdbfadf9..171c8e3031 100644 +index 77cdbfadf9c3eddb6a02460c321fa816d1bab8ac..171c8e3031cf4bf4da062663089cc0cb4552fab6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -356,4 +356,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 77cdbfadf9..171c8e3031 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index fda1b3d91b..14a0e3d41c 100644 +index fda1b3d91b14080bf04a02c1340c63a6eb37911d..14a0e3d41ccd896da3b1126a403b0b684cada907 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1112,7 +1112,11 @@ public abstract class EntityHuman extends EntityLiving { @@ -36,6 +36,3 @@ index fda1b3d91b..14a0e3d41c 100644 } if (flag3) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index 5e92a4ebac..747f8ea8bb 100644 --- a/Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -1,11 +1,11 @@ -From b58151d40b18ca1e056d07de1555ad76414ba936 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: 0x22 <0x22@futureclient.net> Date: Thu, 26 Apr 2018 04:41:11 -0400 Subject: [PATCH] Fix exploit that allowed colored signs to be created diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 64f789d7c4..4a0a847944 100644 +index 64f789d7c44ee186d28911b91cd070b15ca0a824..4a0a8479448b5872f356379d6f68d9142d85e175 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2502,7 +2502,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -17,6 +17,3 @@ index 64f789d7c4..4a0a847944 100644 } SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); this.server.getPluginManager().callEvent(event); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0215-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0215-EndermanEscapeEvent.patch index 24758630e6..925873536f 100644 --- a/Spigot-Server-Patches/0215-EndermanEscapeEvent.patch +++ b/Spigot-Server-Patches/0215-EndermanEscapeEvent.patch @@ -1,4 +1,4 @@ -From 63f51a54c6865db3e11678f2dd51eda1e4cf9e81 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:15:55 -0400 Subject: [PATCH] EndermanEscapeEvent @@ -8,7 +8,7 @@ Fires an event anytime an enderman intends to teleport away from the player You may cancel this, enabling ranged attacks to damage the enderman for example. diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 538c2169cd..2893f75bdf 100644 +index 538c2169cd53d364b941ad1251df3731f77b3a2c..2893f75bdff91e810431c64899b64047c372aa62 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -80,6 +80,3 @@ index 538c2169cd..2893f75bdf 100644 this.i.eq(); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch index 31bd530d34..4121c3f53e 100644 --- a/Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch +++ b/Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch @@ -1,4 +1,4 @@ -From 93cf9d1754579d9463ae1ddebaaa7d770e02ff78 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:29:44 -0400 Subject: [PATCH] Enderman.teleportRandomly() @@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly() Ability to trigger the vanilla "teleport randomly" mechanic of an enderman. diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 2893f75bdf..f279c9b148 100644 +index 2893f75bdff91e810431c64899b64047c372aa62..f279c9b1482d3b3d632a762affff425139920b66 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -193,6 +193,7 @@ public class EntityEnderman extends EntityMonster { @@ -18,7 +18,7 @@ index 2893f75bdf..f279c9b148 100644 if (!this.world.p_() && this.isAlive()) { double d0 = this.locX() + (this.random.nextDouble() - 0.5D) * 64.0D; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java -index 970efabd37..0c5f359346 100644 +index 970efabd37d380ee1028c80a8e967e0f7aee9760..0c5f35934617529e92c02729687b524c3796128c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java @@ -16,6 +16,7 @@ public class CraftEnderman extends CraftMonster implements Enderman { @@ -29,6 +29,3 @@ index 970efabd37..0c5f359346 100644 @Override public MaterialData getCarriedMaterial() { IBlockData blockData = getHandle().getCarried(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch index 0bd1e0b102..3f7e943452 100644 --- a/Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch +++ b/Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch @@ -1,4 +1,4 @@ -From 44e013f57e81987a5c75f7d197a092fcfc6979bf Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 17:15:26 -0400 Subject: [PATCH] Block Enderpearl Travel Exploit @@ -12,7 +12,7 @@ This disables that by not saving the thrower when the chunk is unloaded. This is mainly useful for survival servers that do not allow freeform teleporting. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 171c8e3031..9c52e31f4c 100644 +index 171c8e3031cf4bf4da062663089cc0cb4552fab6..9c52e31f4cf1e64a37c65c021da219fc26dda137 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -361,4 +361,10 @@ public class PaperWorldConfig { @@ -27,7 +27,7 @@ index 171c8e3031..9c52e31f4c 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java -index 724b78b5d2..9eed1dce3e 100644 +index 724b78b5d2d7f4ce8de31c763d2d95b986c1b7f6..9eed1dce3e48683b751ebbaac0487a046354622e 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -201,6 +201,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile { @@ -38,6 +38,3 @@ index 724b78b5d2..9eed1dce3e 100644 } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch index 834ff9a43e..8e36ff16b9 100644 --- a/Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From 5135255c143e00b805f7c143b41f08faa889f1b8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 @@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle. This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 7417725363..60f936f2e5 100644 +index 7417725363a09500215d5e5e3be1d3a4458dd5e4..60f936f2e50aaf3a894f3fd92c7619263cf27878 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -56,7 +56,7 @@ public class WorldServer extends World { @@ -43,7 +43,7 @@ index 7417725363..60f936f2e5 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 265af7ac7f..d6e101ca9f 100644 +index 265af7ac7fba984ed3d486d6c5d01b54dd2592d9..d6e101ca9fade08e4d2545fb6e38cb2f6e988a1c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2289,11 +2289,17 @@ public class CraftWorld implements World { @@ -65,6 +65,3 @@ index 265af7ac7f..d6e101ca9f 100644 CraftParticle.toNMS(particle, data), // Particle x, y, z, // Position count, // Count --- -2.26.0 - diff --git a/Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch index c8f51bc065..3642aff6fe 100644 --- a/Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch +++ b/Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch @@ -1,4 +1,4 @@ -From ffde08dae5e5fe13d0ba9748749ade9bab3a43da Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 20:18:54 -0400 Subject: [PATCH] EndermanAttackPlayerEvent @@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player. This allows you to override/extend the pumpkin/stare logic. diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index f279c9b148..b7c67f0cdb 100644 +index f279c9b1482d3b3d632a762affff425139920b66..b7c67f0cdb3d02c7a2dbe85f9a432836cb34bb6e 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -141,7 +141,15 @@ public class EntityEnderman extends EntityMonster { @@ -27,6 +27,3 @@ index f279c9b148..b7c67f0cdb 100644 ItemStack itemstack = (ItemStack) entityhuman.inventory.armor.get(3); if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch index 6ec0678a9d..a76d06b132 100644 --- a/Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch +++ b/Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch @@ -1,4 +1,4 @@ -From 2e95466d89c83967f8b92210f8572dcc3478f2ad Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:35:16 -0400 Subject: [PATCH] WitchConsumePotionEvent @@ -6,7 +6,7 @@ Subject: [PATCH] WitchConsumePotionEvent Fires when a witch consumes the potion in their hand diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index ddff0b5786..aa90111716 100644 +index ddff0b57869c3511346510a91336045ec1469bdc..aa90111716c69379df250f06957a2db5178bbe92 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -88,7 +88,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -22,6 +22,3 @@ index ddff0b5786..aa90111716 100644 if (list != null) { Iterator iterator = list.iterator(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch index 46960cc907..d1d7c110e2 100644 --- a/Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch +++ b/Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch @@ -1,4 +1,4 @@ -From 5e7c7363275148ef0f6debe038f75d879ccde147 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:44:58 -0400 Subject: [PATCH] WitchThrowPotionEvent @@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent Fired when a witch throws a potion at a player diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index aa90111716..1f2759e95e 100644 +index aa90111716c69379df250f06957a2db5178bbe92..1f2759e95e6a8382c5d27899b05a993beee25f5a 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -185,9 +185,16 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -28,6 +28,3 @@ index aa90111716..1f2759e95e 100644 entitypotion.pitch -= -20.0F; entitypotion.shoot(d0, d1 + (double) (f1 * 0.2F), d2, 0.75F, 8.0F); this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_THROW, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch index 16872763a6..f0ebebc1ea 100644 --- a/Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch +++ b/Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch @@ -1,4 +1,4 @@ -From 13516011ad9407c5f2e0d409b8e2ba7a103b0861 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Jun 2018 20:39:20 -0400 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity @@ -8,7 +8,7 @@ This API has more capabilities than .dropItem with the Consumer function Item can be set inside of the Consumer pre spawn function. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d6e101ca9f..a427fea9c7 100644 +index d6e101ca9fade08e4d2545fb6e38cb2f6e988a1c..a427fea9c70380e2301515c6a24497e382c5097b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1491,6 +1491,10 @@ public class CraftWorld implements World { @@ -22,6 +22,3 @@ index d6e101ca9f..a427fea9c7 100644 } else if (FallingBlock.class.isAssignableFrom(clazz)) { entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z))); } else if (Projectile.class.isAssignableFrom(clazz)) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch index 4dea3818ec..9461975855 100644 --- a/Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch +++ b/Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch @@ -1,11 +1,11 @@ -From f08a0c225edc9e8d62a9d7649e97e45c855f9118 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:47:26 -0400 Subject: [PATCH] WitchReadyPotionEvent diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 1f2759e95e..be6ecfb08a 100644 +index 1f2759e95e6a8382c5d27899b05a993beee25f5a..be6ecfb08aaba3fc5d96e918b7540fc75c92e89e 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -121,7 +121,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -21,6 +21,3 @@ index 1f2759e95e..be6ecfb08a 100644 this.by = this.getItemInMainHand().k(); this.t(true); this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_DRINK, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch index 90dbd2ab3d..68d6b72767 100644 --- a/Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch +++ b/Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch @@ -1,4 +1,4 @@ -From e29404b4426b7fb849d91fd1f6c23d29eaddc250 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 23:00:29 -0400 Subject: [PATCH] ItemStack#getMaxItemUseDuration @@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration Allows you to determine how long it takes to use a usable/consumable item diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 854cffe6c9..641a52b968 100644 +index 854cffe6c98956cbafa2ead9b831e39209a76c8d..641a52b968ef04a142b32703b61c8b75643b36a6 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -548,6 +548,7 @@ public final class ItemStack { @@ -18,7 +18,7 @@ index 854cffe6c9..641a52b968 100644 return this.getItem().f_(this); } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 3dd912abe3..a41be8fdae 100644 +index 3dd912abe3fec22adb29d8edfd66b9f5f3bee4f6..a41be8fdaebe7cf61537c638392b3dc7c7f5b371 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -174,6 +174,13 @@ public final class CraftItemStack extends ItemStack { @@ -35,6 +35,3 @@ index 3dd912abe3..a41be8fdae 100644 @Override public void addUnsafeEnchantment(Enchantment ench, int level) { Validate.notNull(ench, "Cannot add null enchantment"); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch index e1c881942e..2d432ec5a8 100644 --- a/Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch @@ -1,11 +1,11 @@ -From b1413cdf91fe66723d2337daea75a80f42de66ce Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 9 Jun 2018 14:08:39 +0200 Subject: [PATCH] Implement EntityTeleportEndGatewayEvent diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java -index 78fba79378..c71f76004e 100644 +index 78fba79378173dc2c4290e048c3497e206332458..c71f76004ed934e9e921efc4cb637f2e77af92d2 100644 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java @@ -145,8 +145,19 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick @@ -29,6 +29,3 @@ index 78fba79378..c71f76004e 100644 } this.h(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch index 71ab1a1302..eb594324e8 100644 --- a/Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch +++ b/Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch @@ -1,4 +1,4 @@ -From 54b303dbb3e7f227a7e1a948dea852f989e050be Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 10 Jun 2018 01:18:49 -0400 Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event @@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event Otherwise the creeper infinite explodes diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 374cf28fb4..b895300797 100644 +index 374cf28fb42b13152f58fd63c4f0cb25eae6a2d9..b89530079751c13894527f21572cc37e3a5548b8 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -12,7 +12,7 @@ public class EntityCreeper extends EntityMonster { @@ -26,6 +26,3 @@ index 374cf28fb4..b895300797 100644 } // CraftBukkit end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch index 218a8d0264..7e91fc74bf 100644 --- a/Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch +++ b/Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch @@ -1,4 +1,4 @@ -From c7c400bcfbdc1b12f6cf44a9cd6d2128b970ea2e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 10 Jun 2018 20:20:15 -0400 Subject: [PATCH] Fix CraftEntity hashCode @@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle() However, replaced it too to make it clearer of intent. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 440bc4513b..bc2df82a5f 100644 +index 440bc4513b91c72e01bdd2a106a84e82ab72ac97..bc2df82a5f4fb299328a45428c33e67ef153b39a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -725,14 +725,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -44,6 +44,3 @@ index 440bc4513b..bc2df82a5f 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch index b78809c175..ca7762f858 100644 --- a/Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch +++ b/Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch @@ -1,4 +1,4 @@ -From 2635ab2ca3377bff8d9600f95ce3cb9fdae8714f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Jun 2018 00:30:32 -0400 Subject: [PATCH] Configurable Alternative LootPool Luck Formula @@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas. I would love to see this change in Vanilla, so Mojang please pull :) diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index ba341e0174..26ab855dcf 100644 +index ba341e0174cdc3b5b8bc83b7430270181ea92793..26ab855dcf38446a3d8577108bd16fdbb76126b2 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -279,4 +279,12 @@ public class PaperConfig { @@ -53,7 +53,7 @@ index ba341e0174..26ab855dcf 100644 + } } diff --git a/src/main/java/net/minecraft/server/LootSelectorEntry.java b/src/main/java/net/minecraft/server/LootSelectorEntry.java -index 3ed6a1e785..03398ce8fd 100644 +index 3ed6a1e785f68c4bb6c5afe024c43150915968a3..03398ce8fdcc68cf5aa7caa3c8fd51c9e8e178eb 100644 --- a/src/main/java/net/minecraft/server/LootSelectorEntry.java +++ b/src/main/java/net/minecraft/server/LootSelectorEntry.java @@ -11,8 +11,8 @@ import org.apache.commons.lang3.ArrayUtils; @@ -108,6 +108,3 @@ index 3ed6a1e785..03398ce8fd 100644 + private int lastWeight = 0; + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch index b5cd985b9b..599b081cdc 100644 --- a/Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch +++ b/Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch @@ -1,11 +1,11 @@ -From 1d9085dbdb123a9eddb5bbe1df611dcccf0622ef Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Jun 2018 20:37:03 -0400 Subject: [PATCH] Print Error details when failing to save player data diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index e60e10c57d..350ac42d6b 100644 +index e60e10c57d5acaecb70e89c83c34f1f8870091c2..350ac42d6b45a1023f6254de7706818775b7957b 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -151,7 +151,7 @@ public class WorldNBTStorage implements IPlayerFileData { @@ -17,6 +17,3 @@ index e60e10c57d..350ac42d6b 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch index 9400fe3bbd..d1a7968a4f 100644 --- a/Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch @@ -1,11 +1,11 @@ -From 9e40f0f5c7588278bfdfd08d3af646ba9176b617 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 16 Jun 2018 01:18:16 -0500 Subject: [PATCH] Make shield blocking delay configurable diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 9c52e31f4c..33ce9a5004 100644 +index 9c52e31f4cf1e64a37c65c021da219fc26dda137..33ce9a500430a01650e69a3568c8b03db325a936 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -367,4 +367,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 9c52e31f4c..33ce9a5004 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index c5c0fc3877..8f6fe004a4 100644 +index c5c0fc3877fa6c8602e4468d5702612d986891f9..8f6fe004a40b693d1a9945dcab0625c5e9346c01 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -3001,7 +3001,7 @@ public abstract class EntityLiving extends Entity { @@ -48,7 +48,7 @@ index c5c0fc3877..8f6fe004a4 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 1760dfa7a3..a8e44e95d6 100644 +index 1760dfa7a312b63d7608d890c977452ad995d7ae..a8e44e95d6115833f4e20e6bb007842bdc52f1ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -644,5 +644,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -67,6 +67,3 @@ index 1760dfa7a3..a8e44e95d6 100644 + } // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch index c61c2dd563..6b88969e40 100644 --- a/Spigot-Server-Patches/0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch +++ b/Spigot-Server-Patches/0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch @@ -1,4 +1,4 @@ -From 0d943f6d85d2f09f921bdb733ab8838f41b0472b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 15 Jun 2013 19:51:17 -0400 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API @@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API Adds ability to get what arrow was shot, and control if it should be consumed. diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java -index fb9656afde..3c95c0428b 100644 +index fb9656afde07a871216a4c5e414777603be590d1..3c95c0428b211b14db65be16a95446debda789e6 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java @@ -157,7 +157,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR @@ -19,7 +19,7 @@ index fb9656afde..3c95c0428b 100644 event.getProjectile().remove(); return; diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java -index 83aa70c295..26899916d3 100644 +index 83aa70c295f93b1c19d81fb0b90876e62fe58c23..26899916d3f5274691386685d13d18f587e4ec28 100644 --- a/src/main/java/net/minecraft/server/ItemBow.java +++ b/src/main/java/net/minecraft/server/ItemBow.java @@ -36,6 +36,7 @@ public class ItemBow extends ItemProjectileWeapon { @@ -59,7 +59,7 @@ index 83aa70c295..26899916d3 100644 if (itemstack1.isEmpty()) { entityhuman.inventory.f(itemstack1); diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java -index 7be41c8698..60a47bccca 100644 +index 7be41c8698e86727978db7d72b3dd3fbfe6b7272..60a47bccca5bc77039c0bec94eb329b3f2f0937f 100644 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java @@ -221,7 +221,7 @@ public class ItemCrossbow extends ItemProjectileWeapon { @@ -72,7 +72,7 @@ index 7be41c8698..60a47bccca 100644 event.getProjectile().remove(); return; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f059e502e4..7593159fd6 100644 +index f059e502e47e96e27514127ff1e56a85944a8b43..7593159fd6536468febae2ea92d31f7d76af09ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -52,6 +52,7 @@ import net.minecraft.server.GeneratorAccess; @@ -103,6 +103,3 @@ index f059e502e4..7593159fd6 100644 Bukkit.getPluginManager().callEvent(event); return event; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0232-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0232-PlayerReadyArrowEvent.patch index c14766d305..f3c28c9ab1 100644 --- a/Spigot-Server-Patches/0232-PlayerReadyArrowEvent.patch +++ b/Spigot-Server-Patches/0232-PlayerReadyArrowEvent.patch @@ -1,4 +1,4 @@ -From 29e918f7337fc371af5b3d953eb016d2be8698c6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 01:12:53 -0400 Subject: [PATCH] PlayerReadyArrowEvent @@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use. Plugins can skip selection of certain arrows and control which is used. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 14a0e3d41c..6e9dd4d371 100644 +index 14a0e3d41ccd896da3b1126a403b0b684cada907..6e9dd4d3717567f54ac706715d75bf53d48c5f7d 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -2157,6 +2157,17 @@ public abstract class EntityHuman extends EntityLiving { @@ -37,6 +37,3 @@ index 14a0e3d41c..6e9dd4d371 100644 return itemstack2; } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0233-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0233-Fire-EntityShootBowEvent-for-Illusioner.patch index b0315e03c5..d3093ac832 100644 --- a/Spigot-Server-Patches/0233-Fire-EntityShootBowEvent-for-Illusioner.patch +++ b/Spigot-Server-Patches/0233-Fire-EntityShootBowEvent-for-Illusioner.patch @@ -1,11 +1,11 @@ -From c817d5dd05290031ab58f2f5b58842d768a122a3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 22:19:36 -0400 Subject: [PATCH] Fire EntityShootBowEvent for Illusioner diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java -index 2ea0583a3e..81b7cd06f2 100644 +index 2ea0583a3e9f2f13d84673cc412a3f4c9bfaf6f7..81b7cd06f2e1f1f2ce75ba84d47cc18723c2bfb6 100644 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java @@ -138,8 +138,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan @@ -28,6 +28,3 @@ index 2ea0583a3e..81b7cd06f2 100644 } class a extends EntityIllagerWizard.c { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0234-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0234-Implement-EntityKnockbackByEntityEvent.patch index 34fc345906..2b57a2e338 100644 --- a/Spigot-Server-Patches/0234-Implement-EntityKnockbackByEntityEvent.patch +++ b/Spigot-Server-Patches/0234-Implement-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From e83d7d76ebe70cb82ddfed39dc6ef15ad12efb49 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Mon, 18 Jun 2018 15:46:23 +0200 Subject: [PATCH] Implement EntityKnockbackByEntityEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent This event is called when an entity receives knockback by another entity. diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 8f6fe004a4..c1e6792e0d 100644 +index 8f6fe004a40b693d1a9945dcab0625c5e9346c01..c1e6792e0d75647108127bcf43bdc9e7bf18aea3 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1421,6 +1421,16 @@ public abstract class EntityLiving extends Entity { @@ -26,6 +26,3 @@ index 8f6fe004a4..c1e6792e0d 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0235-Expand-Explosions-API.patch b/Spigot-Server-Patches/0235-Expand-Explosions-API.patch index 70db8e1165..170ff1c52b 100644 --- a/Spigot-Server-Patches/0235-Expand-Explosions-API.patch +++ b/Spigot-Server-Patches/0235-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From 9cad60989c501f51ac311e309dca5e78c8ef369d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Jun 2018 23:17:24 -0400 Subject: [PATCH] Expand Explosions API @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API Add Entity as a Source capability, and add more API choices, and on Location. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a427fea9c7..a16ab1f845 100644 +index a427fea9c70380e2301515c6a24497e382c5097b..a16ab1f845ba98b8895402ae93c4cd90f48f617c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -879,6 +879,11 @@ public class CraftWorld implements World { @@ -21,6 +21,3 @@ index a427fea9c7..a16ab1f845 100644 @Override public boolean createExplosion(Location loc, float power) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0236-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0236-LivingEntity-Hand-Raised-Item-Use-API.patch index d6e8275ad8..e78e0ebcb2 100644 --- a/Spigot-Server-Patches/0236-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-Server-Patches/0236-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -1,4 +1,4 @@ -From 60534734f1dd4b0212c3d4a37511d5b5e493e709 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Jun 2018 00:21:28 -0400 Subject: [PATCH] LivingEntity Hand Raised/Item Use API @@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index c1e6792e0d..a4051c1f0c 100644 +index c1e6792e0d75647108127bcf43bdc9e7bf18aea3..a4051c1f0cdcf179e7afe60d301982412da7ed64 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -112,7 +112,7 @@ public abstract class EntityLiving extends Entity { @@ -32,7 +32,7 @@ index c1e6792e0d..a4051c1f0c 100644 return this.isHandRaised() ? this.activeItem.k() - this.dE() : 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index a8e44e95d6..3a87c6574b 100644 +index a8e44e95d6115833f4e20e6bb007842bdc52f1ef..3a87c6574bbad9e6c2d7573eb447194c931d7ec4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -654,5 +654,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -61,6 +61,3 @@ index a8e44e95d6..3a87c6574b 100644 + } // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0237-RangedEntity-API.patch b/Spigot-Server-Patches/0237-RangedEntity-API.patch index 402f68762f..4d28a11045 100644 --- a/Spigot-Server-Patches/0237-RangedEntity-API.patch +++ b/Spigot-Server-Patches/0237-RangedEntity-API.patch @@ -1,4 +1,4 @@ -From 4a56a64f6781fdec16212f121ac2d48f9a3d7008 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 26 Jun 2018 22:00:49 -0400 Subject: [PATCH] RangedEntity API @@ -8,7 +8,7 @@ and to perform an attack. diff --git a/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java new file mode 100644 -index 0000000000..696660b089 +index 0000000000000000000000000000000000000000..696660b089ba355f865e5051237eefd0df667857 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java @@ -0,0 +1,19 @@ @@ -32,7 +32,7 @@ index 0000000000..696660b089 + } +} diff --git a/src/main/java/net/minecraft/server/IRangedEntity.java b/src/main/java/net/minecraft/server/IRangedEntity.java -index b4178ce1e8..9b79ac77db 100644 +index b4178ce1e86ad40b64a229e066f058a8e848324d..9b79ac77db880930fcb86744924bf0baa92bef31 100644 --- a/src/main/java/net/minecraft/server/IRangedEntity.java +++ b/src/main/java/net/minecraft/server/IRangedEntity.java @@ -2,5 +2,8 @@ package net.minecraft.server; @@ -46,7 +46,7 @@ index b4178ce1e8..9b79ac77db 100644 + void q(boolean flag); default void setChargingAttack(boolean charging) { q(charging); }; // Paper } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java -index 6e41dfd923..390183fffd 100644 +index 6e41dfd92344e3de71642879993cf25a5dd8b30a..390183fffd952e583a7d7df9ae618458fb48d278 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java @@ -1,11 +1,12 @@ @@ -64,7 +64,7 @@ index 6e41dfd923..390183fffd 100644 public CraftDrowned(CraftServer server, EntityDrowned entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java -index 2ec1af8be4..f31d3eed3a 100644 +index 2ec1af8be419d94dfde8fe2cc46bae88751a9d8f..f31d3eed3a53d171596b888351064f6d70986785 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java @@ -1,11 +1,12 @@ @@ -82,7 +82,7 @@ index 2ec1af8be4..f31d3eed3a 100644 public CraftIllusioner(CraftServer server, EntityIllagerIllusioner entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java -index 23ab78da15..3f94c5a920 100644 +index 23ab78da150cacefbac3e35f860dbd20548e54fa..3f94c5a9206e2da9c852d282e267ab4d9f7324c4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java @@ -1,5 +1,6 @@ @@ -102,7 +102,7 @@ index 23ab78da15..3f94c5a920 100644 public CraftLlama(CraftServer server, EntityLlama entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java -index b4ae898401..02df66ecfe 100644 +index b4ae8984019b09ae52d708a48663d9ca7509eb29..02df66ecfe92727e1b8e662bb41faac0dc014a44 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java @@ -1,11 +1,12 @@ @@ -120,7 +120,7 @@ index b4ae898401..02df66ecfe 100644 public CraftSkeleton(CraftServer server, EntitySkeletonAbstract entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java -index 27460c59e3..e482b1c9dc 100644 +index 27460c59e399bbe2a38eeb6256a8985ed9a04655..e482b1c9dc01b9fdac91681ff116cd21b06fc031 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java @@ -1,11 +1,12 @@ @@ -138,7 +138,7 @@ index 27460c59e3..e482b1c9dc 100644 super(server, entity); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java -index 244e4dc8ec..bae107e76e 100644 +index 244e4dc8ec740e8071f249de7f461d3c3efe7199..bae107e76e4c8df446d4a7be8dda291d820074d7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java @@ -1,11 +1,12 @@ @@ -156,7 +156,7 @@ index 244e4dc8ec..bae107e76e 100644 super(server, entity); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java -index 38b555cc7e..03cf6136e6 100644 +index 38b555cc7ef80dc15ca8d37911b2acab5676e6a1..03cf6136e64bab7180933e106234b92c1255268d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java @@ -1,5 +1,6 @@ @@ -175,6 +175,3 @@ index 38b555cc7e..03cf6136e6 100644 private BossBar bossBar; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0238-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0238-Add-config-to-disable-ender-dragon-legacy-check.patch index 6a4bd24cd9..94736ffd2e 100644 --- a/Spigot-Server-Patches/0238-Add-config-to-disable-ender-dragon-legacy-check.patch +++ b/Spigot-Server-Patches/0238-Add-config-to-disable-ender-dragon-legacy-check.patch @@ -1,11 +1,11 @@ -From 2573bbb96c0627d729050ead7d8293dddc6e6cd5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 22 Jun 2018 10:38:31 -0500 Subject: [PATCH] Add config to disable ender dragon legacy check diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 33ce9a5004..cea15d50ed 100644 +index 33ce9a500430a01650e69a3568c8b03db325a936..cea15d50ed89430ee8d8cff9de21e1fc7982e1d8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -372,4 +372,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 33ce9a5004..cea15d50ed 100644 + } } diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java -index 0674811849..687efa022d 100644 +index 06748118494f2cc8cd692511e3b0bfd269fd249c..687efa022df41c23b5ffcce2efc2edcd8bd12dd6 100644 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java @@ -28,10 +28,10 @@ public class EnderDragonBattle { @@ -46,6 +46,3 @@ index 0674811849..687efa022d 100644 this.d = worldserver; if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) { if (nbttagcompound.b("DragonUUID")) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0239-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0239-Implement-World.getEntity-UUID-API.patch index ea561657bc..9e4be993be 100644 --- a/Spigot-Server-Patches/0239-Implement-World.getEntity-UUID-API.patch +++ b/Spigot-Server-Patches/0239-Implement-World.getEntity-UUID-API.patch @@ -1,11 +1,11 @@ -From ff38c7b228fbe0093392ed067ae2f8612abd2d8f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 3 Jul 2018 16:08:14 +0200 Subject: [PATCH] Implement World.getEntity(UUID) API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a16ab1f845..cde999c97f 100644 +index a16ab1f845ba98b8895402ae93c4cd90f48f617c..cde999c97f5a1ccab0d13f02708992fac3876e67 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1293,6 +1293,15 @@ public class CraftWorld implements World { @@ -24,6 +24,3 @@ index a16ab1f845..cde999c97f 100644 @Override public void save() { org.spigotmc.AsyncCatcher.catchOp("world save"); // Spigot --- -2.26.2 - diff --git a/Spigot-Server-Patches/0240-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0240-InventoryCloseEvent-Reason-API.patch index 75cdf5021a..d288892838 100644 --- a/Spigot-Server-Patches/0240-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0240-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 7129c46b81098d87e81839acba7e950d4df11b1c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 6e9dd4d371..684978be7c 100644 +index 6e9dd4d3717567f54ac706715d75bf53d48c5f7d..684978be7ccc401b71b0594828a7783b209a5210 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -164,7 +164,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -34,7 +34,7 @@ index 6e9dd4d371..684978be7c 100644 this.activeContainer = this.defaultContainer; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 88692d9eae..f35d233406 100644 +index 88692d9eaea57a4d172d537a6cf2a3bffe058d54..f35d23340665ab323732915efc0c0ad7fe4d964d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -368,7 +368,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -88,7 +88,7 @@ index 88692d9eae..f35d233406 100644 this.m(); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 4a0a847944..8eb12e89ea 100644 +index 4a0a8479448b5872f356379d6f68d9142d85e175..8eb12e89ea84051281149d96ca82905bc4366ba4 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2040,7 +2040,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -101,7 +101,7 @@ index 4a0a847944..8eb12e89ea 100644 this.player.m(); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index a61815c794..5ae0927c14 100644 +index a61815c794885d7192eec62d05a54e765fb8c838..5ae0927c14a1915b85c13c13c8cf3e6b3dddfe9d 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -390,7 +390,7 @@ public abstract class PlayerList { @@ -114,7 +114,7 @@ index a61815c794..5ae0927c14 100644 PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game"); cserver.getPluginManager().callEvent(playerQuitEvent); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 60f936f2e5..7c1a748c9b 100644 +index 60f936f2e50aaf3a894f3fd92c7619263cf27878..7c1a748c9b6982e09626cba60651a6de6a5796d4 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1050,7 +1050,7 @@ public class WorldServer extends World { @@ -136,7 +136,7 @@ index 60f936f2e5..7c1a748c9b 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 20f0783025..a6d75c0e07 100644 +index 20f0783025516048851aedef0a70759c2953ae47..a6d75c0e07a25fdb59dde2e3eb2a0213c7112515 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -467,8 +467,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -155,7 +155,7 @@ index 20f0783025..a6d75c0e07 100644 @Override public boolean isBlocking() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c69b3b33d8..ffbf2b983b 100644 +index c69b3b33d82bac830ea55d30961017339af6aa7e..ffbf2b983bb91c873f403b411a05c563feffeebf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -785,7 +785,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -168,7 +168,7 @@ index c69b3b33d8..ffbf2b983b 100644 // Check if the fromWorld and toWorld are the same. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 7593159fd6..fc3d9efd84 100644 +index 7593159fd6536468febae2ea92d31f7d76af09ba..fc3d9efd84fbe696852216f09500dc4082f49493 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1300,8 +1300,19 @@ public class CraftEventFactory { @@ -192,6 +192,3 @@ index 7593159fd6..fc3d9efd84 100644 human.world.getServer().getPluginManager().callEvent(event); human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity()); } --- -2.26.0 - diff --git a/Spigot-Server-Patches/0241-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0241-Configurable-Bed-Search-Radius.patch index 139de6655d..b56a18a87b 100644 --- a/Spigot-Server-Patches/0241-Configurable-Bed-Search-Radius.patch +++ b/Spigot-Server-Patches/0241-Configurable-Bed-Search-Radius.patch @@ -1,4 +1,4 @@ -From a68f8b7e27715b5e86c662b29c3620375fe2ad42 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 15:22:06 -0400 Subject: [PATCH] Configurable Bed Search Radius @@ -10,7 +10,7 @@ player at their bed should it of became obstructed. Defaults to vanilla 1. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index cea15d50ed..387e0dcb9f 100644 +index cea15d50ed89430ee8d8cff9de21e1fc7982e1d8..387e0dcb9f01ad947daaa19211331a96742ce004 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -377,4 +377,15 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index cea15d50ed..387e0dcb9f 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java -index 7947563426..e0bc6080ef 100644 +index 7947563426f7f1cc9364d7b6f71256bf3beea463..e0bc6080ef29258473ec3ef7ffa7c246f08ac146 100644 --- a/src/main/java/net/minecraft/server/BlockBed.java +++ b/src/main/java/net/minecraft/server/BlockBed.java @@ -196,6 +196,9 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity { @@ -158,6 +158,3 @@ index 7947563426..e0bc6080ef 100644 blockposition_mutableblockposition.c(EnumDirection.DOWN); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0242-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0242-Vex-getSummoner-API.patch index 7e07bcd806..07dedcc9c1 100644 --- a/Spigot-Server-Patches/0242-Vex-getSummoner-API.patch +++ b/Spigot-Server-Patches/0242-Vex-getSummoner-API.patch @@ -1,4 +1,4 @@ -From e76cf77f553d2c2310152768727b162e0a1d25fd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 15:30:22 -0400 Subject: [PATCH] Vex#getSummoner API @@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getSummoner API Get's the NPC that summoned this Vex diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index cd9fb3aabf..a46730460e 100644 +index cd9fb3aabfca254ca522d39a25e54ceda0b6f5fc..a46730460e5d9f6e52d63ba1950d1e7195fe87cd 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -92,6 +92,7 @@ public class EntityVex extends EntityMonster { @@ -18,7 +18,7 @@ index cd9fb3aabf..a46730460e 100644 return this.c; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java -index 737a37b6fe..169c951ec3 100644 +index 737a37b6fe9cc4f6a93f7bae7e4f8326024929cc..169c951ec30fc5b78eb4ba29352ba009b7fa5efd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java @@ -1,8 +1,10 @@ @@ -46,6 +46,3 @@ index 737a37b6fe..169c951ec3 100644 @Override public String toString() { return "CraftVex"; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0243-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0243-Refresh-player-inventory-when-cancelling-PlayerInter.patch index 0eef102303..61e4724741 100644 --- a/Spigot-Server-Patches/0243-Refresh-player-inventory-when-cancelling-PlayerInter.patch +++ b/Spigot-Server-Patches/0243-Refresh-player-inventory-when-cancelling-PlayerInter.patch @@ -1,4 +1,4 @@ -From 142bf8f4d121f29fe51d0a41095bf9da93605960 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 13 Jul 2018 14:54:43 +0200 Subject: [PATCH] Refresh player inventory when cancelling @@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is cancelled to avoid this problem. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8eb12e89ea..8648845acb 100644 +index 8eb12e89ea84051281149d96ca82905bc4366ba4..8648845acb054e1e151e5376607e633b4154bbbd 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1950,6 +1950,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -27,6 +27,3 @@ index 8eb12e89ea..8648845acb 100644 return; } // CraftBukkit end --- -2.26.2 - diff --git a/Spigot-Server-Patches/0244-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0244-Don-t-change-the-Entity-Random-seed-for-squids.patch index 38655a341c..aba93c9b63 100644 --- a/Spigot-Server-Patches/0244-Don-t-change-the-Entity-Random-seed-for-squids.patch +++ b/Spigot-Server-Patches/0244-Don-t-change-the-Entity-Random-seed-for-squids.patch @@ -1,11 +1,11 @@ -From 5a5964724638df43100a97619cf5eb8c821f1c11 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:05:00 -0400 Subject: [PATCH] Don't change the Entity Random seed for squids diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 1c1ff2069d..92efe4e7f5 100644 +index 1c1ff2069d6daaf866a3e80a9b3ce78b19941384..92efe4e7f50fa10bcdff52fb51a9b814d995c8c9 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -21,7 +21,7 @@ public class EntitySquid extends EntityWaterAnimal { @@ -17,6 +17,3 @@ index 1c1ff2069d..92efe4e7f5 100644 this.bC = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0245-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0245-Re-add-vanilla-entity-warnings-for-duplicates.patch index 16ba7f9fea..40cb81fe06 100644 --- a/Spigot-Server-Patches/0245-Re-add-vanilla-entity-warnings-for-duplicates.patch +++ b/Spigot-Server-Patches/0245-Re-add-vanilla-entity-warnings-for-duplicates.patch @@ -1,4 +1,4 @@ -From dc900155f5ba16d321383bb5a0471fdcace51771 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:08:05 -0400 Subject: [PATCH] Re-add vanilla entity warnings for duplicates @@ -8,7 +8,7 @@ These are a critical sign that somethin went wrong, and you've lost some data... We should kind of know about these things you know. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 7c1a748c9b..25e2a6580a 100644 +index 7c1a748c9b6982e09626cba60651a6de6a5796d4..25e2a6580ae72ffa51bf67290992382797b2dd9c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1035,7 +1035,8 @@ public class WorldServer extends World { @@ -21,6 +21,3 @@ index 7c1a748c9b..25e2a6580a 100644 return true; } } --- -2.26.0 - diff --git a/Spigot-Server-Patches/0246-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0246-Avoid-item-merge-if-stack-size-above-max-stack-size.patch index 1ee7b639d8..8c3350c02a 100644 --- a/Spigot-Server-Patches/0246-Avoid-item-merge-if-stack-size-above-max-stack-size.patch +++ b/Spigot-Server-Patches/0246-Avoid-item-merge-if-stack-size-above-max-stack-size.patch @@ -1,11 +1,11 @@ -From 0edef40fb8ea590b8a2db365016c780e8554fa68 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 16 Jul 2018 12:42:20 +0200 Subject: [PATCH] Avoid item merge if stack size above max stack size diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 5efcc50ab9..e5c9bac88a 100644 +index 5efcc50ab9e8a99d88a9d2e7f15ecbcc4439b93e..e5c9bac88a59d52c9b2f05df3e4f373edbe009ca 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -170,6 +170,10 @@ public class EntityItem extends Entity { @@ -19,6 +19,3 @@ index 5efcc50ab9..e5c9bac88a 100644 // Spigot start double radius = world.spigotConfig.itemMerge; List list = this.world.a(EntityItem.class, this.getBoundingBox().grow(radius, radius, radius), (entityitem) -> { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0247-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0247-Use-asynchronous-Log4j-2-loggers.patch index 836ddb93ad..b02faf3d51 100644 --- a/Spigot-Server-Patches/0247-Use-asynchronous-Log4j-2-loggers.patch +++ b/Spigot-Server-Patches/0247-Use-asynchronous-Log4j-2-loggers.patch @@ -1,11 +1,11 @@ -From 4500dcbee72101646991a9c0744df65c3e26be18 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 17 Jul 2018 16:42:17 +0200 Subject: [PATCH] Use asynchronous Log4j 2 loggers diff --git a/pom.xml b/pom.xml -index 6fe4eff84b..fd417a9eeb 100644 +index 6fe4eff84b8a4476538bba144ef186d93345e284..fd417a9eeb7a3371ceabc07b49a7406b38b419a3 100644 --- a/pom.xml +++ b/pom.xml @@ -77,6 +77,13 @@ @@ -24,7 +24,7 @@ index 6fe4eff84b..fd417a9eeb 100644 asm diff --git a/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java b/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java new file mode 100644 -index 0000000000..db652a1f7a +index 0000000000000000000000000000000000000000..db652a1f7abc80bc751fd94925abaec58ab1a563 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java @@ -0,0 +1,17 @@ @@ -46,13 +46,10 @@ index 0000000000..db652a1f7a + } +} diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties -index 0694b21465..30efeb5faf 100644 +index 0694b21465fb9e4164e71862ff24b62241b191f2..30efeb5faf8e7faccf1b252fa0ed6a9fc31c40a7 100644 --- a/src/main/resources/log4j2.component.properties +++ b/src/main/resources/log4j2.component.properties @@ -1 +1,3 @@ +Log4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector +log4j2.AsyncQueueFullPolicy="com.destroystokyo.paper.log.LogFullPolicy" log4j.skipJansi=true --- -2.26.2 - diff --git a/Spigot-Server-Patches/0248-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0248-add-more-information-to-Entity.toString.patch index cda00a5ed0..63d88b3b2f 100644 --- a/Spigot-Server-Patches/0248-add-more-information-to-Entity.toString.patch +++ b/Spigot-Server-Patches/0248-add-more-information-to-Entity.toString.patch @@ -1,4 +1,4 @@ -From 6954d351ef3b9659e787f29ab39e2f6853239399 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:13:28 -0400 Subject: [PATCH] add more information to Entity.toString() @@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString() UUID, ticks lived, valid, dead diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 153bfd07fa..2ac396dd17 100644 +index 153bfd07fafec177e3772c9d9531cbea188ea3f7..2ac396dd17e9b91d37685959f4a8e4473682e00f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2503,7 +2503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,6 +18,3 @@ index 153bfd07fa..2ac396dd17 100644 } public boolean isInvulnerable(DamageSource damagesource) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0249-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0249-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index d8c664ad8b..5a156bbcc3 100644 --- a/Spigot-Server-Patches/0249-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/Spigot-Server-Patches/0249-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -1,4 +1,4 @@ -From 6233a75f58064fdd417c5a90bc98a4d4f3f156ef Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 08:25:40 -0400 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues @@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues Add -Ddebug.entities=true to your JVM flags to gain more information diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 2ac396dd17..3043b87cf7 100644 +index 2ac396dd17e9b91d37685959f4a8e4473682e00f..3043b87cf74cd5e27b978464ed3032c68af8a7c0 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -76,6 +76,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -19,7 +19,7 @@ index 2ac396dd17..3043b87cf7 100644 if (bukkitEntity == null) { bukkitEntity = CraftEntity.getEntity(world.getServer(), this); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 7804cc0f6a..4ee26ff08f 100644 +index 7804cc0f6a02d14f4adbe05b37e8470a382c0d26..4ee26ff08f7a058648ab54f0dcd81b466a9aced1 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1064,6 +1064,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -40,7 +40,7 @@ index 7804cc0f6a..4ee26ff08f 100644 protected void g() { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 2f57c7bc76..a1c33c525c 100644 +index 2f57c7bc76ddd8fd4b796d85eaa7200d8da41865..a1c33c525ce8ae0f4736198658174f8d67ab6320 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -63,6 +63,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -52,7 +52,7 @@ index 2f57c7bc76..a1c33c525c 100644 public boolean captureBlockStates = false; public boolean captureTreeGeneration = false; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 25e2a6580a..02d9c754b1 100644 +index 25e2a6580ae72ffa51bf67290992382797b2dd9c..02d9c754b11d37282e93f3a20d354e3010a12744 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -76,6 +76,9 @@ public class WorldServer extends World { @@ -121,6 +121,3 @@ index 25e2a6580a..02d9c754b1 100644 this.getChunkProvider().addEntity(entity); // CraftBukkit start - SPIGOT-5278 if (entity instanceof EntityDrowned) { --- -2.26.0 - diff --git a/Spigot-Server-Patches/0250-EnderDragon-Events.patch b/Spigot-Server-Patches/0250-EnderDragon-Events.patch index e942283dc9..eb756a6109 100644 --- a/Spigot-Server-Patches/0250-EnderDragon-Events.patch +++ b/Spigot-Server-Patches/0250-EnderDragon-Events.patch @@ -1,11 +1,11 @@ -From 5d513504c9182e66b2a643d08822a2aaa8ff3ddb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:51:27 -0500 Subject: [PATCH] EnderDragon Events diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java -index 40a8beff55..18fdcd453a 100644 +index 40a8beff556873a5db108e44fd053e8de80e36a6..18fdcd453af5dc22a5b0e3c41e77e3d3dbb70fea 100644 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java @@ -71,7 +71,11 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded @@ -29,7 +29,7 @@ index 40a8beff55..18fdcd453a 100644 public void e() { if (this.d != null) { diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java -index a2c36548ca..a9d20ee3bb 100644 +index a2c36548caea7c6a0050bb3b18675567a61fb96e..a9d20ee3bbaf4dd77204df9c28a233a0d36cdbd2 100644 --- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java +++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java @@ -68,7 +68,9 @@ public class DragonControllerStrafe extends AbstractDragonController { @@ -43,7 +43,7 @@ index a2c36548ca..a9d20ee3bb 100644 if (this.d != null) { while (!this.d.b()) { diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java -index bc08b53fcd..db43ac1cc4 100644 +index bc08b53fcdd411f15afb939702d68c98ed697479..db43ac1cc4ae959a432eedd3efee891b4e141c7f 100644 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java @@ -41,8 +41,10 @@ public class EntityDragonFireball extends EntityFireball { @@ -57,6 +57,3 @@ index bc08b53fcd..db43ac1cc4 100644 this.die(); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0251-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0251-PlayerElytraBoostEvent.patch index c924743d2c..3a30f49496 100644 --- a/Spigot-Server-Patches/0251-PlayerElytraBoostEvent.patch +++ b/Spigot-Server-Patches/0251-PlayerElytraBoostEvent.patch @@ -1,11 +1,11 @@ -From cdcf8e56e9410a330c4a2d0a3450a4eea7f71914 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:59:59 -0500 Subject: [PATCH] PlayerElytraBoostEvent diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java -index 92dac35ec4..bd524a35bb 100644 +index 92dac35ec4eefe0d5794d8205bc872d23a62e3cb..bd524a35bb11005adfed12f66465fa8466a155f0 100644 --- a/src/main/java/net/minecraft/server/ItemFireworks.java +++ b/src/main/java/net/minecraft/server/ItemFireworks.java @@ -36,11 +36,16 @@ public class ItemFireworks extends Item { @@ -29,6 +29,3 @@ index 92dac35ec4..bd524a35bb 100644 } return InteractionResultWrapper.success(entityhuman.b(enumhand)); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0252-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0252-Speedup-BlockPos-by-fixing-inlining.patch index d3b77c0271..8e6b7e8a97 100644 --- a/Spigot-Server-Patches/0252-Speedup-BlockPos-by-fixing-inlining.patch +++ b/Spigot-Server-Patches/0252-Speedup-BlockPos-by-fixing-inlining.patch @@ -1,4 +1,4 @@ -From 861f8567f99a27430b0a35965cc0d5a7bc0fc382 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 30 Nov 2016 20:56:58 -0600 Subject: [PATCH] Speedup BlockPos by fixing inlining @@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt They had 'callq' (invoke) instead of 'mov' (get from memory) instructions. diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java -index 71089442c1..c439a8d019 100644 +index 71089442c189336fc0061852a661581784a64013..c439a8d0191c8667c881b2111b8c640ca13e5e7c 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -7,25 +7,22 @@ import javax.annotation.concurrent.Immutable; @@ -110,7 +110,7 @@ index 71089442c1..c439a8d019 100644 return (int) (f + f1 + f2); } diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index f8ac39e1b0..0ab2b23440 100644 +index f8ac39e1b019b0918996f745d99f6ed09db0fd11..0ab2b23440346a0faa22ffb4d585662b1120d3f5 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -343,11 +343,13 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -208,6 +208,3 @@ index f8ac39e1b0..0ab2b23440 100644 } @Override --- -2.26.0 - diff --git a/Spigot-Server-Patches/0253-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0253-Optimize-RegistryID.c.patch index 38ea8758b6..7fc1445058 100644 --- a/Spigot-Server-Patches/0253-Optimize-RegistryID.c.patch +++ b/Spigot-Server-Patches/0253-Optimize-RegistryID.c.patch @@ -1,4 +1,4 @@ -From ed9bb678e339838a62820f17c03abc50890b47db Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 23 Jul 2018 13:08:19 -0400 Subject: [PATCH] Optimize RegistryID.c() @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize RegistryID.c() This is a frequent hotspot for world loading/saving. diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java -index e15d286710..e8a48b9a4c 100644 +index e15d286710ed66a01bfb6b60f8735b837efb3fd7..e8a48b9a4c999281869dfb85577c2b44d6e30eb7 100644 --- a/src/main/java/net/minecraft/server/RegistryID.java +++ b/src/main/java/net/minecraft/server/RegistryID.java @@ -14,12 +14,14 @@ public class RegistryID implements Registry { @@ -63,6 +63,3 @@ index e15d286710..e8a48b9a4c 100644 } public int b() { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0254-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0254-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index a349379db4..78de25dbcc 100644 --- a/Spigot-Server-Patches/0254-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0254-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -1,11 +1,11 @@ -From 12b57dbfca613ed14358d59a8e74d8f61816cb5b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 387e0dcb9f01ad947daaa19211331a96742ce004..eaaa51e4bf761f41fd516402ce1ad0f903c6ab71 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,7 +19,7 @@ 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 a1c33c525c..2261c42ab6 100644 +index a1c33c525ce8ae0f4736198658174f8d67ab6320..2261c42ab69e260d3533cdff1149b83acea8ccb4 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -781,6 +781,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -37,6 +37,3 @@ index a1c33c525c..2261c42ab6 100644 public boolean b(AxisAlignedBB axisalignedbb) { int i = MathHelper.floor(axisalignedbb.minX); int j = MathHelper.f(axisalignedbb.maxX); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0255-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0255-Vanished-players-don-t-have-rights.patch index 122830acd0..91cf84f0bf 100644 --- a/Spigot-Server-Patches/0255-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0255-Vanished-players-don-t-have-rights.patch @@ -1,11 +1,11 @@ -From 52f3d0180474b714b74a144bf5fa8984f1825cb0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 3043b87cf7..a0379c6a77 100644 +index 3043b87cf74cd5e27b978464ed3032c68af8a7c0..a0379c6a779a5507993827a1402f2acb02eca658 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 3043b87cf7..a0379c6a77 100644 protected int j; @Nullable diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java -index 278ef79d89..5c3731f68a 100644 +index 278ef79d8962cc5d337e34891c7ea3a606336cbb..5c3731f68a31b73b886b872eba69de483f78a2aa 100644 --- a/src/main/java/net/minecraft/server/EntityFireworks.java +++ b/src/main/java/net/minecraft/server/EntityFireworks.java @@ -110,6 +110,16 @@ public class EntityFireworks extends Entity implements IProjectile { @@ -39,7 +39,7 @@ index 278ef79d89..5c3731f68a 100644 }, RayTrace.BlockCollisionOption.COLLIDER, true); 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 3a1ad2346b4cae833de90dafb716c56e6e2f606d..9ab57be8500bf5106e32671b8d5fb11d8e9b1c60 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 @@ -51,7 +51,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 ab875a7365693264ea8e5002d9d115e16320dbc8..aed353365bfdf1a133997f47cb458edc78af6c8b 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 { @@ -65,7 +65,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 0f64a3c0569a778cd5b8c60f253c77681a83308d..0f95bcbccb96f9d525583f6bb6c0c0ed7fb7561b 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 { @@ -77,7 +77,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 143be566c683ae035997f9a4058381a109f3de23..08c83c62dfe875600162a46a0ca4b835b0bfe199 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 { @@ -97,7 +97,7 @@ 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 2261c42ab6..378ac5ae86 100644 +index 2261c42ab69e260d3533cdff1149b83acea8ccb4..378ac5ae86e337f27975bc7935c4f25fce767eaf 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -152,6 +152,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -148,7 +148,7 @@ index 2261c42ab6..378ac5ae86 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 fc3d9efd84..ee0e371718 100644 +index fc3d9efd84fbe696852216f09500dc4082f49493..ee0e3717186c683a97987181dd869e0a4278b9c1 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1178,6 +1178,14 @@ public class CraftEventFactory { @@ -166,6 +166,3 @@ index fc3d9efd84..ee0e371718 100644 Bukkit.getPluginManager().callEvent(event); return event; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0256-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0256-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch index 942673d896..3f0f778ced 100644 --- a/Spigot-Server-Patches/0256-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch +++ b/Spigot-Server-Patches/0256-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch @@ -1,4 +1,4 @@ -From a82657f16a14fa3516aa95a47b42f9457e7b77e4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 22:18:31 -0400 Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it @@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 87d68a3e21..6a40dddf46 100644 +index 87d68a3e2161798b7496542093f09b2b739ad45b..6a40dddf467d741300b86075577f9af4840b5f06 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -512,6 +512,7 @@ public class Chunk implements IChunkAccess { @@ -25,6 +25,3 @@ index 87d68a3e21..6a40dddf46 100644 // Paper end this.entities.remove(entity); // Paper } --- -2.26.0 - diff --git a/Spigot-Server-Patches/0257-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0257-Add-some-Debug-to-Chunk-Entity-slices.patch index 20a9856f12..ba036c6531 100644 --- a/Spigot-Server-Patches/0257-Add-some-Debug-to-Chunk-Entity-slices.patch +++ b/Spigot-Server-Patches/0257-Add-some-Debug-to-Chunk-Entity-slices.patch @@ -1,4 +1,4 @@ -From 2acf2cef0762f0d88ae7e8c5ef1b17617bec440f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 22:44:23 -0400 Subject: [PATCH] Add some Debug to Chunk Entity slices @@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created if the entity was to end up in 2 different chunk slices diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 6a40dddf46..0afa8a7ebd 100644 +index 6a40dddf467d741300b86075577f9af4840b5f06..0afa8a7ebd8dbdfaac362d66b687e787bc040dee 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -503,6 +503,25 @@ public class Chunk implements IChunkAccess { @@ -58,7 +58,7 @@ index 6a40dddf46..0afa8a7ebd 100644 return; } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index a0379c6a77..838aa7da69 100644 +index a0379c6a779a5507993827a1402f2acb02eca658..838aa7da699e969e9f067cea54e092959aa83143 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -69,6 +69,3 @@ index a0379c6a77..838aa7da69 100644 // Paper end public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper --- -2.26.0 - diff --git a/Spigot-Server-Patches/0258-EntityTransformedEvent.patch b/Spigot-Server-Patches/0258-EntityTransformedEvent.patch index f500a4d6c3..4a815dc9f4 100644 --- a/Spigot-Server-Patches/0258-EntityTransformedEvent.patch +++ b/Spigot-Server-Patches/0258-EntityTransformedEvent.patch @@ -1,11 +1,11 @@ -From 78eacf99ffb6511883c1c669530fb41794c7cd66 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Anthony MacAllister Date: Thu, 26 Jul 2018 15:30:03 -0400 Subject: [PATCH] EntityTransformedEvent diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java -index 19c12728da..3706c31aad 100644 +index 19c12728dac6652f0b11fd62505795531ad5abd2..3706c31aad786237d924a0a3c55151aeebc4bff0 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -116,6 +116,7 @@ public class EntityMushroomCow extends EntityCow { @@ -17,7 +17,7 @@ index 19c12728da..3706c31aad 100644 this.die(); // CraftBukkit - from above diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 6ca4fa43c4..6e0020ae0b 100644 +index 6ca4fa43c41ad555c093b90cf08cfdb1e73fda22..6e0020ae0b4d2f2597843129b83fff0d194de337 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -699,6 +699,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -29,7 +29,7 @@ index 6ca4fa43c4..6e0020ae0b 100644 // CraftBukkit end this.die(); diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 0240cef74a..31aba6bfc3 100644 +index 0240cef74aaa7f9fcfea40106267ee2e8d39f133..31aba6bfc3c196cc0c664c0e139f0f8eb7c804b4 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -257,6 +257,7 @@ public class EntityZombie extends EntityMonster { @@ -49,7 +49,7 @@ index 0240cef74a..31aba6bfc3 100644 this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java -index 91cac5d530..8082fa617a 100644 +index 91cac5d53035d5ba6fca14549bc373bc36347f23..8082fa617a10448ce81b82045e1619311aca2f4b 100644 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java @@ -197,6 +197,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo @@ -60,6 +60,3 @@ index 91cac5d530..8082fa617a 100644 this.die(); // CraftBukkit - from above worldserver.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason // CraftBukkit end --- -2.26.2 - diff --git a/Spigot-Server-Patches/0259-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0259-SkeletonHorse-Additions.patch index 09e0569a60..fae66f94ea 100644 --- a/Spigot-Server-Patches/0259-SkeletonHorse-Additions.patch +++ b/Spigot-Server-Patches/0259-SkeletonHorse-Additions.patch @@ -1,11 +1,11 @@ -From 612535ea01004c39b62d8340215661b87e3e6d5f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 27 Jul 2018 22:36:31 -0500 Subject: [PATCH] SkeletonHorse Additions diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java -index 621f2afee5..290cb9337c 100644 +index 621f2afee599e82806d54de15ff413674523815c..290cb9337c868fa3b9cbef0545886f44a00ef804 100644 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java @@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract { @@ -31,7 +31,7 @@ index 621f2afee5..290cb9337c 100644 if (flag != this.bG) { this.bG = flag; diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java -index dfe5a63583..37626f925f 100644 +index dfe5a63583d8c14c82cc778ee004f2877e43776d..37626f925fb7838e41f7bfab352c9360b3786b4a 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java @@ -15,6 +15,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal { @@ -43,7 +43,7 @@ index dfe5a63583..37626f925f 100644 this.a.r(false); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java -index e822c2200d..2a7d1d4ec2 100644 +index e822c2200d6270ca538eadd9637b748fc3602cb6..2a7d1d4ec2c1ff16840614165c6f0c37dc534d87 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java @@ -26,4 +26,26 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo @@ -73,6 +73,3 @@ index e822c2200d..2a7d1d4ec2 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0260-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0260-Prevent-Saving-Bad-entities-to-chunks.patch index 326522e9f0..c235b717a4 100644 --- a/Spigot-Server-Patches/0260-Prevent-Saving-Bad-entities-to-chunks.patch +++ b/Spigot-Server-Patches/0260-Prevent-Saving-Bad-entities-to-chunks.patch @@ -1,4 +1,4 @@ -From 996595a695e7097c24e2bd7a4b1f9594ecf1b2bf Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 26 Jul 2018 00:11:12 -0400 Subject: [PATCH] Prevent Saving Bad entities to chunks @@ -18,7 +18,7 @@ an invalid entity. This should reduce log occurrences of dupe uuid messages. diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 13d99de2cd..f54572773c 100644 +index 13d99de2cd08de02215031a1f699110c13ef35ff..f54572773c25b6716a68166efa8d3fc8b22b6258 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -300,6 +300,7 @@ public class ChunkRegionLoader { @@ -80,7 +80,7 @@ index 13d99de2cd..f54572773c 100644 public static ChunkStatus.Type a(@Nullable NBTTagCompound nbttagcompound) { if (nbttagcompound != null) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 02d9c754b1..d1424325d5 100644 +index 02d9c754b11d37282e93f3a20d354e3010a12744..d1424325d5efb2f25062341bb57946e9b594813e 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1084,6 +1084,7 @@ public class WorldServer extends World { @@ -117,6 +117,3 @@ index 02d9c754b1..d1424325d5 100644 } --- -2.26.0 - diff --git a/Spigot-Server-Patches/0261-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0261-Don-t-call-getItemMeta-on-hasItemMeta.patch index f262931d1d..2916550284 100644 --- a/Spigot-Server-Patches/0261-Don-t-call-getItemMeta-on-hasItemMeta.patch +++ b/Spigot-Server-Patches/0261-Don-t-call-getItemMeta-on-hasItemMeta.patch @@ -1,4 +1,4 @@ -From 916b1aa792f12be5f67a7b58f8ec26eedfa59a5c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Thu, 26 Jul 2018 14:10:23 +0200 Subject: [PATCH] Don't call getItemMeta on hasItemMeta @@ -11,7 +11,7 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set. Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index a41be8fdae..d5e8a7ee6d 100644 +index a41be8fdaebe7cf61537c638392b3dc7c7f5b371..d5e8a7ee6de22d09e563ad1c124a18810a38a0c5 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -553,7 +553,7 @@ public final class CraftItemStack extends ItemStack { @@ -24,7 +24,7 @@ index a41be8fdae..d5e8a7ee6d 100644 static boolean hasItemMeta(net.minecraft.server.ItemStack item) { diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java -index ba4cc98f1e..3504bcac57 100644 +index ba4cc98f1ec39ccfd433aeadf4b5c7018a1d40cc..3504bcac57f973dc56f991d6006c06fa8de5c64b 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java @@ -2,10 +2,9 @@ package org.bukkit.craftbukkit.inventory; @@ -76,6 +76,3 @@ index ba4cc98f1e..3504bcac57 100644 @Test public void testConflictingStoredEnchantment() { EnchantmentStorageMeta itemMeta = (EnchantmentStorageMeta) Bukkit.getItemFactory().getItemMeta(Material.ENCHANTED_BOOK); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0262-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0262-Ignore-Dead-Entities-in-entityList-iteration.patch index 383b910b8e..6284caf772 100644 --- a/Spigot-Server-Patches/0262-Ignore-Dead-Entities-in-entityList-iteration.patch +++ b/Spigot-Server-Patches/0262-Ignore-Dead-Entities-in-entityList-iteration.patch @@ -1,4 +1,4 @@ -From 8a2267af66d0af048717527cfeaf8af8f031e25c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 28 Jul 2018 12:18:27 -0400 Subject: [PATCH] Ignore Dead Entities in entityList iteration @@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since they shouldn't of been in the list in the first place. diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index b839769cea..5acad8e44f 100644 +index b839769ceae8932bb121a0b96fde1e7d129a1f63..5acad8e44f024d3ddf5ef4fd320460ac516e0fb8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -179,6 +179,7 @@ public class PaperCommand extends Command { @@ -23,7 +23,7 @@ index b839769cea..5acad8e44f 100644 MutablePair> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap())); ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ()); diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 0afa8a7ebd..8e9ddca049 100644 +index 0afa8a7ebd8dbdfaac362d66b687e787bc040dee..8e9ddca049f837ed1c5fc4aa9fd6a6858dbc36be 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -810,6 +810,7 @@ public class Chunk implements IChunkAccess { @@ -51,7 +51,7 @@ index 0afa8a7ebd..8e9ddca049 100644 if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check list.add(t0); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 838aa7da69..35d22ec027 100644 +index 838aa7da699e969e9f067cea54e092959aa83143..35d22ec027952ba90dd27ed61708801b6903c393 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -195,6 +195,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -63,7 +63,7 @@ index 838aa7da69..35d22ec027 100644 public float getBukkitYaw() { return this.yaw; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index d1424325d5..f071b61195 100644 +index d1424325d5efb2f25062341bb57946e9b594813e..f071b61195e6b72ac1d7a8cf7142f8017e153c8f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -908,7 +908,7 @@ public class WorldServer extends World { @@ -92,7 +92,7 @@ index d1424325d5..f071b61195 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index cde999c97f..960e29cb16 100644 +index cde999c97f5a1ccab0d13f02708992fac3876e67..960e29cb16f1b08f522832700c60d25416585cce 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1029,6 +1029,7 @@ public class CraftWorld implements World { @@ -127,6 +127,3 @@ index cde999c97f..960e29cb16 100644 Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity(); if (bukkitEntity == null) { --- -2.26.0 - diff --git a/Spigot-Server-Patches/0263-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0263-Implement-Expanded-ArmorStand-API.patch index c72d2a699b..46045bd250 100644 --- a/Spigot-Server-Patches/0263-Implement-Expanded-ArmorStand-API.patch +++ b/Spigot-Server-Patches/0263-Implement-Expanded-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From ffad3e160f4a75b8038d80aab72ffaa3d6a846f5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Thu, 26 Jul 2018 02:25:46 -0400 Subject: [PATCH] Implement Expanded ArmorStand API @@ -8,7 +8,7 @@ Add the following: - Enable/Disable slot interactions diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 992d7bfb0f..61d7d507aa 100644 +index 992d7bfb0fd26540fbdeaf8d7845e8c2c81d608b..61d7d507aaac3e7e5a885387ae89c67dfb1c9844 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving { @@ -29,7 +29,7 @@ index 992d7bfb0f..61d7d507aa 100644 return (this.bB & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms(); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index 124c3185bc..d1d689e5d7 100644 +index 124c3185bc5c344555f684629c8818130d80ab3d..d1d689e5d78c569313c4059c4652724605dc07d2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { @@ -125,6 +125,3 @@ index 124c3185bc..d1d689e5d7 100644 + } // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0264-AnvilDamageEvent.patch b/Spigot-Server-Patches/0264-AnvilDamageEvent.patch index 39cdbb2a14..80bbc3bcb4 100644 --- a/Spigot-Server-Patches/0264-AnvilDamageEvent.patch +++ b/Spigot-Server-Patches/0264-AnvilDamageEvent.patch @@ -1,11 +1,11 @@ -From 59feed5624f3bb41341e68e212e3b4b0c244c3de Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 20 Jul 2018 23:37:03 -0500 Subject: [PATCH] AnvilDamageEvent diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java -index 1d9ce5ef1c..286b930ddb 100644 +index 1d9ce5ef1cc0158e8218d4cf15bc1e84017e7620..286b930ddb7224fa3929cb0ef0b94f5f5205b104 100644 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java @@ -85,6 +85,16 @@ public class ContainerAnvil extends Container { @@ -25,6 +25,3 @@ index 1d9ce5ef1c..286b930ddb 100644 if (iblockdata1 == null) { world.a(blockposition, false); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0265-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0265-Add-TNTPrimeEvent.patch index 8a27f893e9..10dd1a6d15 100644 --- a/Spigot-Server-Patches/0265-Add-TNTPrimeEvent.patch +++ b/Spigot-Server-Patches/0265-Add-TNTPrimeEvent.patch @@ -1,11 +1,11 @@ -From c43e9d808dadbed0c46f9e99d2a14e78e0512483 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 16 Jul 2018 00:05:05 +0300 Subject: [PATCH] Add TNTPrimeEvent diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java -index d32857c872..b41de95a63 100644 +index d32857c8724f97c7625208cf815c275264179209..b41de95a6390910ba8bb21bfa12ab61c85900218 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -40,7 +40,7 @@ index d32857c872..b41de95a63 100644 } } diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java -index 6cb82420b4..592fcd538a 100644 +index 6cb82420b428fdc7bbcd4f22f1f65ba085a7f3c2..592fcd538a4e25d7779328d6d6cd8efda238b55d 100644 --- a/src/main/java/net/minecraft/server/BlockTNT.java +++ b/src/main/java/net/minecraft/server/BlockTNT.java @@ -1,6 +1,7 @@ @@ -115,7 +115,7 @@ index 6cb82420b4..592fcd538a 100644 world.a(blockposition, false); } diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 138e2ea56a..6a4ccaeb0f 100644 +index 138e2ea56a91e519a34fd3be9c0ab111a4b17544..6a4ccaeb0fef2cabab87b33bf89b5a68608800e9 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock; @@ -138,6 +138,3 @@ index 138e2ea56a..6a4ccaeb0f 100644 nmsBlock.wasExploded(world, blockposition, explosionSource); this.world.a(blockposition, false); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0266-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0266-Break-up-and-make-tab-spam-limits-configurable.patch index a56ae8321a..89837b9d3b 100644 --- a/Spigot-Server-Patches/0266-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/Spigot-Server-Patches/0266-Break-up-and-make-tab-spam-limits-configurable.patch @@ -1,4 +1,4 @@ -From c3e669652ac5495ab913321ca113ae5e4ad23f14 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 29 Jul 2018 05:02:15 +0100 Subject: [PATCH] Break up and make tab spam limits configurable @@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on plugins doing unsafe things. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 26ab855dcf..adef07d4d5 100644 +index 26ab855dcf38446a3d8577108bd16fdbb76126b2..adef07d4d521b4aaa6f3389b04aa27e29bec0229 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -287,4 +287,18 @@ public class PaperConfig { @@ -45,7 +45,7 @@ index 26ab855dcf..adef07d4d5 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8648845acb..6627d8402f 100644 +index 8648845acb054e1e151e5376607e633b4154bbbd..6627d8402f784c16519adaabca967b8e1d365ddc 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -73,6 +73,3 @@ index 8648845acb..6627d8402f 100644 minecraftServer.scheduleOnMain(() -> this.disconnect(new ChatMessage("disconnect.spam", new Object[0]))); // Paper return; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0267-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0267-Add-hand-to-bucket-events.patch index 3ba5392d3e..56cf5fa363 100644 --- a/Spigot-Server-Patches/0267-Add-hand-to-bucket-events.patch +++ b/Spigot-Server-Patches/0267-Add-hand-to-bucket-events.patch @@ -1,11 +1,11 @@ -From b4eb9592ea5b7c2264df87d56bdac711bd8f618f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 2 Aug 2018 08:44:35 -0500 Subject: [PATCH] Add hand to bucket events diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index 6e385b5304..2c8bbf20ae 100644 +index 6e385b53048da91a0f50bf02f6510de2a685baab..2c8bbf20ae7f9be2c57822833bb285b86ea1a901 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -61,7 +61,7 @@ public class EntityCow extends EntityAnimal { @@ -18,7 +18,7 @@ index 6e385b5304..2c8bbf20ae 100644 if (event.isCancelled()) { return false; diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java -index 7c5c049843..ffe4b9eb86 100644 +index 7c5c0498435e3fae6a7997e34f197d402daa3bd8..ffe4b9eb868ecd9582ba1d3fc3aef0f82372e852 100644 --- a/src/main/java/net/minecraft/server/ItemBucket.java +++ b/src/main/java/net/minecraft/server/ItemBucket.java @@ -41,7 +41,7 @@ public class ItemBucket extends Item { @@ -69,7 +69,7 @@ index 7c5c049843..ffe4b9eb86 100644 ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index ee0e371718..5088257e11 100644 +index ee0e3717186c683a97987181dd869e0a4278b9c1..5088257e11cbcd4789c813b7924644920c61e4ed 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -380,6 +380,20 @@ public class CraftEventFactory { @@ -106,6 +106,3 @@ index ee0e371718..5088257e11 100644 ((PlayerBucketEmptyEvent) event).setCancelled(!canBuild(world, player, changed.getX(), changed.getZ())); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0268-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0268-MC-135506-Experience-should-save-as-Integers.patch index b4b7940cb6..7d74291ab1 100644 --- a/Spigot-Server-Patches/0268-MC-135506-Experience-should-save-as-Integers.patch +++ b/Spigot-Server-Patches/0268-MC-135506-Experience-should-save-as-Integers.patch @@ -1,11 +1,11 @@ -From e2543fa243427b97564ef7ad260dc15c2ed49256 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 3 Aug 2018 00:04:54 -0400 Subject: [PATCH] MC-135506: Experience should save as Integers diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index 87c6b77ce3..53c6c33892 100644 +index 87c6b77ce3b1446893a0d617b63f925a403e09cc..53c6c3389216c1fc5c0789b4a1621acb239cc9ec 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -207,7 +207,7 @@ public class EntityExperienceOrb extends Entity { @@ -26,6 +26,3 @@ index 87c6b77ce3..53c6c33892 100644 this.loadPaperNBT(nbttagcompound); // Paper } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0269-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0269-Fix-client-rendering-skulls-from-same-user.patch index a5da06bf5c..03e46ec6a8 100644 --- a/Spigot-Server-Patches/0269-Fix-client-rendering-skulls-from-same-user.patch +++ b/Spigot-Server-Patches/0269-Fix-client-rendering-skulls-from-same-user.patch @@ -1,4 +1,4 @@ -From b87bd6b66ca49509e9f4d499fdd93e3bedfb55e0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Nov 2016 00:40:42 -0500 Subject: [PATCH] Fix client rendering skulls from same user @@ -12,7 +12,7 @@ This allows the client to render multiple skull textures from the same user, for when different skins were used when skull was made. diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 641a52b968..0b0c3c681c 100644 +index 641a52b968ef04a142b32703b61c8b75643b36a6..0b0c3c681c07cf8506df1b91b1feaf130891a440 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -54,7 +54,7 @@ public final class ItemStack { @@ -25,7 +25,7 @@ index 641a52b968..0b0c3c681c 100644 private EntityItemFrame i; private ShapeDetectorBlock j; diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java -index d9574a9ace..93ae6dcd78 100644 +index d9574a9ace96d8c5666e62a5aed96a67021b91d8..93ae6dcd78e9b786b64fadcb9cd016559fb98535 100644 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java @@ -253,6 +253,15 @@ public class PacketDataSerializer extends ByteBuf { @@ -62,7 +62,7 @@ index d9574a9ace..93ae6dcd78 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 3a1d0deb0d..1fcbbd698a 100644 +index 3a1d0deb0dec880d73185690e2a7c769a2731479..1fcbbd698a7e1b9ae3e8b5fa0328b85c43019bea 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -58,6 +58,7 @@ public class PacketPlayOutMapChunk implements Packet { @@ -74,7 +74,7 @@ index 3a1d0deb0d..1fcbbd698a 100644 this.g.add(nbttagcompound); } diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java -index 177cceb77f..0882d82cef 100644 +index 177cceb77f8783fe93ba7e4342de9c589f155c1b..0882d82cef92382cd4639ee7c9858fa5d59b3e5a 100644 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java @@ -142,9 +142,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa @@ -116,6 +116,3 @@ index 177cceb77f..0882d82cef 100644 @Override public NBTTagCompound b() { return this.save(new NBTTagCompound()); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0270-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0270-Add-Early-Warning-Feature-to-WatchDog.patch index dfa7cddb07..501d3869f3 100644 --- a/Spigot-Server-Patches/0270-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/Spigot-Server-Patches/0270-Add-Early-Warning-Feature-to-WatchDog.patch @@ -1,4 +1,4 @@ -From 3f8ca5b1170c7a6d5a7455520ff3896e283aeb94 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 @@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash. This will help diagnose what was going on in that time before the crash. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index adef07d4d5..214b577b32 100644 +index adef07d4d521b4aaa6f3389b04aa27e29bec0229..214b577b326bc794fa3721deb6171228dd4f25e6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -24,6 +24,7 @@ import org.bukkit.configuration.file.YamlConfiguration; @@ -36,7 +36,7 @@ index adef07d4d5..214b577b32 100644 public static int tabSpamLimit = 500; private static void tabSpamLimiters() { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c502aedb8d..056cbdeec8 100644 +index c502aedb8dc4e7a5d7ba9d16a200c20ca3d24cd4..056cbdeec8a1c17de44d59f16b77a995c82a3abb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -870,6 +870,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 10 Aug 2018 22:11:49 -0400 Subject: [PATCH] Make EnderDragon implement Mob diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java -index cc115cc368..4947249da2 100644 +index cc115cc3682a7d16492f35a1ffc231057b5ea375..4947249da2d507163de90f92ff59d9b08213eafd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java @@ -1,17 +1,18 @@ @@ -31,6 +31,3 @@ index cc115cc368..4947249da2 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0272-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0272-Use-ConcurrentHashMap-in-JsonList.patch index 1d8fe30fe2..ad14b62798 100644 --- a/Spigot-Server-Patches/0272-Use-ConcurrentHashMap-in-JsonList.patch +++ b/Spigot-Server-Patches/0272-Use-ConcurrentHashMap-in-JsonList.patch @@ -1,4 +1,4 @@ -From 0edf8b199c7d8b20147ea12884d746bb6211223d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: egg82 Date: Tue, 7 Aug 2018 01:24:23 -0600 Subject: [PATCH] Use ConcurrentHashMap in JsonList @@ -25,7 +25,7 @@ The point of this is readability, but does have a side-benefit of a small microp Finally, added a couple obfhelpers for the modified code diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java -index 734e7ecf63..8570e38f42 100644 +index 734e7ecf630aa13a30d72ff96e57e5d0faf35013..8570e38f42e2f489e2899ac2f0c4a7b8dda3bb75 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java @@ -35,7 +35,8 @@ public class JsonList> { @@ -98,6 +98,3 @@ index 734e7ecf63..8570e38f42 100644 Collection collection = this.d.values(); String s = this.b.toJson(collection); BufferedWriter bufferedwriter = null; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0273-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0273-Use-a-Queue-for-Queueing-Commands.patch index 78e62629eb..bd5a8bbf6f 100644 --- a/Spigot-Server-Patches/0273-Use-a-Queue-for-Queueing-Commands.patch +++ b/Spigot-Server-Patches/0273-Use-a-Queue-for-Queueing-Commands.patch @@ -1,4 +1,4 @@ -From 56312a5df0fc948f356c222101ee31c1988b6c26 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 12 Aug 2018 02:33:39 -0400 Subject: [PATCH] Use a Queue for Queueing Commands @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands Lists are bad as Queues mmmkay. diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index ec257ba31f..349a0ea213 100644 +index ec257ba31f012d3d3576bbff41326df13ede6776..349a0ea213f7f45e927d439985e121e8fa66c041 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -44,7 +44,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -31,6 +31,3 @@ index ec257ba31f..349a0ea213 100644 // CraftBukkit start - ServerCommand for preprocessing ServerCommandEvent event = new ServerCommandEvent(console, servercommand.command); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch index 913e0b2167..d5aa53b9a3 100644 --- a/Spigot-Server-Patches/0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/Spigot-Server-Patches/0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -1,11 +1,11 @@ -From e97f5e8c7eb37ad6d34ffd5ccf217ae7c311d941 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:16:34 -0400 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index a843c66dfa..a53bb7295c 100644 +index a843c66dfa032d041e6df498746a66bd2cb4506e..a53bb7295c5d510f2976ff3787d68857548e11cc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -126,9 +126,16 @@ public class CraftChunk implements Chunk { @@ -34,6 +34,3 @@ index a843c66dfa..a53bb7295c 100644 } return entities; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0275-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0275-Allow-disabling-armour-stand-ticking.patch index 5f39a1a0c7..dca49d7957 100644 --- a/Spigot-Server-Patches/0275-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-Server-Patches/0275-Allow-disabling-armour-stand-ticking.patch @@ -1,11 +1,11 @@ -From 0f694cad7efeeb3e4e5e72988582d3f14410eb01 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 15 Aug 2018 01:26:09 -0700 Subject: [PATCH] Allow disabling armour stand ticking diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index eaaa51e4bf..bc3df01aab 100644 +index eaaa51e4bf761f41fd516402ce1ad0f903c6ab71..bc3df01aab3e79be9c2836820e0eacc69ea6c1f4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -393,4 +393,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index eaaa51e4bf..bc3df01aab 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 61d7d507aa..42b9a339e9 100644 +index 61d7d507aaac3e7e5a885387ae89c67dfb1c9844..42b9a339e9c35db596ec78881c32c801c2d739f4 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -44,6 +44,12 @@ public class EntityArmorStand extends EntityLiving { @@ -142,7 +142,7 @@ index 61d7d507aa..42b9a339e9 100644 public Vector3f r() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index a4051c1f0c..990aea604d 100644 +index a4051c1f0cdcf179e7afe60d301982412da7ed64..990aea604d02db723193722ed692c3a3725f987d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2329,52 +2329,7 @@ public abstract class EntityLiving extends Entity { @@ -256,7 +256,7 @@ index a4051c1f0c..990aea604d 100644 float f2 = MathHelper.g(f - this.aI); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index d1d689e5d7..ac105270d5 100644 +index d1d689e5d78c569313c4059c4652724605dc07d2..ac105270d5c7e2070f52782fc7dbdcd381db33a5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -297,5 +297,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { @@ -276,6 +276,3 @@ index d1d689e5d7..ac105270d5 100644 + } // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0276-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0276-Optimize-BlockPosition-helper-methods.patch index e29a50f3d0..9243e3c54c 100644 --- a/Spigot-Server-Patches/0276-Optimize-BlockPosition-helper-methods.patch +++ b/Spigot-Server-Patches/0276-Optimize-BlockPosition-helper-methods.patch @@ -1,4 +1,4 @@ -From 6a84b31821280f6e8e2fdf3083bd6cc4b6ebf45a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Wed, 15 Aug 2018 12:05:12 -0700 Subject: [PATCH] Optimize BlockPosition helper methods @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods Resolves #1338 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index e9ea232a78..e76528f199 100644 +index 0ab2b23440346a0faa22ffb4d585662b1120d3f5..db7ba12fd4fa4f30b94471f1efbec5426b99a5db 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -134,57 +134,74 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -97,6 +97,3 @@ index e9ea232a78..e76528f199 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0277-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0277-Send-nearby-packets-from-world-player-list-not-serve.patch index 1865c32952..67f95a1751 100644 --- a/Spigot-Server-Patches/0277-Send-nearby-packets-from-world-player-list-not-serve.patch +++ b/Spigot-Server-Patches/0277-Send-nearby-packets-from-world-player-list-not-serve.patch @@ -1,11 +1,11 @@ -From 71d382d6807a653136966f31db2c34266278e24f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 5ae0927c14..6b67201852 100644 +index 5ae0927c14a1915b85c13c13c8cf3e6b3dddfe9d..6b67201852db53fee5e2ee79d41c13f675065f72 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -910,8 +910,25 @@ public abstract class PlayerList { @@ -46,7 +46,7 @@ index 5ae0927c14..6b67201852 100644 double d5 = d1 - entityplayer.locY(); double d6 = d2 - entityplayer.locZ(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index f071b61195..ad779650ed 100644 +index f071b61195e6b72ac1d7a8cf7142f8017e153c8f..ad779650ed73176a88e5f4232df4ffcaf8f2797c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1288,7 +1288,7 @@ public class WorldServer extends World { @@ -68,7 +68,7 @@ index f071b61195..ad779650ed 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 960e29cb16..c7c75a3bfd 100644 +index 960e29cb16f1b08f522832700c60d25416585cce..c7c75a3bfd35ed4a9233e80575a5082660d82d03 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2124,7 +2124,7 @@ public class CraftWorld implements World { @@ -80,6 +80,3 @@ index 960e29cb16..c7c75a3bfd 100644 } private static Map> gamerules; --- -2.26.0 - diff --git a/Spigot-Server-Patches/0278-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0278-Restore-vanlla-default-mob-spawn-range.patch index 0961c77b93..7eda6c8e6e 100644 --- a/Spigot-Server-Patches/0278-Restore-vanlla-default-mob-spawn-range.patch +++ b/Spigot-Server-Patches/0278-Restore-vanlla-default-mob-spawn-range.patch @@ -1,11 +1,11 @@ -From 9545c703849eae9dbe3518a079c92cfd51d1ada1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Aug 2018 12:43:16 -0400 Subject: [PATCH] Restore vanlla default mob-spawn-range diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 3cd66886cd..5e932a5d97 100644 +index 3cd66886cdabfa8bcf1e9c8b5a9805d8b53a2eee..5e932a5d979a7253059e3c29c6ee846ad39214a5 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -165,7 +165,7 @@ public class SpigotWorldConfig @@ -17,6 +17,3 @@ index 3cd66886cd..5e932a5d97 100644 log( "Mob Spawn Range: " + mobSpawnRange ); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0279-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0279-Optimize-CraftBlockData-Creation.patch index 693c3524df..1b80ae6216 100644 --- a/Spigot-Server-Patches/0279-Optimize-CraftBlockData-Creation.patch +++ b/Spigot-Server-Patches/0279-Optimize-CraftBlockData-Creation.patch @@ -1,4 +1,4 @@ -From 8cbae9829bbc9d13db75e6d7c784d574ee0ee748 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: miclebrick Date: Thu, 23 Aug 2018 11:45:32 -0400 Subject: [PATCH] Optimize CraftBlockData Creation @@ -7,7 +7,7 @@ Avoids a hashmap lookup by cacheing a reference to the CraftBlockData and cloning it when one is needed. diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java -index 9ab57be850..c1ff62aa52 100644 +index 9ab57be8500bf5106e32671b8d5fb11d8e9b1c60..c1ff62aa52595decd7ed8278eb63e7c6e46feefe 100644 --- a/src/main/java/net/minecraft/server/IBlockData.java +++ b/src/main/java/net/minecraft/server/IBlockData.java @@ -4,6 +4,8 @@ import com.google.common.collect.ImmutableMap; @@ -36,7 +36,7 @@ index 9ab57be850..c1ff62aa52 100644 return this.getBlock().k(this); } diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java -index 683b17a0c9..a0746a1694 100644 +index 683b17a0c9f09d90c2fc30aad6516b4d01d2f34f..a0746a1694a01996eab44a91b078ba14996f3d13 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java @@ -549,7 +549,17 @@ public class CraftBlockData implements BlockData { @@ -57,6 +57,3 @@ index 683b17a0c9..a0746a1694 100644 return MAP.getOrDefault(data.getBlock().getClass(), CraftBlockData::new).apply(data); } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0280-Fix-MC-124320.patch b/Spigot-Server-Patches/0280-Fix-MC-124320.patch index 16145d5c5d..58b2720629 100644 --- a/Spigot-Server-Patches/0280-Fix-MC-124320.patch +++ b/Spigot-Server-Patches/0280-Fix-MC-124320.patch @@ -1,11 +1,11 @@ -From 008099f78817ef8b4132f086d2415d82ccadf3ea Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 23 Aug 2018 09:25:30 -0500 Subject: [PATCH] Fix MC-124320 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 5f261b9b92..b9b750c369 100644 +index 5f261b9b92de4ca8638f41fa2947016cf590cf05..b9b750c3695699520c736d57cbd88c8d52254c7a 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -170,6 +170,7 @@ public class Block implements IMaterial { @@ -17,7 +17,7 @@ index 5f261b9b92..b9b750c369 100644 IBlockData iblockdata1 = iblockdata; BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition(); diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index b7c67f0cdb..d86f76f30b 100644 +index b7c67f0cdb3d02c7a2dbe85f9a432836cb34bb6e..d86f76f30be54767d0243df716fe743e24db6726 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -354,8 +354,9 @@ public class EntityEnderman extends EntityMonster { @@ -48,6 +48,3 @@ index b7c67f0cdb..d86f76f30b 100644 if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1, blockposition1)) { // CraftBukkit start - Place event --- -2.26.2 - diff --git a/Spigot-Server-Patches/0281-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0281-Slime-Pathfinder-Events.patch index 4e521ec1a6..dac983bd17 100644 --- a/Spigot-Server-Patches/0281-Slime-Pathfinder-Events.patch +++ b/Spigot-Server-Patches/0281-Slime-Pathfinder-Events.patch @@ -1,11 +1,11 @@ -From 4e483e55d7b47ae06a60e823014867bc219efea0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 08:18:42 -0500 Subject: [PATCH] Slime Pathfinder Events diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index 3ecf732192..2efc18df94 100644 +index 3ecf732192f7f1bd20b9d766bedef08e64434fda..2efc18df945bcaa6eba59f561733b9fd6b217d6d 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -3,6 +3,14 @@ package net.minecraft.server; @@ -147,7 +147,7 @@ index 3ecf732192..2efc18df94 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java -index ce6ed6e890..6e9f1b66df 100644 +index ce6ed6e890795ff2840c800a8fd56fdc618b383a..6e9f1b66dfc12491c945f87c51e81aa02424e885 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java @@ -35,4 +35,14 @@ public class CraftSlime extends CraftMob implements Slime { @@ -165,6 +165,3 @@ index ce6ed6e890..6e9f1b66df 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0282-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0282-Configurable-speed-for-water-flowing-over-lava.patch index 36e3249aff..78b5705a11 100644 --- a/Spigot-Server-Patches/0282-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0282-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,11 +1,11 @@ -From 0ac0e7a4cd03455e9c19b06cb18957e9218aac23 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 8 Aug 2018 16:33:21 -0600 Subject: [PATCH] Configurable speed for water flowing over lava diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bc3df01aab..487b0d5cd6 100644 +index bc3df01aab3e79be9c2836820e0eacc69ea6c1f4..487b0d5cd608e84a793eba5fdbd50a9f3d95c79b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -399,4 +399,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index bc3df01aab..487b0d5cd6 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java -index f56e14e1e2..6d351f0979 100644 +index f56e14e1e2fd974e409a324572c2d17e1533da41..6d351f0979ecfa8e500edf8dd03b4a455fd5d180 100644 --- a/src/main/java/net/minecraft/server/BlockFluids.java +++ b/src/main/java/net/minecraft/server/BlockFluids.java @@ -70,11 +70,28 @@ public class BlockFluids extends Block implements IFluidSource { @@ -62,6 +62,3 @@ index f56e14e1e2..6d351f0979 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0283-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0283-Optimize-RegistryMaterials.patch index d10a2a88b3..78841bbe8b 100644 --- a/Spigot-Server-Patches/0283-Optimize-RegistryMaterials.patch +++ b/Spigot-Server-Patches/0283-Optimize-RegistryMaterials.patch @@ -1,4 +1,4 @@ -From 1bf9590e979cd9ffaa3c3a10b3c6f70e7d6b1a4e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Aug 2018 20:49:50 -0400 Subject: [PATCH] Optimize RegistryMaterials @@ -8,7 +8,7 @@ Use larger initial sizes to increase bucket capacity on the BiMap BiMap.get was seen to be using a good bit of CPU time. diff --git a/src/main/java/net/minecraft/server/RegistryMaterials.java b/src/main/java/net/minecraft/server/RegistryMaterials.java -index 2d6a7b3a47..8477febca2 100644 +index 2d6a7b3a47895a32903eaf132eb44820c2623c4c..8477febca23b575da21023b4d7c18bb679cf3b30 100644 --- a/src/main/java/net/minecraft/server/RegistryMaterials.java +++ b/src/main/java/net/minecraft/server/RegistryMaterials.java @@ -16,8 +16,8 @@ import org.apache.logging.log4j.Logger; @@ -30,6 +30,3 @@ index 2d6a7b3a47..8477febca2 100644 + return (T) this.d[random.nextInt(this.d.length)]; // Paper - Decompile fix } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0284-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0284-Add-PhantomPreSpawnEvent.patch index 5bab5af4ad..7598814be8 100644 --- a/Spigot-Server-Patches/0284-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-Server-Patches/0284-Add-PhantomPreSpawnEvent.patch @@ -1,11 +1,11 @@ -From a3271c66f900d1403afb5ae7a4275feb63df5cf0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 25 Aug 2018 19:56:51 -0500 Subject: [PATCH] Add PhantomPreSpawnEvent diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index b62a8227b2..82323bf4ac 100644 +index b62a8227b264b768f6ed5d1ef191b68c604e18a5..82323bf4acc140d279c399cc64fa393a0db90136 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -130,6 +130,11 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -48,7 +48,7 @@ index b62a8227b2..82323bf4ac 100644 private final PathfinderTargetCondition b; diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java -index add566ea4f..f488c22ed6 100644 +index add566ea4f476e0c4750c0f9a1080a99ea74e5d1..f488c22ed64a9fa1ce7746942b2a9ff4bc296703 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java @@ -52,8 +52,17 @@ public class MobSpawnerPhantom { @@ -71,7 +71,7 @@ index add566ea4f..f488c22ed6 100644 groupdataentity = entityphantom.prepare(worldserver, difficultydamagescaler, EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null); worldserver.addEntity(entityphantom, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java -index 9f9ee92390..2b97313694 100644 +index 9f9ee9239037acced498bbebe0ea396473b487ec..2b97313694605171ea4627edde036e3754b5e03b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java @@ -35,4 +35,10 @@ public class CraftPhantom extends CraftFlying implements Phantom { @@ -85,6 +85,3 @@ index 9f9ee92390..2b97313694 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0285-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0285-Add-More-Creeper-API.patch index dc02246f72..018f0f8a28 100644 --- a/Spigot-Server-Patches/0285-Add-More-Creeper-API.patch +++ b/Spigot-Server-Patches/0285-Add-More-Creeper-API.patch @@ -1,11 +1,11 @@ -From a8e48381835873a374f85d757a90c4249a4126fc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 11:50:26 -0500 Subject: [PATCH] Add More Creeper API diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index b895300797..45dfc8104a 100644 +index b89530079751c13894527f21572cc37e3a5548b8..45dfc8104a75f9893c6ee03d507cac80b893249c 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -14,7 +14,7 @@ public class EntityCreeper extends EntityMonster { @@ -38,7 +38,7 @@ index b895300797..45dfc8104a 100644 public boolean canCauseHeadDrop() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java -index 896405148c..075a5e77e2 100644 +index 896405148c489011e4f06c43fe961045b7426377..075a5e77e2c2a873b048b9886d630e71238988da 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java @@ -88,4 +88,18 @@ public class CraftCreeper extends CraftMonster implements Creeper { @@ -60,6 +60,3 @@ index 896405148c..075a5e77e2 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0286-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0286-Inventory-removeItemAnySlot.patch index 35356e1d9e..7abcfeaa9a 100644 --- a/Spigot-Server-Patches/0286-Inventory-removeItemAnySlot.patch +++ b/Spigot-Server-Patches/0286-Inventory-removeItemAnySlot.patch @@ -1,11 +1,11 @@ -From 1f78439a77951b8ff23d7a77ff4a501f191cf5d9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 28 Aug 2018 23:04:15 -0400 Subject: [PATCH] Inventory#removeItemAnySlot diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java -index acc2a57ff2..47827fbf1b 100644 +index acc2a57ff295aa56a0fd47339299489d0617ddc7..47827fbf1b80f88ffff8a252df10d70758c68703 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -223,10 +223,16 @@ public class CraftInventory implements Inventory { @@ -56,6 +56,3 @@ index acc2a57ff2..47827fbf1b 100644 // Drat! we don't have this type in the inventory if (first == -1) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch index d4869e3210..aa492048c1 100644 --- a/Spigot-Server-Patches/0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch +++ b/Spigot-Server-Patches/0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch @@ -1,4 +1,4 @@ -From 2663b1c79466fc46673bfe620d5c97921cc3a668 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 2 Sep 2018 19:34:33 -0700 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted @@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index c7c75a3bfd..68b1382838 100644 +index c7c75a3bfd35ed4a9233e80575a5082660d82d03..68b1382838f187f9bfbd83a3f582631af6218e29 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -501,7 +501,7 @@ public class CraftWorld implements World { @@ -18,6 +18,3 @@ index c7c75a3bfd..68b1382838 100644 // If generate = false, but the chunk already exists, we will get this back. if (chunk instanceof ProtoChunkExtension) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0288-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0288-Add-ray-tracing-methods-to-LivingEntity.patch index f9b6ec36b3..15b47aedd2 100644 --- a/Spigot-Server-Patches/0288-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-Server-Patches/0288-Add-ray-tracing-methods-to-LivingEntity.patch @@ -1,11 +1,11 @@ -From a4b0cab9f42556d2de64c4dda72531f1da7b2704 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 3 Sep 2018 18:20:03 -0500 Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 990aea604d..93625dea9c 100644 +index 990aea604d02db723193722ed692c3a3725f987d..93625dea9ca6a13f311dd5ecc5c0d09060c418c8 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -3257,6 +3257,23 @@ public abstract class EntityLiving extends Entity { @@ -33,7 +33,7 @@ index 990aea604d..93625dea9c 100644 public int getShieldBlockingDelay() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 3a87c6574b..9e082d4514 100644 +index 3a87c6574bbad9e6c2d7573eb447194c931d7ec4..9e082d4514eb57667cb50a390bef7ab72b94e838 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -196,6 +196,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -65,6 +65,3 @@ index 3a87c6574b..9e082d4514 100644 @Override public List getLastTwoTargetBlocks(Set transparent, int maxDistance) { return getLineOfSight(transparent, maxDistance, 2); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0289-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0289-Expose-attack-cooldown-methods-for-Player.patch index 15cba3de7a..29dc008402 100644 --- a/Spigot-Server-Patches/0289-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-Server-Patches/0289-Expose-attack-cooldown-methods-for-Player.patch @@ -1,11 +1,11 @@ -From 859532ba285faede8f69fcc1ab08eb93a3d281f7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 4 Sep 2018 15:02:00 -0500 Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 684978be7c..f41975165a 100644 +index 684978be7ccc401b71b0594828a7783b209a5210..f41975165a6a66479bc8fc1811c1d271bb2a6113 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -2123,14 +2123,17 @@ public abstract class EntityHuman extends EntityLiving { @@ -27,7 +27,7 @@ index 684978be7c..f41975165a 100644 this.aB = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ffbf2b983b..a874ae6758 100644 +index ffbf2b983bb91c873f403b411a05c563feffeebf..a874ae6758e95c782bfb3d931bf8306997aa3a70 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1905,6 +1905,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -51,6 +51,3 @@ index ffbf2b983b..a874ae6758 100644 // Spigot start private final Player.Spigot spigot = new Player.Spigot() { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0290-Improve-death-events.patch b/Spigot-Server-Patches/0290-Improve-death-events.patch index 6f8a95cac5..61549a2c7c 100644 --- a/Spigot-Server-Patches/0290-Improve-death-events.patch +++ b/Spigot-Server-Patches/0290-Improve-death-events.patch @@ -1,4 +1,4 @@ -From 958ec5362357185720cff989ca07db0267a18f81 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:39:35 +0100 Subject: [PATCH] Improve death events @@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using internal code. diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java -index 6daa400d27..38fe29f8a2 100644 +index 6daa400d277bdaa441bf5719a273eacbe64feff9..38fe29f8a290550d1e5fa5451aadaf0f28cc4034 100644 --- a/src/main/java/net/minecraft/server/CombatTracker.java +++ b/src/main/java/net/minecraft/server/CombatTracker.java @@ -175,6 +175,7 @@ public class CombatTracker { @@ -27,7 +27,7 @@ index 6daa400d27..38fe29f8a2 100644 int i = this.f ? 300 : 100; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 35d22ec027..09bb8676c3 100644 +index 35d22ec027952ba90dd27ed61708801b6903c393..09bb8676c3b0b737f7ff483a54ec2f4713ba174c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1503,6 +1503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -47,7 +47,7 @@ index 35d22ec027..09bb8676c3 100644 protected void k(double d0, double d1, double d2) { diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 42b9a339e9..8ad131e4fc 100644 +index 42b9a339e9c35db596ec78881c32c801c2d739f4..8ad131e4fc20efc61b938a5f6ab64379da23bf0d 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -701,7 +701,8 @@ public class EntityArmorStand extends EntityLiving { @@ -61,7 +61,7 @@ index 42b9a339e9..8ad131e4fc 100644 } diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index 2be6c7bde9..82a32d5dbf 100644 +index 2be6c7bde9597d6d6d0c9ad63665b9aa74c74964..82a32d5dbf162b8c67c701d0c9647ddca103ddef 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -571,15 +571,25 @@ public class EntityFox extends EntityAnimal { @@ -94,7 +94,7 @@ index 2be6c7bde9..82a32d5dbf 100644 public static boolean a(EntityFox entityfox, EntityLiving entityliving) { diff --git a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java -index 80717ad9ac..53aac5bccd 100644 +index 80717ad9ac3d45fb2d25fac4fa1b61446aebd453..53aac5bccd2b1a36941a6744bbeece6a2f724cda 100644 --- a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java @@ -55,11 +55,19 @@ public abstract class EntityHorseChestedAbstract extends EntityHorseAbstract { @@ -119,7 +119,7 @@ index 80717ad9ac..53aac5bccd 100644 public void b(NBTTagCompound nbttagcompound) { super.b(nbttagcompound); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 93625dea9c..3d56682719 100644 +index 93625dea9ca6a13f311dd5ecc5c0d09060c418c8..3d5668271954ede03220354985851603669a61d4 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -89,7 +89,7 @@ public abstract class EntityLiving extends Entity { @@ -279,7 +279,7 @@ index 93625dea9c..3d56682719 100644 return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index f35d233406..f43584f0e3 100644 +index f35d23340665ab323732915efc0c0ad7fe4d964d..f43584f0e31a1c3d0e9b4356b7021cd79226d8b5 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -76,6 +76,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -330,7 +330,7 @@ index f35d233406..f43584f0e3 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java -index 90fdf89c81..b761a41dcd 100644 +index 90fdf89c811620d3c26486cd55c8cdb14ce9654c..b761a41dcd899b6556f07d3b835ce7e56da3cfbb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java @@ -821,6 +821,22 @@ public enum CraftSound { @@ -357,7 +357,7 @@ index 90fdf89c81..b761a41dcd 100644 this.minecraftKey = minecraftKey; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a874ae6758..a8f46ceb4b 100644 +index a874ae6758e95c782bfb3d931bf8306997aa3a70..a8f46ceb4b5a545bc4dd8d1e7d9438238f8af93a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1698,7 +1698,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -378,7 +378,7 @@ index a874ae6758..a8f46ceb4b 100644 public void injectScaledMaxHealth(Collection collection, boolean force) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 5088257e11..fcf2b190aa 100644 +index 5088257e11cbcd4789c813b7924644920c61e4ed..fcf2b190aaf7a9b7b4e34102f98e1ba7f428e868 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -756,9 +756,16 @@ public class CraftEventFactory { @@ -446,6 +446,3 @@ index 5088257e11..fcf2b190aa 100644 /** * Server methods */ --- -2.26.2 - diff --git a/Spigot-Server-Patches/0291-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0291-Allow-chests-to-be-placed-with-NBT-data.patch index 7af109b3a8..5f1e4fec78 100644 --- a/Spigot-Server-Patches/0291-Allow-chests-to-be-placed-with-NBT-data.patch +++ b/Spigot-Server-Patches/0291-Allow-chests-to-be-placed-with-NBT-data.patch @@ -1,11 +1,11 @@ -From 3babc1413f1f374fdf51cca4a3ba39d8fddb385b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 8 Sep 2018 18:43:31 -0500 Subject: [PATCH] Allow chests to be placed with NBT data diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 0b0c3c681c..d953cdef14 100644 +index 0b0c3c681c07cf8506df1b91b1feaf130891a440..d953cdef14a9b62833a35a4fe94a22b5e9b19c2d 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -240,6 +240,7 @@ public final class ItemStack { @@ -17,7 +17,7 @@ index 0b0c3c681c..d953cdef14 100644 for (BlockState blockstate : blocks) { blockstate.update(true, false); diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java -index c4766f729f..b22bd06e27 100644 +index c4766f729fed7c9da9e456cae044400e2d08400c..b22bd06e27b3e07f1eb3e729686c394602a0ba5c 100644 --- a/src/main/java/net/minecraft/server/TileEntityChest.java +++ b/src/main/java/net/minecraft/server/TileEntityChest.java @@ -292,7 +292,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic @@ -29,6 +29,3 @@ index c4766f729f..b22bd06e27 100644 } // CraftBukkit end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0292-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0292-Mob-Pathfinding-API.patch index 71c0c6ef8a..3c7a1dc79e 100644 --- a/Spigot-Server-Patches/0292-Mob-Pathfinding-API.patch +++ b/Spigot-Server-Patches/0292-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From 28c0cfc28117c3ceaf82b2b72d256b8571fa9cfb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 13:30:00 -0400 Subject: [PATCH] Mob Pathfinding API @@ -7,7 +7,7 @@ Implements Pathfinding API for mobs diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java new file mode 100644 -index 0000000000..f68a07cb96 +index 0000000000000000000000000000000000000000..f68a07cb9636787f5ae337d8a2ba9798eaa645a5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java @@ -0,0 +1,111 @@ @@ -123,7 +123,7 @@ index 0000000000..f68a07cb96 + } +} diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index bdd092e49d..f06764973f 100644 +index bdd092e49da13960cd8a65e989a351d65cb620f7..f06764973feaa29ccbb4731b65372c544dcf3032 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -80,7 +80,7 @@ public abstract class NavigationAbstract { @@ -170,7 +170,7 @@ index bdd092e49d..f06764973f 100644 this.c = null; } diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java -index 312352ef84..dcb4e25080 100644 +index 312352ef848e20c210b1d32e3c362f94d78e2cca..dcb4e250803b8605f9bfb6d590c4e316dfee97d1 100644 --- a/src/main/java/net/minecraft/server/PathEntity.java +++ b/src/main/java/net/minecraft/server/PathEntity.java @@ -5,13 +5,14 @@ import javax.annotation.Nullable; @@ -210,7 +210,7 @@ index 312352ef84..dcb4e25080 100644 return new Vec3D((double) pathpoint.a, (double) pathpoint.b, (double) pathpoint.c); diff --git a/src/main/java/net/minecraft/server/PathPoint.java b/src/main/java/net/minecraft/server/PathPoint.java -index b1db95daa9..18cdd2a6f2 100644 +index b1db95daa976f61da07a37ec1787ef49785e016a..18cdd2a6f290bf1f00db58efdb9a42f81c8e109b 100644 --- a/src/main/java/net/minecraft/server/PathPoint.java +++ b/src/main/java/net/minecraft/server/PathPoint.java @@ -2,9 +2,9 @@ package net.minecraft.server; @@ -227,7 +227,7 @@ index b1db95daa9..18cdd2a6f2 100644 public int d = -1; public float e; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index 90e63fbf29..c89bc7024b 100644 +index 90e63fbf292488732434ed9cf20645d8306eb21d..c89bc7024b650c3b6d2c551f0e4e156975570cca 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable; @@ -242,6 +242,3 @@ index 90e63fbf29..c89bc7024b 100644 @Override public void setTarget(LivingEntity target) { EntityInsentient entity = getHandle(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0293-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0293-Prevent-chunk-loading-from-Fluid-Flowing.patch index 55aefec33b..6aad0026a5 100644 --- a/Spigot-Server-Patches/0293-Prevent-chunk-loading-from-Fluid-Flowing.patch +++ b/Spigot-Server-Patches/0293-Prevent-chunk-loading-from-Fluid-Flowing.patch @@ -1,11 +1,11 @@ -From e9127720820334c5b2393932c09d747b142017d7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 10 Sep 2018 23:36:16 -0400 Subject: [PATCH] Prevent chunk loading from Fluid Flowing diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java -index 3099a5e654..376dca1889 100644 +index 3099a5e654d343fba1a61d6be3477df0866feb47..376dca1889f1eca4ce9993e0e067a94eb293103d 100644 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java @@ -178,7 +178,8 @@ public abstract class FluidTypeFlowing extends FluidType { @@ -73,6 +73,3 @@ index 3099a5e654..376dca1889 100644 IBlockData iblockdata1 = (IBlockData) pair.getFirst(); Fluid fluid = (Fluid) pair.getSecond(); Fluid fluid1 = this.a(iworldreader, blockposition1, iblockdata1); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0294-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0294-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch index 8b26091ba2..7bf94467f2 100644 --- a/Spigot-Server-Patches/0294-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch +++ b/Spigot-Server-Patches/0294-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch @@ -1,11 +1,11 @@ -From 1cc34abf686a0145ad4ba15f66f5d090e7e163ab Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 12 Sep 2018 18:53:55 +0300 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values diff --git a/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java -index 005ebec266..97d85f8451 100644 +index 005ebec266032dd873cc2e7d8919d9bd018457f7..97d85f8451a7a6cd17ac272492da52c55161789d 100644 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java @@ -43,7 +43,7 @@ public class ArgumentBlock { @@ -32,7 +32,7 @@ index 005ebec266..97d85f8451 100644 this.s = this::l; if (this.i.canRead() && this.i.peek() == '#') { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 15d27001e8..c28ea1cef0 100644 +index 15d27001e8d574e5a4b2bd808e3d17e0cb823f6c..c28ea1cef0620ba2956139c074fead3c2da2e5cb 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -87,6 +87,12 @@ import org.bukkit.persistence.PersistentDataContainer; @@ -431,6 +431,3 @@ index 15d27001e8..c28ea1cef0 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch index 215be6f71d..175b21d02a 100644 --- a/Spigot-Server-Patches/0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch +++ b/Spigot-Server-Patches/0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch @@ -1,11 +1,11 @@ -From 76dd4b39097e8ea2c9c1de56ae047c199aa66326 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 10 Sep 2018 23:56:36 -0400 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java -index bf8ca9b32a..7ccb3d5c06 100644 +index bf8ca9b32aa8d7d797c430cbb98466ae9dcf738f..7ccb3d5c065d39b3a859d87a8462b6542fe40f3b 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java @@ -12,11 +12,13 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget { @@ -52,7 +52,7 @@ index bf8ca9b32a..7ccb3d5c06 100644 return ichunkaccess == null ? false : ichunkaccess.getType(blockposition).getBlock() == this.g && ichunkaccess.getType(blockposition.up()).isAir() && ichunkaccess.getType(blockposition.up(2)).isAir(); } diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java -index d4cd50918b..d6a3b99339 100644 +index d4cd50918b63e4ff503536fabb9d60b880473d23..d6a3b993394b34ddebc55a952d09df490884558d 100644 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java @@ -109,6 +109,7 @@ public class RandomPositionGenerator { @@ -73,6 +73,3 @@ index d4cd50918b..d6a3b99339 100644 PathType pathtype = PathfinderNormal.b(entitycreature.world, blockposition2.getX(), blockposition2.getY(), blockposition2.getZ()); if (entitycreature.a(pathtype) == 0.0F) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0296-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0296-Prevent-mob-spawning-from-loading-generating-chunks.patch index dacb2cea22..249b8e6f6b 100644 --- a/Spigot-Server-Patches/0296-Prevent-mob-spawning-from-loading-generating-chunks.patch +++ b/Spigot-Server-Patches/0296-Prevent-mob-spawning-from-loading-generating-chunks.patch @@ -1,4 +1,4 @@ -From e2cdd19fc08c9ffb3c7001f3efe988e118109354 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 12 Sep 2018 21:12:57 -0400 Subject: [PATCH] Prevent mob spawning from loading/generating chunks @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks also prevents if out of world border bounds diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 224443e03c..fdac5bb3a2 100644 +index 224443e03c9e55af2744eebd7e754e2a1b3fa296..fdac5bb3a2d4a73035e1d914979b87fc224b6b20 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -25,9 +25,9 @@ public final class SpawnerCreature { @@ -30,6 +30,3 @@ index 224443e03c..fdac5bb3a2 100644 ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(blockposition_mutableblockposition); if (Objects.equals(chunkcoordintpair, chunk.getPos()) || worldserver.getChunkProvider().a(chunkcoordintpair)) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0297-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0297-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch index e974204c02..c7ccaeee33 100644 --- a/Spigot-Server-Patches/0297-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch +++ b/Spigot-Server-Patches/0297-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch @@ -1,4 +1,4 @@ -From 07cbb0a4da29351f0dba28bba6dfd56af972c9cd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 12 Sep 2018 21:47:01 -0400 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning Uses an EnumMap as well as a Set paired List for O(1) contains calls. diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java -index 253890e537..0102a170dc 100644 +index 253890e53702f9ba1c6628cc860a4ca10756626a..0102a170dc333fb4af01efa0aaa66df85271f1e0 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java @@ -40,7 +40,7 @@ public abstract class BiomeBase { @@ -66,6 +66,3 @@ index 253890e537..0102a170dc 100644 public static class a { @Nullable --- -2.26.2 - diff --git a/Spigot-Server-Patches/0298-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0298-Implement-furnace-cook-speed-multiplier-API.patch index f0763e17da..a2cb14df35 100644 --- a/Spigot-Server-Patches/0298-Implement-furnace-cook-speed-multiplier-API.patch +++ b/Spigot-Server-Patches/0298-Implement-furnace-cook-speed-multiplier-API.patch @@ -1,4 +1,4 @@ -From 26c641106bb9ee581b0da825ccf065ce1795077d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tassu Date: Thu, 13 Sep 2018 08:45:21 +0300 Subject: [PATCH] Implement furnace cook speed multiplier API @@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API Signed-off-by: Tassu diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index 560e2f42b7..d5432bfeb7 100644 +index 560e2f42b702c5c4870640ad7da3aa48c3f4b1eb..d5432bfeb727baadd8614384d3e50314de5f8dc4 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -8,6 +8,7 @@ import java.util.Map; @@ -57,7 +57,7 @@ index 560e2f42b7..d5432bfeb7 100644 this.cookTimeTotal = this.getRecipeCookingTime(); this.burn(irecipe); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java -index 9cc67915ca..1ce10ea049 100644 +index 9cc67915cacf2920334bc9affede84c786e7172f..1ce10ea049ec86a61bc6179c8606193bc21a7a3f 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java @@ -63,4 +63,18 @@ public class CraftFurnace extends CraftContainer @@ -79,6 +79,3 @@ index 9cc67915ca..1ce10ea049 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0299-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0299-Support-Overriding-World-Seeds.patch index e60644b3c2..5c5d606da4 100644 --- a/Spigot-Server-Patches/0299-Support-Overriding-World-Seeds.patch +++ b/Spigot-Server-Patches/0299-Support-Overriding-World-Seeds.patch @@ -1,4 +1,4 @@ -From 931ba2eb4a1ff18a65fa4918ad652d8e62ae1925 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Sep 2018 23:05:31 -0400 Subject: [PATCH] Support Overriding World Seeds @@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is a permanent change in that it won't go back if you remove it from paper.yml diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 214b577b32..559e6b42ba 100644 +index 214b577b326bc794fa3721deb6171228dd4f25e6..559e6b42ba5bf0ea92cccbabd2ef1d4c27b03064 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -11,6 +11,7 @@ import java.lang.reflect.Modifier; @@ -59,7 +59,7 @@ index 214b577b32..559e6b42ba 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 056cbdeec8..ec4ce59c5e 100644 +index 056cbdeec8a1c17de44d59f16b77a995c82a3abb..ec4ce59c5e29b68d96856a9086fe2ba1bdbb1df1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -378,7 +378,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 17 Sep 2018 23:37:31 -0400 Subject: [PATCH] Optimize Server World Map @@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java new file mode 100644 -index 0000000000..6bb2f98b45 +index 0000000000000000000000000000000000000000..6bb2f98b4574bff7ac50ed44833726544f2c6011 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java @@ -0,0 +1,191 @@ @@ -217,7 +217,7 @@ index 0000000000..6bb2f98b45 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ec4ce59c5e..c97bbe933d 100644 +index ec4ce59c5e29b68d96856a9086fe2ba1bdbb1df1..c97bbe933dd05829d9da7bc71d03d2c0a26a4ad1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -88,7 +88,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Tue, 18 Sep 2018 23:53:23 +0100 Subject: [PATCH] PreSpawnerSpawnEvent @@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for spawners. diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 43c491f71b..cb7cb789b8 100644 +index 43c491f71b7739c782b46ee77ff8debe44213f11..cb7cb789b82461093fbbb4c8ae6d03fcbfe57383 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -111,11 +111,11 @@ public abstract class MobSpawnerAbstract { @@ -27,6 +27,3 @@ index 43c491f71b..cb7cb789b8 100644 ); if (!event.callEvent()) { flag = true; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0302-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0302-Catch-JsonParseException-in-Entity-and-TE-names.patch index 4bb3d27c1f..e1eb26aee3 100644 --- a/Spigot-Server-Patches/0302-Catch-JsonParseException-in-Entity-and-TE-names.patch +++ b/Spigot-Server-Patches/0302-Catch-JsonParseException-in-Entity-and-TE-names.patch @@ -1,4 +1,4 @@ -From 8c71da1c2ec85763d440f6203c47a63d47524c9a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 22 Sep 2018 15:56:59 -0400 Subject: [PATCH] Catch JsonParseException in Entity and TE names @@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly No more crashing though. diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java -index 7867122974..ef2a496eda 100644 +index 786712297435fed5247abd577efd092bcb9c44cb..ef2a496eda45ae5ee8fe52ef09e77c2906069d2e 100644 --- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java +++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java @@ -59,7 +59,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener { @@ -26,7 +26,7 @@ index 7867122974..ef2a496eda 100644 if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 09bb8676c3..8d3140871f 100644 +index 09bb8676c3b0b737f7ff483a54ec2f4713ba174c..8d3140871fd750bbb5d7c7f920917ae356890aeb 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1679,7 +1679,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -39,7 +39,7 @@ index 09bb8676c3..8d3140871f 100644 this.setCustomNameVisible(nbttagcompound.getBoolean("CustomNameVisible")); diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 9d0b0c9fc3..3342278bcd 100644 +index 9d0b0c9fc3c9e5e73506a43d7195b139cbcb30cf..3342278bcd42a6d5a1793e33bc7fe4356be02451 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -437,4 +437,19 @@ public final class MCUtil { @@ -63,7 +63,7 @@ index 9d0b0c9fc3..3342278bcd 100644 + } } diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java -index 93911a8251..d35604edb2 100644 +index 93911a825154d04dd3f1495b1bab5a3ab2aea30b..d35604edb21441032bce87d658b76b39fea917fc 100644 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java @@ -60,7 +60,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity { @@ -76,7 +76,7 @@ index 93911a8251..d35604edb2 100644 if (this.hasWorld()) { diff --git a/src/main/java/net/minecraft/server/TileEntityContainer.java b/src/main/java/net/minecraft/server/TileEntityContainer.java -index 473ec2cbde..ab6b86e4e9 100644 +index 473ec2cbde5b31398f57bf9ab7034139572fa666..ab6b86e4e9f99a60140187c06480cf511327a710 100644 --- a/src/main/java/net/minecraft/server/TileEntityContainer.java +++ b/src/main/java/net/minecraft/server/TileEntityContainer.java @@ -17,7 +17,7 @@ public abstract class TileEntityContainer extends TileEntity implements IInvento @@ -88,6 +88,3 @@ index 473ec2cbde..ab6b86e4e9 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0303-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0303-Avoid-dimension-id-collisions.patch index 48d7c247b5..1c32c41eb7 100644 --- a/Spigot-Server-Patches/0303-Avoid-dimension-id-collisions.patch +++ b/Spigot-Server-Patches/0303-Avoid-dimension-id-collisions.patch @@ -1,4 +1,4 @@ -From 2e8eb9ce52805d60b6e93d8420e6e0c1d46f3ba7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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,7 +8,7 @@ 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 011d0927da..3c43f318c4 100644 +index 011d0927da7a2a67dcd6d75e3af07d38f30acf81..3c43f318c4cff914128e2f7060516ce7ebb6e1c9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1002,7 +1002,7 @@ public final class CraftServer implements Server { @@ -20,6 +20,3 @@ index 011d0927da..3c43f318c4 100644 if (used) { dimension++; break; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0304-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0304-Honor-EntityAgeable.ageLock.patch index a1ce2f9f23..85785a67e9 100644 --- a/Spigot-Server-Patches/0304-Honor-EntityAgeable.ageLock.patch +++ b/Spigot-Server-Patches/0304-Honor-EntityAgeable.ageLock.patch @@ -1,11 +1,11 @@ -From e751b2c78be84acb0f93003c3b6b58b95d36d847 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 23 Sep 2018 20:59:53 -0500 Subject: [PATCH] Honor EntityAgeable.ageLock diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java -index cec938436d..3d27f0964a 100644 +index cec938436d2fb4ba9cafa57af7b447b2a0df0f9f..3d27f0964a5808af5fd6d1519c91071e50bc239d 100644 --- a/src/main/java/net/minecraft/server/EntityAgeable.java +++ b/src/main/java/net/minecraft/server/EntityAgeable.java @@ -101,6 +101,7 @@ public abstract class EntityAgeable extends EntityCreature { @@ -16,6 +16,3 @@ index cec938436d..3d27f0964a 100644 int j = this.getAge(); int k = j; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0305-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0305-Configurable-connection-throttle-kick-message.patch index c159747512..2537b2ac2d 100644 --- a/Spigot-Server-Patches/0305-Configurable-connection-throttle-kick-message.patch +++ b/Spigot-Server-Patches/0305-Configurable-connection-throttle-kick-message.patch @@ -1,11 +1,11 @@ -From 2cb571fbec4d4eb265905318ef52688402ac7dae Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 2 Oct 2018 09:57:50 +0100 Subject: [PATCH] Configurable connection throttle kick message diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 559e6b42ba..092bff78ab 100644 +index 559e6b42ba5bf0ea92cccbabd2ef1d4c27b03064..092bff78ab5288ede0cdeaa94a59190b79aea239 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -274,6 +274,11 @@ public class PaperConfig { @@ -21,7 +21,7 @@ index 559e6b42ba..092bff78ab 100644 private static void savePlayerData() { savePlayerData = getBoolean("settings.save-player-data", savePlayerData); diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 8928d93e49..0532f975b7 100644 +index 8928d93e49bec174e86a2b451ac40f3946193009..0532f975b7af5b3f2916c26141221cd3701765d0 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -38,7 +38,7 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -33,6 +33,3 @@ index 8928d93e49..0532f975b7 100644 this.b.sendPacket(new PacketLoginOutDisconnect(chatmessage)); this.b.close(chatmessage); return; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0306-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0306-Hook-into-CB-plugin-rewrites.patch index 8cc89fdcc9..bfe7f24d40 100644 --- a/Spigot-Server-Patches/0306-Hook-into-CB-plugin-rewrites.patch +++ b/Spigot-Server-Patches/0306-Hook-into-CB-plugin-rewrites.patch @@ -1,4 +1,4 @@ -From 0de5fb76ae2419f13e122b84c9732b8f19c6604d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 3 Oct 2018 20:09:18 -0400 Subject: [PATCH] Hook into CB plugin rewrites @@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're debugging in an IDE pre-relocate. diff --git a/pom.xml b/pom.xml -index fd417a9eeb..bc8438ae1a 100644 +index fd417a9eeb7a3371ceabc07b49a7406b38b419a3..bc8438ae1ae939be4d2257d37df9a843a13ac301 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ @@ -21,7 +21,7 @@ index fd417a9eeb..bc8438ae1a 100644 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index 9b4a0f0678..4ae41fd255 100644 +index 9b4a0f0678a7e8e347ef062ad15562484a74452b..4ae41fd2557dcc2a8e31d39ed978b2b26093dd06 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java @@ -6,7 +6,9 @@ import java.io.FileOutputStream; @@ -202,6 +202,3 @@ index 9b4a0f0678..4ae41fd255 100644 if ( modern ) { if ( owner.equals( "org/bukkit/Material" ) ) --- -2.26.2 - diff --git a/Spigot-Server-Patches/0307-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0307-Allow-setting-the-vex-s-summoner.patch index 5da609a8b2..48073d132f 100644 --- a/Spigot-Server-Patches/0307-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-Server-Patches/0307-Allow-setting-the-vex-s-summoner.patch @@ -1,11 +1,11 @@ -From a913394f33682be1c271f6f27d3adc87a3ac6ee6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 21:47:44 -0500 Subject: [PATCH] Allow setting the vex's summoner diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index a46730460e..cf274666c7 100644 +index a46730460e5d9f6e52d63ba1950d1e7195fe87cd..cf274666c70695ef597b2f5651c18c60702c2dc1 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -133,6 +133,7 @@ public class EntityVex extends EntityMonster { @@ -17,7 +17,7 @@ index a46730460e..cf274666c7 100644 this.c = entityinsentient; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java -index 169c951ec3..2f7df3074f 100644 +index 169c951ec30fc5b78eb4ba29352ba009b7fa5efd..2f7df3074f8fd66fe2ea1cced08db910078e1848 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java @@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex { @@ -31,6 +31,3 @@ index 169c951ec3..2f7df3074f 100644 // Paper end @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0308-Add-sun-related-API.patch b/Spigot-Server-Patches/0308-Add-sun-related-API.patch index 3d6bd5edd3..f18305a2bc 100644 --- a/Spigot-Server-Patches/0308-Add-sun-related-API.patch +++ b/Spigot-Server-Patches/0308-Add-sun-related-API.patch @@ -1,11 +1,11 @@ -From 1fabbbe82e93caaac0537f11d08c90fa2bd4446b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:21 -0500 Subject: [PATCH] Add sun related API diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index b5816dc89e..bed15873b6 100644 +index b5816dc89ede5f5f1780d3086d9b1a41fba2b19d..bed15873b675bbd05c0149d655f9fb165bbbc73e 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1341,6 +1341,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -17,7 +17,7 @@ index b5816dc89e..bed15873b6 100644 if (this.world.isDay() && !this.world.isClientSide) { float f = this.aI(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 68b1382838..db31b17b87 100644 +index 68b1382838f187f9bfbd83a3f582631af6218e29..db31b17b87084c47402f5452872f385629c58382 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -860,6 +860,13 @@ public class CraftWorld implements World { @@ -35,7 +35,7 @@ index 68b1382838..db31b17b87 100644 public boolean createExplosion(double x, double y, double z, float power) { return createExplosion(x, y, z, power, false, true); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index c89bc7024b..eaad222fd3 100644 +index c89bc7024b650c3b6d2c551f0e4e156975570cca..eaad222fd38a4db4074db04c931bcff7a9ca5e24 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -78,4 +78,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { @@ -50,6 +50,3 @@ index c89bc7024b..eaad222fd3 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0309-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0309-Check-Drowned-for-Villager-Aggression-Config.patch index 55b09dc837..ccfa4c8ed2 100644 --- a/Spigot-Server-Patches/0309-Check-Drowned-for-Villager-Aggression-Config.patch +++ b/Spigot-Server-Patches/0309-Check-Drowned-for-Villager-Aggression-Config.patch @@ -1,11 +1,11 @@ -From f1440d0aa565de2d6ebe2f44a1a8fe985911cea3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 10 Oct 2018 21:22:44 -0500 Subject: [PATCH] Check Drowned for Villager Aggression Config diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 70c06ca775..77885f67ff 100644 +index 70c06ca775a6955459f36b36dbb48ad3cd1bdef0..77885f67ffa907f7b6dced5d0040d9a9a73454f4 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -29,7 +29,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { @@ -17,6 +17,3 @@ index 70c06ca775..77885f67ff 100644 this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true)); this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bw)); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0310-Here-s-Johnny.patch b/Spigot-Server-Patches/0310-Here-s-Johnny.patch index 6581fcd8c0..f608a431f2 100644 --- a/Spigot-Server-Patches/0310-Here-s-Johnny.patch +++ b/Spigot-Server-Patches/0310-Here-s-Johnny.patch @@ -1,11 +1,11 @@ -From 305a2f3389056f221a0609f93a40a295651149b1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 01:37:22 -0500 Subject: [PATCH] Here's Johnny! diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java -index 73ecdd22ea..c974c02e92 100644 +index 73ecdd22ea1157abe00795d90c3e7b748650dbc8..c974c02e92345fdc43f4acc9b02d40c735b677df 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java +++ b/src/main/java/net/minecraft/server/EntityVindicator.java @@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract { @@ -18,7 +18,7 @@ index 73ecdd22ea..c974c02e92 100644 public EntityVindicator(EntityTypes entitytypes, World world) { super(entitytypes, world); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java -index 951d479298..5ff957ced7 100644 +index 951d47929893fce38183b81cf4ec6a7d4204acd1..5ff957ced7a86f4fa3a0751b4eed5a6fdc525da4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java @@ -25,4 +25,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator { @@ -36,6 +36,3 @@ index 951d479298..5ff957ced7 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0311-Turtle-API.patch b/Spigot-Server-Patches/0311-Turtle-API.patch index 2336396f4c..96bf18cff1 100644 --- a/Spigot-Server-Patches/0311-Turtle-API.patch +++ b/Spigot-Server-Patches/0311-Turtle-API.patch @@ -1,11 +1,11 @@ -From cec55ad267260fe7ca85b88fb2c215d58fa99a5d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 29 Sep 2018 16:08:23 -0500 Subject: [PATCH] Turtle API diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index 76296119a1..dd02cb3485 100644 +index 76296119a197a433747ee2481079b36aebdb085c..dd02cb3485021c3afd23c2985a71e93c6b0ab07d 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal { @@ -103,7 +103,7 @@ index 76296119a1..dd02cb3485 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java -index 123a2c75ca..8edcf7af65 100644 +index 123a2c75cad410d079cfb23223ab509e4b4c63f7..8edcf7af65ec8790fe946020a8f74932b4436d16 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java @@ -1,6 +1,8 @@ @@ -152,6 +152,3 @@ index 123a2c75ca..8edcf7af65 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0312-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0312-Limit-lightning-strike-effect-distance.patch index bf4c3e6bf1..d74958aec2 100644 --- a/Spigot-Server-Patches/0312-Limit-lightning-strike-effect-distance.patch +++ b/Spigot-Server-Patches/0312-Limit-lightning-strike-effect-distance.patch @@ -1,11 +1,11 @@ -From 375dc89e8d706626d0409772f1dd7f6de2c63752 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Trigary Date: Fri, 14 Sep 2018 17:42:08 +0200 Subject: [PATCH] Limit lightning strike effect distance diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 487b0d5cd6..b8789c8ecc 100644 +index 487b0d5cd608e84a793eba5fdbd50a9f3d95c79b..b8789c8ecc5a6e4117bb7ce0d5487a6e5774b67f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -242,6 +242,28 @@ public class PaperWorldConfig { @@ -38,7 +38,7 @@ index 487b0d5cd6..b8789c8ecc 100644 private void fixedInhabitedTime() { if (PaperConfig.version < 16) { diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java -index 7c518983a9..bdb534deb4 100644 +index 7c518983a9c21a9b221e1fa1b0baa3d5c9ccadbf..bdb534deb47a945d5cbfad688eeab5e3388a4df5 100644 --- a/src/main/java/net/minecraft/server/EntityLightning.java +++ b/src/main/java/net/minecraft/server/EntityLightning.java @@ -64,6 +64,17 @@ public class EntityLightning extends Entity { @@ -69,7 +69,7 @@ index 7c518983a9..bdb534deb4 100644 --this.lifeTicks; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ad779650ed..a75034079b 100644 +index ad779650ed73176a88e5f4232df4ffcaf8f2797c..a75034079b0f5a06509f9762593c5e805e35881c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1288,7 +1288,7 @@ public class WorldServer extends World { @@ -81,6 +81,3 @@ index ad779650ed..a75034079b 100644 } @Override --- -2.26.0 - diff --git a/Spigot-Server-Patches/0313-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0313-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch index c79d8550d1..675f3fc9c3 100644 --- a/Spigot-Server-Patches/0313-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch +++ b/Spigot-Server-Patches/0313-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch @@ -1,4 +1,4 @@ -From 7767959c5febf3b454e6d10f0f31dc318ae20a75 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 17 Oct 2018 19:17:27 -0400 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles @@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check other worlds. diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java -index 9eed1dce3e..6c091b6808 100644 +index 9eed1dce3e48683b751ebbaac0487a046354622e..6c091b68087d60b0b916871eb0ce06c6a2776bf8 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -209,6 +209,16 @@ public abstract class EntityProjectile extends Entity implements IProjectile { @@ -31,6 +31,3 @@ index 9eed1dce3e..6c091b6808 100644 if (entity instanceof EntityLiving) { this.shooter = (EntityLiving) entity; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0314-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0314-Call-player-spectator-target-events.patch index 28d61a799d..5b74c57ab8 100644 --- a/Spigot-Server-Patches/0314-Call-player-spectator-target-events.patch +++ b/Spigot-Server-Patches/0314-Call-player-spectator-target-events.patch @@ -1,11 +1,11 @@ -From f6a5881c8abe81101299f583c2b21405df79d57a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:32:19 -0500 Subject: [PATCH] Call player spectator target events diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index f43584f0e3..bc62a9f08e 100644 +index f43584f0e31a1c3d0e9b4356b7021cd79226d8b5..bc62a9f08e9eb39dc20a69f397bc74eab13031a9 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -61,7 +61,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -66,6 +66,3 @@ index f43584f0e3..bc62a9f08e 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0315-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0315-Add-Velocity-IP-Forwarding-Support.patch index 9deaba887e..251e6398c4 100644 --- a/Spigot-Server-Patches/0315-Add-Velocity-IP-Forwarding-Support.patch +++ b/Spigot-Server-Patches/0315-Add-Velocity-IP-Forwarding-Support.patch @@ -1,4 +1,4 @@ -From 267ec2b859008af363a6f61dd9e24c9e9517864d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 8 Oct 2018 14:36:14 -0400 Subject: [PATCH] Add Velocity IP Forwarding Support @@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13 login plugin message packet. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 092bff78ab..79cf4e598f 100644 +index 092bff78ab5288ede0cdeaa94a59190b79aea239..79cf4e598fedf75e5ee943acb7930cb265dd11f6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -8,6 +8,7 @@ import java.io.IOException; @@ -58,7 +58,7 @@ index 092bff78ab..79cf4e598f 100644 } diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java new file mode 100644 -index 0000000000..fdd8708f97 +index 0000000000000000000000000000000000000000..fdd8708f974700c7cde6e436c2f189d94d336f1f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java @@ -0,0 +1,67 @@ @@ -130,7 +130,7 @@ index 0000000000..fdd8708f97 + } +} diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 1c4ac7bf7a..47cf105019 100644 +index 1c4ac7bf7ac4d864ba6efd46d8c562c238dad2bc..47cf105019b3ea28f413274d234a34cdb41941dd 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener { @@ -206,7 +206,7 @@ index 1c4ac7bf7a..47cf105019 100644 } diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 08e314af7c..046196d54d 100644 +index 08e314af7cbd6523bbd0bd5a5ad0a0fff2f080be..046196d54df35ceafb8bc477e740e1dc834345d5 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -44,7 +44,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -219,7 +219,7 @@ index 08e314af7c..046196d54d 100644 public java.util.UUID spoofedUUID; public com.mojang.authlib.properties.Property[] spoofedProfile; diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java -index 93ae6dcd78..fb9186b3f5 100644 +index 93ae6dcd78e9b786b64fadcb9cd016559fb98535..fb9186b3f566afd10086dc09b4681d23e422995a 100644 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java @@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf { @@ -247,7 +247,7 @@ index 93ae6dcd78..fb9186b3f5 100644 int j = this.i(); diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java -index 4d1f441395..c1ca6f9501 100644 +index 4d1f44139535cae0df90615d29121ff85cc964de..c1ca6f950162f53ebcb16efabb3064809472673f 100644 --- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java +++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java @@ -4,8 +4,8 @@ import java.io.IOException; @@ -262,7 +262,7 @@ index 4d1f441395..c1ca6f9501 100644 public PacketLoginInCustomPayload() {} diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java -index ae74dc9e18..7eb230f1b2 100644 +index ae74dc9e183e66062455cf2a18ab43ae87976046..7eb230f1b27eddf48f1b12fc78877a3678d802df 100644 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java @@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet Date: Fri, 12 Oct 2018 14:10:46 -0500 Subject: [PATCH] Add more Witch API diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index be6ecfb08a..7b6b1ad17b 100644 +index be6ecfb08aaba3fc5d96e918b7540fc75c92e89e..7b6b1ad17b600b688d16c4208f4e2ac17b36a257 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -1,5 +1,11 @@ @@ -97,7 +97,7 @@ index be6ecfb08a..7b6b1ad17b 100644 public SoundEffect eq() { return SoundEffects.ENTITY_WITCH_CELEBRATE; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java -index bae107e76e..b43a2bbd5b 100644 +index bae107e76e4c8df446d4a7be8dda291d820074d7..b43a2bbd5bfd613887a7ae1519f6e729faf9bcc2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java @@ -1,12 +1,18 @@ @@ -145,6 +145,3 @@ index bae107e76e..b43a2bbd5b 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0317-Fix-MC-93764.patch b/Spigot-Server-Patches/0317-Fix-MC-93764.patch index 398f19b008..decbb2303f 100644 --- a/Spigot-Server-Patches/0317-Fix-MC-93764.patch +++ b/Spigot-Server-Patches/0317-Fix-MC-93764.patch @@ -1,11 +1,11 @@ -From 15d717629b9a92c913952b6335741ab477a62f0a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Oct 2018 19:38:45 -0500 Subject: [PATCH] Fix MC-93764 diff --git a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java -index 9d4fcf8bcf..4b9760709d 100644 +index 9d4fcf8bcfdc5c09fe0a7ba18a229be3b0e7115c..4b9760709df89ab8378184cb643a9079685b6230 100644 --- a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java +++ b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java @@ -27,7 +27,7 @@ public class WorldProviderTheEnd extends WorldProvider { @@ -17,6 +17,3 @@ index 9d4fcf8bcf..4b9760709d 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0318-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0318-Add-option-to-prevent-players-from-moving-into-unloa.patch index 9b416d9312..da9f2ff38b 100644 --- a/Spigot-Server-Patches/0318-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/Spigot-Server-Patches/0318-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -1,4 +1,4 @@ -From 05a9dd79cc871677eac47008e454955ae3691d8b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Mon, 22 Oct 2018 17:34:10 +0200 Subject: [PATCH] Add option to prevent players from moving into unloaded @@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b8789c8ecc..0862a1d629 100644 +index b8789c8ecc5a6e4117bb7ce0d5487a6e5774b67f..0862a1d629435dea92178fb5473068f23a15adf2 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -427,4 +427,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index b8789c8ecc..0862a1d629 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6627d8402f..bde60377ee 100644 +index 6627d8402f784c16519adaabca967b8e1d365ddc..bde60377ee6e48aad61d36b8e1401cb770986d9f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -351,6 +351,13 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -62,6 +62,3 @@ index 6627d8402f..bde60377ee 100644 if (!this.player.H() && (!this.player.getWorldServer().getGameRules().getBoolean(GameRules.DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isGliding())) { float f2 = this.player.isGliding() ? 300.0F : 100.0F; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0319-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0319-Reset-players-airTicks-on-respawn.patch index 04e9600fc8..546f8f0d92 100644 --- a/Spigot-Server-Patches/0319-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0319-Reset-players-airTicks-on-respawn.patch @@ -1,11 +1,11 @@ -From 05353c0b8f4bb4fd35567ed4f5a1522468a73207 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: GreenMeanie Date: Sat, 20 Oct 2018 22:34:02 -0400 Subject: [PATCH] Reset players airTicks on respawn diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 8d3140871f..1488616f39 100644 +index 8d3140871fd750bbb5d7c7f920917ae356890aeb..1488616f3968ac41cbab6348be7bbfb13573d35d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2330,6 +2330,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,7 +17,7 @@ index 8d3140871f..1488616f39 100644 return 300; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index bc62a9f08e..cf71ad016a 100644 +index bc62a9f08e9eb39dc20a69f397bc74eab13031a9..cf71ad016a028a539e3d7155ad44408ac851473e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1862,6 +1862,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -28,6 +28,3 @@ index bc62a9f08e..cf71ad016a 100644 this.fireTicks = 0; this.fallDistance = 0; this.foodData = new FoodMetaData(this); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0320-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0320-Don-t-sleep-after-profile-lookups-if-not-needed.patch index 940eb15e6d..dc184c36cf 100644 --- a/Spigot-Server-Patches/0320-Don-t-sleep-after-profile-lookups-if-not-needed.patch +++ b/Spigot-Server-Patches/0320-Don-t-sleep-after-profile-lookups-if-not-needed.patch @@ -1,4 +1,4 @@ -From 0ba446a787156af67dac8372b5165c5237358faa Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 20:25:05 -0400 Subject: [PATCH] Don't sleep after profile lookups if not needed @@ -7,7 +7,7 @@ Mojang was sleeping even if we had no more requests to go after the current one finished, resulting in 100ms lost per profile lookup diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java -index 71e48e87b4..23f1447cfc 100644 +index 71e48e87b4280f8913d762e8b4fc9bea4c7f7d29..23f1447cfcef89683a9bc98f0f912d76a1f93012 100644 --- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java +++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java @@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository { @@ -31,6 +31,3 @@ index 71e48e87b4..23f1447cfc 100644 try { Thread.sleep(DELAY_BETWEEN_PAGES); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0321-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0321-Use-more-reasonable-thread-count-default-for-bootstr.patch index ad7c9356d5..4fb0cc9c90 100644 --- a/Spigot-Server-Patches/0321-Use-more-reasonable-thread-count-default-for-bootstr.patch +++ b/Spigot-Server-Patches/0321-Use-more-reasonable-thread-count-default-for-bootstr.patch @@ -1,11 +1,11 @@ -From 68bba7cd99d3f206e6a4e80429f6e4d90125c89b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 23:14:38 -0400 Subject: [PATCH] Use more reasonable thread count default for bootstrap diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java -index 7e224ebeff..dc6d030621 100644 +index 7e224ebeff3bf34270df173a47b08d3290c00670..dc6d030621b66e43edf3a148f0eca43382383705 100644 --- a/src/main/java/net/minecraft/server/SystemUtils.java +++ b/src/main/java/net/minecraft/server/SystemUtils.java @@ -66,7 +66,7 @@ public class SystemUtils { @@ -17,6 +17,3 @@ index 7e224ebeff..dc6d030621 100644 Object object; if (i <= 0) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0322-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0322-Optimize-World-Time-Updates.patch index 2b08d08271..b01022a40a 100644 --- a/Spigot-Server-Patches/0322-Optimize-World-Time-Updates.patch +++ b/Spigot-Server-Patches/0322-Optimize-World-Time-Updates.patch @@ -1,4 +1,4 @@ -From 0726b0e88db219ced2e6812a070c9aa60670169b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Nov 2018 23:11:51 -0400 Subject: [PATCH] Optimize World Time Updates @@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet object for every player unless they have per-player time enabled. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c97bbe933d..3d9cc2ce67 100644 +index c97bbe933dd05829d9da7bc71d03d2c0a26a4ad1..3d9cc2ce67b5dc033df397e8d1c31f718792dcc4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1166,12 +1166,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 5 Nov 2018 04:23:51 +0000 Subject: [PATCH] Restore custom InventoryHolder support @@ -17,7 +17,7 @@ will always work as intended in the past, those without will create implementati based inventories. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java -index 9957ed0402..ae280dd40b 100644 +index 9957ed0402dc2a2c66755f79564ad6e304a2ddcf..ae280dd40bada7ec1d8c85c85fbb579e554a51eb 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java @@ -39,10 +39,20 @@ public final class CraftInventoryCreator { @@ -41,6 +41,3 @@ index 9957ed0402..ae280dd40b 100644 return converterMap.get(type).createInventory(holder, type, title); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0324-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0324-Use-Vanilla-Minecart-Speeds.patch index e74be036a3..5beb8fb040 100644 --- a/Spigot-Server-Patches/0324-Use-Vanilla-Minecart-Speeds.patch +++ b/Spigot-Server-Patches/0324-Use-Vanilla-Minecart-Speeds.patch @@ -1,4 +1,4 @@ -From 42d6aef1ce2c334a428249028bd55086efe02c3f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 8 Nov 2018 21:33:09 -0500 Subject: [PATCH] Use Vanilla Minecart Speeds @@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds CraftBukkit changed the values on flying speed, restore back to vanilla diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index c2843d5d60..665bbe07fa 100644 +index c2843d5d607c3d19806b673c76289a8bee035e70..665bbe07fa5f5c048758156b92f7b002e851c132 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -59,9 +59,9 @@ public abstract class EntityMinecartAbstract extends Entity { @@ -22,6 +22,3 @@ index c2843d5d60..665bbe07fa 100644 public double maxSpeed = 0.4D; // CraftBukkit end --- -2.26.2 - diff --git a/Spigot-Server-Patches/0325-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0325-Fix-SpongeAbsortEvent-handling.patch index feff9eb990..6029282f6b 100644 --- a/Spigot-Server-Patches/0325-Fix-SpongeAbsortEvent-handling.patch +++ b/Spigot-Server-Patches/0325-Fix-SpongeAbsortEvent-handling.patch @@ -1,4 +1,4 @@ -From 3dfa21fff39c7ccf8cd6d213d1a2e0611209ed21 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Nov 2018 05:15:21 +0000 Subject: [PATCH] Fix SpongeAbsortEvent handling @@ -6,7 +6,7 @@ Subject: [PATCH] Fix SpongeAbsortEvent handling Only process drops when the block is actually going to be removed diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index b9b750c369..540fcce1dd 100644 +index b9b750c3695699520c736d57cbd88c8d52254c7a..540fcce1dd4d64dee51e2594f2199fac5299c6a0 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -472,7 +472,7 @@ public class Block implements IMaterial { @@ -19,7 +19,7 @@ index b9b750c369..540fcce1dd 100644 if (world instanceof WorldServer) { a(iblockdata, (WorldServer) world, blockposition, tileentity).forEach((itemstack) -> { diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java -index 685a30f3f1..9edf937a65 100644 +index 685a30f3f14232dba88e22ec86e2e66f7da86d0b..9edf937a652a5b463ff049c414f3230bb0ecd9ed 100644 --- a/src/main/java/net/minecraft/server/BlockSponge.java +++ b/src/main/java/net/minecraft/server/BlockSponge.java @@ -115,8 +115,11 @@ public class BlockSponge extends Block { @@ -36,6 +36,3 @@ index 685a30f3f1..9edf937a65 100644 } } world.setTypeAndData(blockposition2, block.getHandle(), block.getFlag()); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0326-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0326-Don-t-allow-digging-into-unloaded-chunks.patch index e5c84b627f..c025baeaec 100644 --- a/Spigot-Server-Patches/0326-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0326-Don-t-allow-digging-into-unloaded-chunks.patch @@ -1,11 +1,11 @@ -From c1dd6221baa83a8a02654cebccd95e41a1874554 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Nov 2018 21:01:09 +0000 Subject: [PATCH] Don't allow digging into unloaded chunks diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index bde60377ee..b21fca9e5c 100644 +index bde60377ee6e48aad61d36b8e1401cb770986d9f..b21fca9e5c98bd23c8553dd7c19a4ed6a83cae9a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1272,6 +1272,11 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -21,7 +21,7 @@ index bde60377ee..b21fca9e5c 100644 return; default: diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index e2e5c17c24..17b7eddac4 100644 +index e2e5c17c24c8f5e9807ca879b1025d13cb195226..17b7eddac4fadfd1cc3027fe6fbcd2bd5611fb84 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -253,10 +253,12 @@ public class PlayerInteractManager { @@ -40,6 +40,3 @@ index e2e5c17c24..17b7eddac4 100644 } this.world.a(this.player.getId(), blockposition, -1); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0327-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0327-Optimize-redstone-algorithm.patch index f92948acac..953754dee6 100644 --- a/Spigot-Server-Patches/0327-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0327-Optimize-redstone-algorithm.patch @@ -1,4 +1,4 @@ -From 3779094901c0801f88f7af0477296d7f1e4990d6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: theosib Date: Thu, 27 Sep 2018 01:43:35 -0600 Subject: [PATCH] Optimize redstone algorithm @@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee Just added Bukkit's event system and took a few liberties with dead code and comment misspellings. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 0862a1d629..4ba72275b9 100644 +index 0862a1d629435dea92178fb5473068f23a15adf2..4ba72275b965693f3650f9b4fb138d3320d1b88b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -432,4 +432,14 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index 0862a1d629..4ba72275b9 100644 } diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java new file mode 100644 -index 0000000000..b69803cbf2 +index 0000000000000000000000000000000000000000..b69803cbf2db2781aa050b145bf88468254880ae --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java @@ -0,0 +1,915 @@ @@ -959,7 +959,7 @@ index 0000000000..b69803cbf2 + } +} diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java -index 5bf2fc0b3f..52a4982ecd 100644 +index 5bf2fc0b3f0a5209682b6056a6512ba9dbdca6d0..52a4982ecd7e4346e55c6fbab80032ed49490c15 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -1,5 +1,7 @@ @@ -1127,7 +1127,7 @@ index 5bf2fc0b3f..52a4982ecd 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 378ac5ae86..f861957842 100644 +index 378ac5ae86e337f27975bc7935c4f25fce767eaf..f8619578422f9e1e5368c97588cc5ec265788a1d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -522,6 +522,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -1146,6 +1146,3 @@ index 378ac5ae86..f861957842 100644 public int q(BlockPosition blockposition) { int i = 0; EnumDirection[] aenumdirection = World.a; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0328-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0328-force-entity-dismount-during-teleportation.patch index 71a61daae0..1af6b2be79 100644 --- a/Spigot-Server-Patches/0328-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0328-force-entity-dismount-during-teleportation.patch @@ -1,4 +1,4 @@ -From 9f76cc276b7f1ca39fb433ac114e356046e3727a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 15 Nov 2018 13:38:37 +0000 Subject: [PATCH] force entity dismount during teleportation @@ -20,7 +20,7 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1488616f39..3fc3b76436 100644 +index 1488616f3968ac41cbab6348be7bbfb13573d35d..3fc3b76436cd2aba64f5b5881e23e9de4900f59c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2031,12 +2031,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -72,7 +72,7 @@ index 1488616f39..3fc3b76436 100644 if (event.isCancelled()) { return false; diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index f41975165a..61c9e030a1 100644 +index f41975165a6a66479bc8fc1811c1d271bb2a6113..61c9e030a105ee78a7e59fbf36cf7a77f87a0e88 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -968,9 +968,11 @@ public abstract class EntityHuman extends EntityLiving { @@ -91,7 +91,7 @@ index f41975165a..61c9e030a1 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 3d56682719..c7c248f63f 100644 +index 3d5668271954ede03220354985851603669a61d4..c7c248f63f8cfef6d6b095a926028c519ec3ffd4 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2738,11 +2738,13 @@ public abstract class EntityLiving extends Entity { @@ -112,7 +112,7 @@ index 3d56682719..c7c248f63f 100644 this.a(entity); } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index cf71ad016a..960e1fd4ad 100644 +index cf71ad016a028a539e3d7155ad44408ac851473e..960e1fd4ad33ffc9d2baa302a407f9ad94d9a7ce 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1023,11 +1023,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -132,6 +132,3 @@ index cf71ad016a..960e1fd4ad 100644 Entity entity1 = this.getVehicle(); if (entity1 != entity && this.playerConnection != null) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0329-Book-Size-Limits.patch b/Spigot-Server-Patches/0329-Book-Size-Limits.patch index 2a7581adba..a57550f234 100644 --- a/Spigot-Server-Patches/0329-Book-Size-Limits.patch +++ b/Spigot-Server-Patches/0329-Book-Size-Limits.patch @@ -1,4 +1,4 @@ -From 40477e339f434baa1e125be7c40d8006db4bcd4e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Nov 2018 23:08:50 -0500 Subject: [PATCH] Book Size Limits @@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits Puts some limits on the size of books. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 79cf4e598f..6d069c73d0 100644 +index 79cf4e598fedf75e5ee943acb7930cb265dd11f6..6d069c73d0058f58e908f351a849ec3a753f2d22 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -354,4 +354,11 @@ public class PaperConfig { @@ -22,7 +22,7 @@ index 79cf4e598f..6d069c73d0 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b21fca9e5c..784f0a3f22 100644 +index b21fca9e5c98bd23c8553dd7c19a4ed6a83cae9a..784f0a3f222c108f9585ee041bc3c704025aea89 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -14,6 +14,7 @@ import java.util.Iterator; @@ -76,6 +76,3 @@ index b21fca9e5c..784f0a3f22 100644 PlayerConnectionUtils.ensureMainThread(packetplayinbedit, this, this.player.getWorldServer()); // CraftBukkit start if (this.lastBookTick + 20 > MinecraftServer.currentTick) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0330-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0330-Make-the-default-permission-message-configurable.patch index fca454d95a..1acf2eb727 100644 --- a/Spigot-Server-Patches/0330-Make-the-default-permission-message-configurable.patch +++ b/Spigot-Server-Patches/0330-Make-the-default-permission-message-configurable.patch @@ -1,11 +1,11 @@ -From e9d84962272f4ad3b4c1968600b6f5b265707b58 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 6d069c73d0..dbd1439970 100644 +index 6d069c73d0058f58e908f351a849ec3a753f2d22..dbd14399707cdd43f98af40191be8ff3e76edf43 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -20,6 +20,7 @@ import java.util.regex.Pattern; @@ -29,7 +29,7 @@ index 6d069c73d0..dbd1439970 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 7b53ebb6d7..811e676e4f 100644 +index 7b53ebb6d7cf241c6b89ec04acd0bcc25e1c105a..811e676e4f9f1f8beb8eb9e20cef3ef03633a856 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2180,6 +2180,11 @@ public final class CraftServer implements Server { @@ -44,6 +44,3 @@ index 7b53ebb6d7..811e676e4f 100644 @Override public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull UUID uuid) { return createProfile(uuid, null); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0331-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0331-Add-more-Zombie-API.patch index aa75d05ea7..e0f36ab04b 100644 --- a/Spigot-Server-Patches/0331-Add-more-Zombie-API.patch +++ b/Spigot-Server-Patches/0331-Add-more-Zombie-API.patch @@ -1,11 +1,11 @@ -From 44800da3b5b4053828869258f37eaf719ec63314 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 04:29:59 -0500 Subject: [PATCH] Add more Zombie API diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index bed15873b6..6d53254f83 100644 +index bed15873b675bbd05c0149d655f9fb165bbbc73e..6d53254f8381f3a957673930c7fdf42d4b9d2f36 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1260,6 +1260,8 @@ public abstract class EntityInsentient extends EntityLiving { @@ -18,7 +18,7 @@ index bed15873b6..6d53254f83 100644 byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b); diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 31aba6bfc3..2d4f8aac8f 100644 +index 31aba6bfc3c196cc0c664c0e139f0f8eb7c804b4..2d4f8aac8fac1c414d18593c79f767202c757af2 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -33,6 +33,7 @@ public class EntityZombie extends EntityMonster { @@ -92,7 +92,7 @@ index 31aba6bfc3..2d4f8aac8f 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java -index 0429cf020e..c4320dbb67 100644 +index 0429cf020e462d3655bf1159ec857cad33544b71..c4320dbb67059be9456b0eef700a5f3e83c7c75b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java @@ -80,4 +80,41 @@ public class CraftZombie extends CraftMonster implements Zombie { @@ -137,6 +137,3 @@ index 0429cf020e..c4320dbb67 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0332-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0332-Prevent-rayTrace-from-loading-chunks.patch index 136277a201..8e75d4a3c4 100644 --- a/Spigot-Server-Patches/0332-Prevent-rayTrace-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0332-Prevent-rayTrace-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From aab8e3026c429cd3433d943dd79245ea6c7f5e8c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 26 Nov 2018 19:21:58 -0500 Subject: [PATCH] Prevent rayTrace from loading chunks @@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss this saves a ton of lag for when AI tries to raytrace near unloaded chunks. diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java -index 0dff023529..29cdc00875 100644 +index 0dff023529ba9e44a7406ad6388cad35730917ba..29cdc00875aa5004132820f36e781c7bf4573162 100644 --- a/src/main/java/net/minecraft/server/IBlockAccess.java +++ b/src/main/java/net/minecraft/server/IBlockAccess.java @@ -41,7 +41,15 @@ public interface IBlockAccess { @@ -27,6 +27,3 @@ index 0dff023529..29cdc00875 100644 Fluid fluid = this.getFluid(blockposition); Vec3D vec3d = raytrace1.b(); Vec3D vec3d1 = raytrace1.a(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0333-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0333-Handle-Large-Packets-disconnecting-client.patch index 3cd8ae6b49..f6bdcd6bc4 100644 --- a/Spigot-Server-Patches/0333-Handle-Large-Packets-disconnecting-client.patch +++ b/Spigot-Server-Patches/0333-Handle-Large-Packets-disconnecting-client.patch @@ -1,4 +1,4 @@ -From c0a1bbcd3eb1b579463407d12d658155d927c129 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Nov 2018 21:18:06 -0500 Subject: [PATCH] Handle Large Packets disconnecting client @@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet, split the inventory set into multiple packets instead. diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 046196d54d..d4aad8a5b7 100644 +index 046196d54df35ceafb8bc477e740e1dc834345d5..d4aad8a5b7dd8ee837fa7f9b70271e0554bb04e1 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -97,6 +97,15 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -27,7 +27,7 @@ index 046196d54d..d4aad8a5b7 100644 NetworkManager.LOGGER.debug("Skipping packet due to errors", throwable.getCause()); } else { diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java -index 601d4d0fa2..2d8e6a2f4a 100644 +index 601d4d0fa2a0b3e90f81aed55a2d3473c66c7875..2d8e6a2f4a0c3c5d74a647d7164b0028781d3bf5 100644 --- a/src/main/java/net/minecraft/server/Packet.java +++ b/src/main/java/net/minecraft/server/Packet.java @@ -10,6 +10,12 @@ public interface Packet { @@ -44,7 +44,7 @@ index 601d4d0fa2..2d8e6a2f4a 100644 return false; } diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java -index 63c4dbd327..b0cfef52cb 100644 +index 63c4dbd327beb7b6ab42eb44650d68accd3b0de6..b0cfef52cbb5e23beae528668e4e98cedecf603c 100644 --- a/src/main/java/net/minecraft/server/PacketEncoder.java +++ b/src/main/java/net/minecraft/server/PacketEncoder.java @@ -49,7 +49,31 @@ public class PacketEncoder extends MessageToByteEncoder> { @@ -80,7 +80,7 @@ index 63c4dbd327..b0cfef52cb 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 1fcbbd698a..a0b87f89df 100644 +index 1fcbbd698a7e1b9ae3e8b5fa0328b85c43019bea..a0b87f89df77ba8ac6ce3f135d4f3a34ed2b3543 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -79,7 +79,7 @@ public class PacketPlayOutMapChunk implements Packet { @@ -93,7 +93,7 @@ index 1fcbbd698a..a0b87f89df 100644 } else { this.f = new byte[i]; diff --git a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java -index f7c3655671..631234324d 100644 +index f7c3655671cb75a7e78796bcddc3cfd9817e2b90..631234324d5c53015b3cef21b20bb3211e335af8 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java @@ -9,6 +9,15 @@ public class PacketPlayOutWindowItems implements Packet { @@ -112,6 +112,3 @@ index f7c3655671..631234324d 100644 public PacketPlayOutWindowItems() {} public PacketPlayOutWindowItems(int i, NonNullList nonnulllist) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0334-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0334-Lazy-init-world-storage-in-CraftOfflinePlayer.patch index 5749d3a29b..6b1e4eb6ef 100644 --- a/Spigot-Server-Patches/0334-Lazy-init-world-storage-in-CraftOfflinePlayer.patch +++ b/Spigot-Server-Patches/0334-Lazy-init-world-storage-in-CraftOfflinePlayer.patch @@ -1,4 +1,4 @@ -From a7a6c01c51b445954e0449f83db2a55de7075b35 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 11 Dec 2018 22:25:07 -0500 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer @@ -8,7 +8,7 @@ worlds loaded. This is typically a rare occurrence but probably one that should be covered as best we can. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java -index 58e10381c8..0e8a21b803 100644 +index 58e10381c898afc676b64cb02a16fbcedf151041..0e8a21b80371dd5ce833da3daf12fdcd9aabae9f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java @@ -29,12 +29,12 @@ import org.bukkit.plugin.Plugin; @@ -60,6 +60,3 @@ index 58e10381c8..0e8a21b803 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0335-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0335-Add-PlayerConnectionCloseEvent.patch index 8eee0b9af4..0197eb474f 100644 --- a/Spigot-Server-Patches/0335-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-Server-Patches/0335-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From 6472f6dc846a23a7a031dc575368ab1650ba63de Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 7 Oct 2018 12:05:28 -0700 Subject: [PATCH] Add PlayerConnectionCloseEvent @@ -34,7 +34,7 @@ how PlayerPreLoginEvent interacts with PlayerConnectionCloseEvent is undefined. diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 47cf105019..f1222fcb2b 100644 +index 47cf105019b3ea28f413274d234a34cdb41941dd..f1222fcb2bd52b8781d0f92c94e1472fa7b1e493 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -35,9 +35,9 @@ public class LoginListener implements PacketLoginInListener { @@ -50,7 +50,7 @@ index 47cf105019..f1222fcb2b 100644 private SecretKey loginKey; private EntityPlayer l; diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index d4aad8a5b7..b1dededc15 100644 +index d4aad8a5b7dd8ee837fa7f9b70271e0554bb04e1..b1dededc15cce686ead74a99bee64c89ac1de22c 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -336,6 +336,26 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -80,6 +80,3 @@ index d4aad8a5b7..b1dededc15 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0336-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0336-Prevent-Enderman-from-loading-chunks.patch index 7a83189657..40f98fe856 100644 --- a/Spigot-Server-Patches/0336-Prevent-Enderman-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0336-Prevent-Enderman-from-loading-chunks.patch @@ -1,11 +1,11 @@ -From 29df97db28b6c69cc3b420c570d65628498e4f19 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 18 Dec 2018 02:15:08 +0000 Subject: [PATCH] Prevent Enderman from loading chunks diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index d86f76f30b..212636dcb2 100644 +index d86f76f30be54767d0243df716fe743e24db6726..212636dcb2107816340f40784f9f89a7daf50ad2 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -344,7 +344,8 @@ public class EntityEnderman extends EntityMonster { @@ -28,6 +28,3 @@ index d86f76f30b..212636dcb2 100644 BlockPosition blockposition1 = blockposition.down(); IBlockData iblockdata1 = world.getType(blockposition1); IBlockData iblockdata2 = Block.getValidBlockForPosition(getEnderman().getCarried(), getEnderman().world, blockposition); // Paper - Fix MC-124320 --- -2.26.2 - diff --git a/Spigot-Server-Patches/0337-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0337-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index 50decf25fd..5f0555fc22 100644 --- a/Spigot-Server-Patches/0337-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-Server-Patches/0337-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -1,4 +1,4 @@ -From 1ff7ab3d1f80417607329ccfb45a20d98dffe303 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Jan 2019 00:35:43 -0600 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed @@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 960e1fd4ad..c5b8e76e2c 100644 +index 960e1fd4ad33ffc9d2baa302a407f9ad94d9a7ce..c5b8e76e2c8646a5da6ac640ee1047a1d00b6849 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -76,6 +76,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -28,7 +28,7 @@ index 960e1fd4ad..c5b8e76e2c 100644 public boolean queueHealthUpdatePacket = false; public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket; diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 6b67201852..e148940ab3 100644 +index 6b67201852db53fee5e2ee79d41c13f675065f72..e148940ab3721cff27cf791c159c11b9b94191e4 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -94,6 +94,7 @@ public abstract class PlayerList { @@ -40,7 +40,7 @@ index 6b67201852..e148940ab3 100644 UserCache usercache = this.server.getUserCache(); GameProfile gameprofile1 = usercache.getProfile(gameprofile.getId()); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java -index 0e8a21b803..32e02af96e 100644 +index 0e8a21b80371dd5ce833da3daf12fdcd9aabae9f..32e02af96e8f8db68509022f742a1239c9b7b4c7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java @@ -260,6 +260,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa @@ -106,7 +106,7 @@ index 0e8a21b803..32e02af96e 100644 public Location getBedSpawnLocation() { NBTTagCompound data = getData(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a8f46ceb4b..8cf17e5ebf 100644 +index a8f46ceb4b5a545bc4dd8d1e7d9438238f8af93a..8cf17e5ebf356d7a35535bacd6ebf44ff24e796e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -139,6 +139,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -162,6 +162,3 @@ index a8f46ceb4b..8cf17e5ebf 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0338-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0338-Fix-PlayerEditBookEvent.patch index 4174d4e51a..8013d88d7e 100644 --- a/Spigot-Server-Patches/0338-Fix-PlayerEditBookEvent.patch +++ b/Spigot-Server-Patches/0338-Fix-PlayerEditBookEvent.patch @@ -1,4 +1,4 @@ -From 9549441487fa359a7a6b323ab0aa73b8e7a62ce5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sun, 16 Dec 2018 13:07:33 +1100 Subject: [PATCH] Fix PlayerEditBookEvent @@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta cancelled writing diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 784f0a3f22..4b3ddfd990 100644 +index 784f0a3f222c108f9585ee041bc3c704025aea89..4b3ddfd9907969eb73856cd7298bad4b03c6fa96 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -871,9 +871,11 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -28,6 +28,3 @@ index 784f0a3f22..4b3ddfd990 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index 7e24578054..aac88408dd 100644 --- a/Spigot-Server-Patches/0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -1,11 +1,11 @@ -From c48eb30d4a45796d7d5a8f040bd3c018ba2cb440 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: connorhartley Date: Mon, 7 Jan 2019 14:43:48 -0600 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index c5b8e76e2c..17c9c90359 100644 +index c5b8e76e2c8646a5da6ac640ee1047a1d00b6849..17c9c90359fc3e76b6fe77b5d61f62a8d03a914c 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1291,6 +1291,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -22,6 +22,3 @@ index c5b8e76e2c..17c9c90359 100644 if (this.isSleeping()) { this.wakeup(true, false); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0340-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0340-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch index e6270f1076..bd4dfeec9b 100644 --- a/Spigot-Server-Patches/0340-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch +++ b/Spigot-Server-Patches/0340-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch @@ -1,4 +1,4 @@ -From 41e89ff3c9dd39aafaca483697bd618bb0b5bfbb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 31 Jan 2019 16:33:36 -0500 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons @@ -24,7 +24,7 @@ Instead we opt to remove the check entirely so that the event fires for all piston types. diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java -index 1170a28107..b29525c40d 100644 +index 1170a28107bee73c32cedd6a0a3d1d7c65129b10..b29525c40dc8e3ae747b8ddf5a3bd79b7cc0b792 100644 --- a/src/main/java/net/minecraft/server/BlockPiston.java +++ b/src/main/java/net/minecraft/server/BlockPiston.java @@ -122,7 +122,7 @@ public class BlockPiston extends BlockDirectional { @@ -45,6 +45,3 @@ index 1170a28107..b29525c40d 100644 // PAIL: checkME - what happened to setTypeAndData? // CraftBukkit end world.playBlockAction(blockposition, this, b0, enumdirection.b()); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0341-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0341-Block-Entity-remove-from-being-called-on-Players.patch index e1d3ab0895..7581835ff7 100644 --- a/Spigot-Server-Patches/0341-Block-Entity-remove-from-being-called-on-Players.patch +++ b/Spigot-Server-Patches/0341-Block-Entity-remove-from-being-called-on-Players.patch @@ -1,4 +1,4 @@ -From 046ac7ebeb6bcc1d66f449eb5884180875f7874c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 4 Feb 2019 23:33:24 -0500 Subject: [PATCH] Block Entity#remove from being called on Players @@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to be unintentional in the few cases we've seen so far. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8cf17e5ebf..6e3bcfe2cd 100644 +index 8cf17e5ebf356d7a35535bacd6ebf44ff24e796e..6e3bcfe2cd77cd1fd592f8148f5286be3099cb24 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1950,6 +1950,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -31,6 +31,3 @@ index 8cf17e5ebf..6e3bcfe2cd 100644 // Paper end // Spigot start --- -2.26.2 - diff --git a/Spigot-Server-Patches/0342-BlockDestroyEvent.patch b/Spigot-Server-Patches/0342-BlockDestroyEvent.patch index 5961ea5e6d..ffcf450a86 100644 --- a/Spigot-Server-Patches/0342-BlockDestroyEvent.patch +++ b/Spigot-Server-Patches/0342-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From f884455c12a245c1c9d3e8d77fd1d1f855c67d2b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 Feb 2019 00:20:33 -0500 Subject: [PATCH] BlockDestroyEvent @@ -11,7 +11,7 @@ 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 f861957842..a3fbdf5db5 100644 +index f8619578422f9e1e5368c97588cc5ec265788a1d..a3fbdf5db5cd1f08e9920bbc786705f69f465efd 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -452,8 +452,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -36,6 +36,3 @@ index f861957842..a3fbdf5db5 100644 if (flag) { TileEntity tileentity = iblockdata.getBlock().isTileEntity() ? this.getTileEntity(blockposition) : null; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0343-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0343-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch index d880db798f..620202d82d 100644 --- a/Spigot-Server-Patches/0343-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch +++ b/Spigot-Server-Patches/0343-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch @@ -1,4 +1,4 @@ -From 50e5846d42abd8ca6c3cf79a6f66d6cca7195c04 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Jan 2019 00:08:15 -0500 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes @@ -10,7 +10,7 @@ This made the Bukkit RecipeChoice API not work for Shapeless. This reimplements vanilla logic using the same test logic as Shaped diff --git a/src/main/java/net/minecraft/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java -index fe03a35cc8..fb481e6586 100644 +index fe03a35cc862d58fffa88325e34bad011a0a0ff7..fb481e65862b4aaa08e2302a517fdd8253d63812 100644 --- a/src/main/java/net/minecraft/server/ShapelessRecipes.java +++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java @@ -63,16 +63,46 @@ public class ShapelessRecipes implements RecipeCrafting { @@ -63,6 +63,3 @@ index fe03a35cc8..fb481e6586 100644 } public ItemStack a(InventoryCrafting inventorycrafting) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0344-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0344-Fix-sign-edit-memory-leak.patch index 2c9a612249..fa31c53d3e 100644 --- a/Spigot-Server-Patches/0344-Fix-sign-edit-memory-leak.patch +++ b/Spigot-Server-Patches/0344-Fix-sign-edit-memory-leak.patch @@ -1,4 +1,4 @@ -From f0ae31c519bfef05b81bac120398101448cbe471 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Feb 2019 00:15:28 -0500 Subject: [PATCH] Fix sign edit memory leak @@ -6,7 +6,7 @@ Subject: [PATCH] Fix sign edit memory leak when a player edits a sign, a reference to their Entity is never cleand up. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 4b3ddfd990..2c94ca6a8e 100644 +index 4b3ddfd9907969eb73856cd7298bad4b03c6fa96..2c94ca6a8e8a13959f2d89650587181060767b1a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2546,7 +2546,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -19,7 +19,7 @@ index 4b3ddfd990..2c94ca6a8e 100644 this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit return; diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 03f6ddf000..a934020190 100644 +index 03f6ddf0003f0ef44ede31cf7a3491580ff0b5de..a934020190da937adaf2a0599259f85d3cbda269 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -10,6 +10,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // @@ -42,6 +42,3 @@ index 03f6ddf000..a934020190 100644 } public EntityHuman f() { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0345-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0345-Limit-Client-Sign-length-more.patch index c98c94455a..6eafc5fad9 100644 --- a/Spigot-Server-Patches/0345-Limit-Client-Sign-length-more.patch +++ b/Spigot-Server-Patches/0345-Limit-Client-Sign-length-more.patch @@ -1,4 +1,4 @@ -From 75d42ab5d15870574bbb5553e685acc9fdb5738e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Feb 2019 22:18:40 -0500 Subject: [PATCH] Limit Client Sign length more @@ -22,7 +22,7 @@ it only impacts data sent from the client. Set -DPaper.maxSignLength=XX to change limit or -1 to disable diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 2c94ca6a8e..94d3d602cc 100644 +index 2c94ca6a8e8a13959f2d89650587181060767b1a..94d3d602ccd9bc8fdf82eb75f12b1bc39359e1f8 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -103,6 +103,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -49,6 +49,3 @@ index 2c94ca6a8e..94d3d602cc 100644 lines[i] = SharedConstants.a(astring[i]); //Paper - Replaced with anvil color stripping method to stop exploits that allow colored signs to be created. } SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0346-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0346-Don-t-check-ConvertSigns-boolean-every-sign-save.patch index 1567f45062..5b34219b56 100644 --- a/Spigot-Server-Patches/0346-Don-t-check-ConvertSigns-boolean-every-sign-save.patch +++ b/Spigot-Server-Patches/0346-Don-t-check-ConvertSigns-boolean-every-sign-save.patch @@ -1,4 +1,4 @@ -From bc69287d6ccb8be530da8e61c5988dfb41083292 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 11:11:29 -0500 Subject: [PATCH] Don't check ConvertSigns boolean every sign save @@ -7,7 +7,7 @@ property lookups arent super cheap. they synchronize, validate and check security managers. diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index a934020190..0e9a90b70f 100644 +index a934020190da937adaf2a0599259f85d3cbda269..0e9a90b70f84b8da530814ac0b9b4b5fef458729 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -11,6 +11,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // @@ -27,6 +27,3 @@ index a934020190..0e9a90b70f 100644 nbttagcompound.setBoolean("Bukkit.isConverted", true); } // CraftBukkit end --- -2.26.2 - diff --git a/Spigot-Server-Patches/0347-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/Spigot-Server-Patches/0347-Optimize-Network-Manager-and-add-advanced-packet-sup.patch index 43c17a28bf..d59cb9f80e 100644 --- a/Spigot-Server-Patches/0347-Optimize-Network-Manager-and-add-advanced-packet-sup.patch +++ b/Spigot-Server-Patches/0347-Optimize-Network-Manager-and-add-advanced-packet-sup.patch @@ -1,4 +1,4 @@ -From 3e4b27fb20f3daa3a10de02dbb640208038ec2c4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 May 2020 04:53:35 -0400 Subject: [PATCH] Optimize Network Manager and add advanced packet support @@ -23,7 +23,7 @@ This should solve some deadlock risks Part of this commit was authored by: Spottedleaf diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index b1dededc15c..b529c888249 100644 +index b1dededc15cce686ead74a99bee64c89ac1de22c..b529c8882491bad278570f322e8a13cfc3588e6c 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -64,6 +64,10 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -189,7 +189,7 @@ index b1dededc15c..b529c888249 100644 if (this.channel.isOpen()) { this.channel.close(); // We can't wait as this may be called from an event loop. diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java -index 2d8e6a2f4a0..45142ed9d24 100644 +index 2d8e6a2f4a0c3c5d74a647d7164b0028781d3bf5..45142ed9d2440e21dd1ff1a32a12759fea4dbcb4 100644 --- a/src/main/java/net/minecraft/server/Packet.java +++ b/src/main/java/net/minecraft/server/Packet.java @@ -11,6 +11,8 @@ public interface Packet { @@ -202,7 +202,7 @@ index 2d8e6a2f4a0..45142ed9d24 100644 return false; } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index e148940ab37..e917d37382d 100644 +index e148940ab3721cff27cf791c159c11b9b94191e4..e917d37382dab70ed9e6b62decf1557c33b26065 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -143,6 +143,7 @@ public abstract class PlayerList { @@ -222,7 +222,7 @@ index e148940ab37..e917d37382d 100644 entityplayer.getStatisticManager().c(); entityplayer.B().a(entityplayer); diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java -index 37a22ba6f7a..06cd29bb9a5 100644 +index 37a22ba6f7a2ac54759428d23d5ea9787bb557f7..06cd29bb9a5d6b67f896c129662c3f493238c758 100644 --- a/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -45,6 +45,7 @@ public class ServerConnection { @@ -233,6 +233,3 @@ index 37a22ba6f7a..06cd29bb9a5 100644 } } // Paper end --- -2.26.2 - diff --git a/Spigot-Server-Patches/0348-Handle-Oversized-Tile-Entities-in-chunks.patch b/Spigot-Server-Patches/0348-Handle-Oversized-Tile-Entities-in-chunks.patch index 992414d533..8303b56472 100644 --- a/Spigot-Server-Patches/0348-Handle-Oversized-Tile-Entities-in-chunks.patch +++ b/Spigot-Server-Patches/0348-Handle-Oversized-Tile-Entities-in-chunks.patch @@ -1,4 +1,4 @@ -From 46d39faab3128c9e0784d79f684421cfd0633385 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 May 2020 05:00:57 -0400 Subject: [PATCH] Handle Oversized Tile Entities in chunks @@ -9,7 +9,7 @@ creating too large of a packet to sed. Co authored by Spottedleaf diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index a0b87f89df7..23223f3f452 100644 +index a0b87f89df77ba8ac6ce3f135d4f3a34ed2b3543..23223f3f45210cf23f44f9012f292db80df781a0 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -23,6 +23,15 @@ public class PacketPlayOutMapChunk implements Packet { @@ -52,6 +52,3 @@ index a0b87f89df7..23223f3f452 100644 NBTTagCompound nbttagcompound = tileentity.b(); if (tileentity instanceof TileEntitySkull) { TileEntitySkull.sanitizeTileEntityUUID(nbttagcompound); } // Paper --- -2.26.2 - diff --git a/Spigot-Server-Patches/0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch index 24ce2234fc..78f0764ea5 100644 --- a/Spigot-Server-Patches/0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch +++ b/Spigot-Server-Patches/0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch @@ -1,4 +1,4 @@ -From 3730a4cd59b2ed66ea859188f3192b34baee9b2e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 16:12:35 -0500 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency @@ -11,7 +11,7 @@ everything to the Whitelist object. https://github.com/PaperMC/Paper/issues/1880 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java -index 8570e38f42e..c97be42dd7b 100644 +index 8570e38f42e2f489e2899ac2f0c4a7b8dda3bb75..c97be42dd7b4c6ea2cadcc97f47185c7f02e2cce 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java @@ -64,6 +64,7 @@ public class JsonList> { @@ -23,7 +23,7 @@ index 8570e38f42e..c97be42dd7b 100644 this.e = flag; } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index e917d37382d..b30b1f68787 100644 +index e917d37382dab70ed9e6b62decf1557c33b26065..b30b1f68787bd72cddd7ead2d607c030f5e1b7eb 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -62,7 +62,7 @@ public abstract class PlayerList { @@ -61,6 +61,3 @@ index e917d37382d..b30b1f68787 100644 } public List b(String s) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch index 3d23663e23..ce29d93f16 100644 --- a/Spigot-Server-Patches/0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch +++ b/Spigot-Server-Patches/0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch @@ -1,4 +1,4 @@ -From fa2447042a27326216b884467d19e78e05ff514f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 4 Mar 2019 02:23:28 -0500 Subject: [PATCH] Set Zombie last tick at start of drowning process @@ -6,7 +6,7 @@ Subject: [PATCH] Set Zombie last tick at start of drowning process Fixes GH-1887 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 2d4f8aac8fa..8635d4f40ca 100644 +index 2d4f8aac8fac1c414d18593c79f767202c757af2..8635d4f40ca153819e0fda014d7ea3795f86b940 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -169,6 +169,7 @@ public class EntityZombie extends EntityMonster { @@ -17,6 +17,3 @@ index 2d4f8aac8fa..8635d4f40ca 100644 } } else { this.bC = -1; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0351-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0351-Allow-Saving-of-Oversized-Chunks.patch index f873ae71f9..93dccd951b 100644 --- a/Spigot-Server-Patches/0351-Allow-Saving-of-Oversized-Chunks.patch +++ b/Spigot-Server-Patches/0351-Allow-Saving-of-Oversized-Chunks.patch @@ -1,4 +1,4 @@ -From 0170a6bb955274d88f237f2414d6b01c7b6f9942 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Feb 2019 01:08:19 -0500 Subject: [PATCH] Allow Saving of Oversized Chunks @@ -31,7 +31,7 @@ this fix, as the data will remain in the oversized file. Once the server returns to a jar with this fix, the data will be restored. diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java -index db66d4ac7dc..2322c0c8c5a 100644 +index db66d4ac7dc1bede8b674cd9ad8f56dd989b6693..2322c0c8c5aacebb6317eab8ce4245554f6d9d55 100644 --- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java @@ -69,6 +69,7 @@ public class NBTCompressedStreamTools { @@ -51,7 +51,7 @@ index db66d4ac7dc..2322c0c8c5a 100644 a((NBTBase) nbttagcompound, dataoutput); } diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index cee1ea8f43e..6b543f89d4e 100644 +index cee1ea8f43e3135cd72a67c1c8067174feaf956e..6b543f89d4e32fb79bfe9aa7b815e4117dbea602 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -17,6 +17,8 @@ import java.nio.file.Files; @@ -156,7 +156,7 @@ index cee1ea8f43e..6b543f89d4e 100644 private final ChunkCoordIntPair b; diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 5065ece393a..942b7d32393 100644 +index 5065ece393a47add3c4e888fd7fb3d9ba47acfed..942b7d323936a872d83c536c1901b4b436aa7e7c 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -42,6 +42,74 @@ public final class RegionFileCache implements AutoCloseable { @@ -255,6 +255,3 @@ index 5065ece393a..942b7d32393 100644 } catch (Throwable throwable1) { throwable = throwable1; throw throwable1; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch index 47dfa44346..5c7c7ebf37 100644 --- a/Spigot-Server-Patches/0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch +++ b/Spigot-Server-Patches/0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch @@ -1,11 +1,11 @@ -From 47fde785e25ff945b9beacaa0430ba95b7939349 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 13 Mar 2019 20:08:09 +0200 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index b30b1f68787..faea0b31ddc 100644 +index b30b1f68787bd72cddd7ead2d607c030f5e1b7eb..faea0b31ddc43f5edabd53756e8b3f796f0c46bf 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1024,6 +1024,7 @@ public abstract class PlayerList { @@ -16,6 +16,3 @@ index b30b1f68787..faea0b31ddc 100644 this.whitelist.setEnabled(flag); // Paper } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0353-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0353-Add-LivingEntity-getTargetEntity.patch index e10ebf1a7d..88500154d2 100644 --- a/Spigot-Server-Patches/0353-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-Server-Patches/0353-Add-LivingEntity-getTargetEntity.patch @@ -1,11 +1,11 @@ -From e619f016a0ec5bca78761599e81bf0907e29b855 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:33:08 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java -index f427953a83c..3fdb52007a2 100644 +index f427953a83c4712dc490bd76e07aaaa0381ff17c..3fdb52007a2cf53b3319e4decf84d99876e830d0 100644 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java @@ -108,6 +108,7 @@ public class AxisAlignedBB { @@ -46,7 +46,7 @@ index f427953a83c..3fdb52007a2 100644 double[] adouble = new double[]{1.0D}; double d0 = vec3d1.x - vec3d.x; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3fc3b76436c..3a1d97c290c 100644 +index 3fc3b76436cd2aba64f5b5881e23e9de4900f59c..3a1d97c290c08d9cc5fcc0c902795e135fcdfaa1 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1475,6 +1475,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -66,7 +66,7 @@ index 3fc3b76436c..3a1d97c290c 100644 return 0.0F; } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index c7c248f63f8..aecd5011cbe 100644 +index c7c248f63f8cfef6d6b095a926028c519ec3ffd4..aecd5011cbe8c6f78be436084621f4c31cdac23a 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -3310,6 +3310,37 @@ public abstract class EntityLiving extends Entity { @@ -108,7 +108,7 @@ index c7c248f63f8..aecd5011cbe 100644 public int getShieldBlockingDelay() { diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index c1f462d9d3e..498f381099b 100644 +index c1f462d9d3eefdab767bea28da484bfb1dfda06a..498f381099b2cf9460104688e12afc5f586e057a 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -18,6 +18,7 @@ public final class IEntitySelector { @@ -120,7 +120,7 @@ index c1f462d9d3e..498f381099b 100644 return !entity.isSpectator(); }; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 9e082d4514e..7d101d96308 100644 +index 9e082d4514eb57667cb50a390bef7ab72b94e838..7d101d9630848b68b15acc5efdc16ae51dc1f132 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -216,6 +216,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -157,6 +157,3 @@ index 9e082d4514e..7d101d96308 100644 // Paper end @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch index 5f1c904401..feae128d09 100644 --- a/Spigot-Server-Patches/0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch +++ b/Spigot-Server-Patches/0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch @@ -1,4 +1,4 @@ -From d6d78cc32a6f2eef77024202d1a006091c4fc7d9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 20 Mar 2019 21:19:29 -0700 Subject: [PATCH] Use proper max length when serialising BungeeCord text @@ -6,7 +6,7 @@ Subject: [PATCH] Use proper max length when serialising BungeeCord text diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java -index 0ab611564ed..f7b2095bb75 100644 +index 0ab611564edc3cd9322e0dbe21832510e9c35bbf..f7b2095bb75ac4533133cf6ad547ccf53492f215 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java @@ -3,7 +3,7 @@ package net.minecraft.server; @@ -30,6 +30,3 @@ index 0ab611564ed..f7b2095bb75 100644 } // Paper end } else { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0355-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0355-Entity-getEntitySpawnReason.patch index d004673237..02bf801e5c 100644 --- a/Spigot-Server-Patches/0355-Entity-getEntitySpawnReason.patch +++ b/Spigot-Server-Patches/0355-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From e40a7b09de9dbe16ad64e56fad91efa3dfc5d965 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:24:52 -0400 Subject: [PATCH] Entity#getEntitySpawnReason @@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3a1d97c290c..030c9992ebe 100644 +index 3a1d97c290c08d9cc5fcc0c902795e135fcdfaa1..030c9992ebeb0a341cb8ae609b2e49658c59dbad 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -59,7 +59,7 @@ index 3a1d97c290c..030c9992ebe 100644 } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index faea0b31ddc..faecf793416 100644 +index faea0b31ddc43f5edabd53756e8b3f796f0c46bf..faecf79341623305a2ae55cb9c4b8844adf0c5bb 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -240,7 +240,7 @@ public abstract class PlayerList { @@ -72,7 +72,7 @@ index faea0b31ddc..faecf793416 100644 }); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index a75034079b0..955003d5f83 100644 +index a75034079b0f5a06509f9762593c5e805e35881c..955003d5f830b3a6988bf1b3b4058c28d5d48f77 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1000,6 +1000,7 @@ public class WorldServer extends World { @@ -84,7 +84,7 @@ index a75034079b0..955003d5f83 100644 if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index bc2df82a5f4..ff60568ce43 100644 +index bc2df82a5f4fb299328a45428c33e67ef153b39a..ff60568ce4320e6ebfa50489a564538b0f57da82 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1053,5 +1053,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -98,6 +98,3 @@ index bc2df82a5f4..ff60568ce43 100644 + } // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0356-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0356-Update-entity-Metadata-for-all-tracked-players.patch index b89a347c9f..a4fcb95a0e 100644 --- a/Spigot-Server-Patches/0356-Update-entity-Metadata-for-all-tracked-players.patch +++ b/Spigot-Server-Patches/0356-Update-entity-Metadata-for-all-tracked-players.patch @@ -1,11 +1,11 @@ -From 6a1e78f606bdaf63e33ad53c875643ee4d23ec0e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AgentTroll Date: Fri, 22 Mar 2019 22:24:03 -0700 Subject: [PATCH] Update entity Metadata for all tracked players diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index 3ff7a7b4a85..3a88c9a6706 100644 +index 3ff7a7b4a853068eba2fb034246a58116a846523..3a88c9a67062eb73ad8257ea786efca7e7e99f65 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -387,6 +387,12 @@ public class EntityTrackerEntry { @@ -22,7 +22,7 @@ index 3ff7a7b4a85..3a88c9a6706 100644 this.f.accept(packet); if (this.tracker instanceof EntityPlayer) { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 94d3d602ccd..f496006f3cc 100644 +index 94d3d602ccd9bc8fdf82eb75f12b1bc39359e1f8..f496006f3cc373ec2c9d8ef73d38389c6574d90b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2006,7 +2006,14 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -41,6 +41,3 @@ index 94d3d602ccd..f496006f3cc 100644 } if (event.isCancelled()) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0357-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0357-Fire-event-on-GS4-query.patch index e46e56a491..22d74c4fd1 100644 --- a/Spigot-Server-Patches/0357-Fire-event-on-GS4-query.patch +++ b/Spigot-Server-Patches/0357-Fire-event-on-GS4-query.patch @@ -1,11 +1,11 @@ -From b66157b0e104e63060671da87f8b7070d77ec623 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 17 Mar 2019 21:46:56 +0200 Subject: [PATCH] Fire event on GS4 query diff --git a/src/main/java/net/minecraft/server/RemoteConnectionThread.java b/src/main/java/net/minecraft/server/RemoteConnectionThread.java -index 66bfbcf02b5..d821ef9a757 100644 +index 66bfbcf02b5584a3abb29f5d7a32e3bb2c6abbea..d821ef9a757494d02eb3be36a619c67562faf967 100644 --- a/src/main/java/net/minecraft/server/RemoteConnectionThread.java +++ b/src/main/java/net/minecraft/server/RemoteConnectionThread.java @@ -15,7 +15,7 @@ public abstract class RemoteConnectionThread implements Runnable { @@ -26,7 +26,7 @@ index 66bfbcf02b5..d821ef9a757 100644 return this.b.getPlayerCount(); } diff --git a/src/main/java/net/minecraft/server/RemoteStatusListener.java b/src/main/java/net/minecraft/server/RemoteStatusListener.java -index f4f4e31d3c2..d5025938473 100644 +index f4f4e31d3c2ee8c7ecbe441f38b518217baa4ba5..d5025938473d3585e83994e890f742cf26c8061e 100644 --- a/src/main/java/net/minecraft/server/RemoteStatusListener.java +++ b/src/main/java/net/minecraft/server/RemoteStatusListener.java @@ -21,19 +21,19 @@ public class RemoteStatusListener extends RemoteConnectionThread { @@ -184,7 +184,7 @@ index f4f4e31d3c2..d5025938473 100644 } } diff --git a/src/main/java/net/minecraft/server/RemoteStatusReply.java b/src/main/java/net/minecraft/server/RemoteStatusReply.java -index 848b5c3f0e0..73efea7e135 100644 +index 848b5c3f0e00f32d565dc5a241e17fa6d152ae8d..73efea7e1354df306c0eadfc52b75ec8ed9883d9 100644 --- a/src/main/java/net/minecraft/server/RemoteStatusReply.java +++ b/src/main/java/net/minecraft/server/RemoteStatusReply.java @@ -18,15 +18,27 @@ public class RemoteStatusReply { @@ -215,6 +215,3 @@ index 848b5c3f0e0..73efea7e135 100644 public void a(short short0) throws IOException { this.b.writeShort(Short.reverseBytes(short0)); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0358-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0358-Implement-PlayerPostRespawnEvent.patch index be84b48fc0..47798aa152 100644 --- a/Spigot-Server-Patches/0358-Implement-PlayerPostRespawnEvent.patch +++ b/Spigot-Server-Patches/0358-Implement-PlayerPostRespawnEvent.patch @@ -1,11 +1,11 @@ -From efb2085aea2ab734b3304938ab927e1346c61124 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MisterVector Date: Fri, 26 Oct 2018 21:31:00 -0700 Subject: [PATCH] Implement PlayerPostRespawnEvent diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index faecf793416..b8302de65a7 100644 +index faecf79341623305a2ae55cb9c4b8844adf0c5bb..b8302de65a7b04790594d23e0bb730b2d3a1b191 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -627,9 +627,14 @@ public abstract class PlayerList { @@ -46,6 +46,3 @@ index faecf793416..b8302de65a7 100644 // CraftBukkit end return entityplayer1; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch index 1dfed50519..1fecfc7491 100644 --- a/Spigot-Server-Patches/0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch +++ b/Spigot-Server-Patches/0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch @@ -1,4 +1,4 @@ -From 1b3e4940f789fd007e51ab14997b1f6d12ae5bdb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:09:20 -0400 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items @@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items vanilla checks for == 0 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index e5c9bac88a5..ef2cf6565b5 100644 +index e5c9bac88a59d52c9b2f05df3e4f373edbe009ca..ef2cf6565b5935b1f1a80f12670609017aebb2c8 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -60,6 +60,7 @@ public class EntityItem extends Entity { @@ -25,6 +25,3 @@ index e5c9bac88a5..ef2cf6565b5 100644 if (this.age != -32768) this.age += elapsedTicks; this.lastTick = MinecraftServer.currentTick; // CraftBukkit end --- -2.26.2 - diff --git a/Spigot-Server-Patches/0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch index 77d1c4dda0..fdb1990678 100644 --- a/Spigot-Server-Patches/0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-Server-Patches/0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From d348aeb4cd8433a29684d89109fbec52c26e20ad Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 20:54:23 -0500 Subject: [PATCH] Implement getters and setters for EntityItem owner and @@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -index 3f552b5905e..cb756b1ba04 100644 +index 3f552b5905e5ed51c887ad02410297dd5e2e165f..cb756b1ba0438045904a1b3fe8e827e8f1e105bd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java @@ -8,6 +8,11 @@ import org.bukkit.entity.EntityType; @@ -50,6 +50,3 @@ index 3f552b5905e..cb756b1ba04 100644 // Paper End @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0361-Server-Tick-Events.patch b/Spigot-Server-Patches/0361-Server-Tick-Events.patch index bdccd2ef1b..db2d5cb2bb 100644 --- a/Spigot-Server-Patches/0361-Server-Tick-Events.patch +++ b/Spigot-Server-Patches/0361-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From 5deb0eb94ead4e4a486ec4bcdd8eab5554935401 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 22:48:45 -0400 Subject: [PATCH] Server Tick Events @@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events Fires event at start and end of a server tick diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3d9cc2ce67b..249eaf56bc0 100644 +index 3d9cc2ce67b5dc033df397e8d1c31f718792dcc4..249eaf56bc0ec9eb99fdf8958d3ebe2b18999819 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1089,6 +1089,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 27 Mar 2019 23:01:33 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep @@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 17c9c90359f..f375c9507c0 100644 +index 17c9c90359fc3e76b6fe77b5d61f62a8d03a914c..f375c9507c0ec0c2f810f8fff5304e70e02b7064 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -516,6 +516,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -72,6 +72,3 @@ index 17c9c90359f..f375c9507c0 100644 } this.setSpectatorTarget(this); // Remove spectated target --- -2.26.2 - diff --git a/Spigot-Server-Patches/0363-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0363-Optimize-Captured-TileEntity-Lookup.patch index 59333d4297..facb96139e 100644 --- a/Spigot-Server-Patches/0363-Optimize-Captured-TileEntity-Lookup.patch +++ b/Spigot-Server-Patches/0363-Optimize-Captured-TileEntity-Lookup.patch @@ -1,4 +1,4 @@ -From 7a9d022f868304772dd7371ea54c01d8b265e0c2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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,7 +10,7 @@ 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 a3fbdf5db5c..f797d737a37 100644 +index a3fbdf5db5cd1f08e9920bbc786705f69f465efd..f797d737a374f222e94c132dea7fada5374b49e4 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -998,12 +998,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -30,6 +30,3 @@ index a3fbdf5db5c..f797d737a37 100644 if (this.tickingTileEntities) { tileentity = this.e(blockposition); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0364-Add-Heightmap-API.patch b/Spigot-Server-Patches/0364-Add-Heightmap-API.patch index 9fb5ab96f7..288cecdad0 100644 --- a/Spigot-Server-Patches/0364-Add-Heightmap-API.patch +++ b/Spigot-Server-Patches/0364-Add-Heightmap-API.patch @@ -1,11 +1,11 @@ -From 03c72e21e244c7c8beb80f9767b4b8db173b0dc8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 f797d737a37..983bc1c7d9c 100644 +index f797d737a374f222e94c132dea7fada5374b49e4..983bc1c7d9c0745b34fac8afc27ed8a275c0ad78 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -573,8 +573,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -20,7 +20,7 @@ index f797d737a37..983bc1c7d9c 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 db31b17b870..0d5731429ab 100644 +index db31b17b87084c47402f5452872f385629c58382..0d5731429abe7b4ff97d6644ff088063dde19e60 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -339,6 +339,29 @@ public class CraftWorld implements World { @@ -53,6 +53,3 @@ index db31b17b870..0d5731429ab 100644 @Override public Location getSpawnLocation() { BlockPosition spawn = world.getSpawn(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0365-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0365-Mob-Spawner-API-Enhancements.patch index 1722af119c..a36af687a1 100644 --- a/Spigot-Server-Patches/0365-Mob-Spawner-API-Enhancements.patch +++ b/Spigot-Server-Patches/0365-Mob-Spawner-API-Enhancements.patch @@ -1,11 +1,11 @@ -From 820419ffdc15ff3e0b1136313ab35bebec02ee66 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 19 Apr 2019 12:41:13 -0500 Subject: [PATCH] Mob Spawner API Enhancements diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index cb7cb789b82..41001b02a65 100644 +index cb7cb789b82461093fbbb4c8ae6d03fcbfe57383..41001b02a654194c4a8e25ad5f7af8fdd91090b2 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -47,6 +47,7 @@ public abstract class MobSpawnerAbstract { @@ -82,7 +82,7 @@ index cb7cb789b82..41001b02a65 100644 nbttagcompound.setShort("MaxNearbyEntities", (short) this.maxNearbyEntities); nbttagcompound.setShort("RequiredPlayerRange", (short) this.requiredPlayerRange); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java -index 5c4c3c70c74..e78e3804bad 100644 +index 5c4c3c70c7450a3e556d664a1bf6bcaf8e3a571c..e78e3804bad9b0b6004939cadf40465dec68fdba 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java @@ -121,4 +121,16 @@ public class CraftCreatureSpawner extends CraftBlockEntityState Date: Mon, 6 May 2019 01:29:25 -0400 Subject: [PATCH] Per-Player View Distance API placeholders @@ -7,7 +7,7 @@ I hope to look at this more in-depth soon. It appears doable. However this should not block the update. diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 6a4ccaeb0fe..5bf99e0028b 100644 +index 6a4ccaeb0fef2cabab87b33bf89b5a68608800e9..5bf99e0028b886a6ba1d2f39f8dc4cd3c9aa0943 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -579,9 +579,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -23,7 +23,7 @@ index 6a4ccaeb0fe..5bf99e0028b 100644 double deltaX = this.locX() - player.locX(); double deltaZ = this.locZ() - player.locZ(); diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index 2e95069c190..2f466af4d56 100644 +index 2e95069c1907df951680f2a00441a72500c48430..2f466af4d56d6f87c9d98226276b041ba2e89ac5 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -208,9 +208,9 @@ public class EntityWither extends EntityMonster implements IRangedEntity { @@ -39,7 +39,7 @@ index 2e95069c190..2f466af4d56 100644 double deltaX = this.locX() - player.locX(); double deltaZ = this.locZ() - player.locZ(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6e3bcfe2cd7..6672feaf519 100644 +index 6e3bcfe2cd77cd1fd592f8148f5286be3099cb24..6672feaf5198b89969796185a2fc110308678eb0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1959,6 +1959,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -59,6 +59,3 @@ index 6e3bcfe2cd7..6672feaf519 100644 // Paper end // Spigot start --- -2.26.2 - diff --git a/Spigot-Server-Patches/0367-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0367-Fix-CB-call-to-changed-postToMainThread-method.patch index a3a4535e23..ea4a28fbf1 100644 --- a/Spigot-Server-Patches/0367-Fix-CB-call-to-changed-postToMainThread-method.patch +++ b/Spigot-Server-Patches/0367-Fix-CB-call-to-changed-postToMainThread-method.patch @@ -1,11 +1,11 @@ -From 1a82c85c9131e8d849c299a84f6faaad89126a8e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 10 May 2019 18:38:19 +0100 Subject: [PATCH] Fix CB call to changed postToMainThread method diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f496006f3cc..65c171cec3c 100644 +index f496006f3cc373ec2c9d8ef73d38389c6574d90b..65c171cec3cc7c7c7433c63b3718fa7e1c16f148 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -286,7 +286,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -17,6 +17,3 @@ index f496006f3cc..65c171cec3c 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch index 26881a6d95..b74fb1507e 100644 --- a/Spigot-Server-Patches/0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch +++ b/Spigot-Server-Patches/0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch @@ -1,4 +1,4 @@ -From adcbdd24b1904b926deb18cb52aaf5bdc6bef916 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sat, 27 Apr 2019 20:00:43 +0100 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450) @@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450) This also fixes the adding sound playing when the item frame direction is changed. diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java -index 9b1e07452f9..f8a2f32f1d9 100644 +index 9b1e07452f9e7e9a6d069d6e62112a487ff288d4..f8a2f32f1d93e3cdbc7c40783beef05f5f05794f 100644 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java @@ -224,7 +224,7 @@ public class EntityItemFrame extends EntityHanging { @@ -19,7 +19,7 @@ index 9b1e07452f9..f8a2f32f1d9 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java -index 2873ff9d1f0..a3613edcbb5 100644 +index 2873ff9d1f006b76c27f5d2a4b943e3fe3df7d9b..a3613edcbb538721bc850e04c8e8d27556a17aa6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java @@ -49,7 +49,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame { @@ -31,6 +31,3 @@ index 2873ff9d1f0..a3613edcbb5 100644 world.addEntity(frame); this.entity = frame; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch index 1e893b5304..28075d11ad 100644 --- a/Spigot-Server-Patches/0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch +++ b/Spigot-Server-Patches/0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch @@ -1,4 +1,4 @@ -From d852e8603fe42022eadb6c3098ca1fc5d105f51f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 @@ -16,7 +16,7 @@ handling that should have been handled synchronously will be handled synchronously when the server gets shut down. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 249eaf56bc0..45882ee30f5 100644 +index 249eaf56bc0ec9eb99fdf8958d3ebe2b18999819..45882ee30f52067909d55bca9202df66a9a48677 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2217,7 +2217,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 28 Sep 2018 21:49:53 -0400 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks @@ -19,7 +19,7 @@ This change ensures the chunks are always loaded when entities are added to the world, or a valid entity moves between chunks. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 955003d5f83..6da2392915e 100644 +index 955003d5f830b3a6988bf1b3b4058c28d5d48f77..6da2392915eb197a6e4193470f2d9a31981f1f98 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -707,7 +707,7 @@ public class WorldServer extends World { @@ -40,6 +40,3 @@ index 955003d5f83..6da2392915e 100644 if (!(ichunkaccess instanceof Chunk)) { return false; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0371-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0371-Duplicate-UUID-Resolve-Option.patch index de6d9d3789..dffd1d6ddd 100644 --- a/Spigot-Server-Patches/0371-Duplicate-UUID-Resolve-Option.patch +++ b/Spigot-Server-Patches/0371-Duplicate-UUID-Resolve-Option.patch @@ -1,4 +1,4 @@ -From ef0a83ad4172464d369414ca845de3c00cf356ec Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 14:27:34 -0400 Subject: [PATCH] Duplicate UUID Resolve Option @@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA It is recommended you regenerate the entities, as these were legit entities, and deserve your love. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 4ba72275b96..572679e4d1c 100644 +index 4ba72275b965693f3650f9b4fb138d3320d1b88b..572679e4d1ca0d84a08a5c48542fa40d426461e5 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -442,4 +442,43 @@ public class PaperWorldConfig { @@ -81,7 +81,7 @@ index 4ba72275b96..572679e4d1c 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 8e9ddca049f..165cb994e84 100644 +index 8e9ddca049f837ed1c5fc4aa9fd6a6858dbc36be..165cb994e84bbcbdeb5ec14b561433257fd0df28 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -492,6 +492,7 @@ public class Chunk implements IChunkAccess { @@ -93,7 +93,7 @@ index 8e9ddca049f..165cb994e84 100644 int k = MathHelper.floor(entity.locY() / 16.0D); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 030c9992ebe..fd6dad8437b 100644 +index 030c9992ebeb0a341cb8ae609b2e49658c59dbad..fd6dad8437b6a73439b1b4bae34902e1c71c9bd3 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2749,6 +2749,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -105,7 +105,7 @@ index 030c9992ebe..fd6dad8437b 100644 this.uniqueID = uuid; this.am = this.uniqueID.toString(); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 4ee26ff08f7..1d255ce3833 100644 +index 4ee26ff08f7a058648ab54f0dcd81b466a9aced1..1d255ce3833a0ea735bedbb33ae8259751346ab2 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,6 +1,7 @@ @@ -197,7 +197,7 @@ index 4ee26ff08f7..1d255ce3833 100644 ChunkCoordIntPair chunkcoordintpair = playerchunk.i(); CompletableFuture, PlayerChunk.Failure>> completablefuture = this.a(chunkcoordintpair, 1, (i) -> { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6da2392915e..081df240f30 100644 +index 6da2392915eb197a6e4193470f2d9a31981f1f98..081df240f3066008e7aebee92c6b78487ecda377 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -3,6 +3,8 @@ package net.minecraft.server; @@ -235,6 +235,3 @@ index 6da2392915e..081df240f30 100644 return true; } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0372-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0372-improve-CraftWorld-isChunkLoaded.patch index bd12a45cc2..697a2b033e 100644 --- a/Spigot-Server-Patches/0372-improve-CraftWorld-isChunkLoaded.patch +++ b/Spigot-Server-Patches/0372-improve-CraftWorld-isChunkLoaded.patch @@ -1,4 +1,4 @@ -From 0508c10e21274ebf11d37c0814625ab35675e76f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 21 May 2019 02:34:04 +0100 Subject: [PATCH] improve CraftWorld#isChunkLoaded @@ -9,7 +9,7 @@ waiting for the execution queue to get to our request; We can just query the chunk status and get a response now, vs having to wait diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 0d5731429ab..5ea7b0b25ae 100644 +index 0d5731429abe7b4ff97d6644ff088063dde19e60..5ea7b0b25ae837645f690443d674ce7eb48c1692 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -405,14 +405,13 @@ public class CraftWorld implements World { @@ -29,6 +29,3 @@ index 0d5731429ab..5ea7b0b25ae 100644 } catch (IOException ex) { throw new RuntimeException(ex); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch index e59ab1d870..19263a5bfb 100644 --- a/Spigot-Server-Patches/0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From 5cbff57039db1e60204a869d6629d1472501956a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world This lets you disable it for some worlds and lower it for others. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 572679e4d1c..071e5e7f729 100644 +index 572679e4d1ca0d84a08a5c48542fa40d426461e5..071e5e7f729d6c3ffb70506e7ef32eebee1e9118 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -481,4 +481,10 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 572679e4d1c..071e5e7f729 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 45882ee30f5..0ee1d8e4869 100644 +index 45882ee30f52067909d55bca9202df66a9a48677..0ee1d8e4869bfd0ccba21a227e115a36ff027984 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -586,6 +586,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 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 983bc1c7d9c..8cf3c10274b 100644 +index 983bc1c7d9c0745b34fac8afc27ed8a275c0ad78..8cf3c10274b8320bf1938b95dd9f447deeb2c4d0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -86,6 +86,23 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -33,7 +33,7 @@ index 983bc1c7d9c..8cf3c10274b 100644 public CraftWorld getWorld() { return this.world; diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java -index 22e14fe1e98..e2af6d43b2e 100644 +index 22e14fe1e98c8439f8db74c9464137a497fdaf7c..e2af6d43b2eafeecad8fd070fc70195c7b0bb93f 100644 --- a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java +++ b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java @@ -23,18 +23,18 @@ public class WorldGenFeatureStateProviderWeighted extends WorldGenFeatureStatePr @@ -59,7 +59,7 @@ index 22e14fe1e98..e2af6d43b2e 100644 builder.put(dynamicops.createString("type"), dynamicops.createString(IRegistry.t.getKey(this.a).toString())).put(dynamicops.createString("entries"), this.b.a(dynamicops, (iblockdata) -> { diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java -index fc4348b6024..44be7169ffd 100644 +index fc4348b60242e4a9d8612c3b8ce01711c32f4b1c..44be7169ffd5961df28d21a319d2cc7569662baf 100644 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java @@ -10,10 +10,12 @@ import javax.annotation.Nullable; @@ -221,6 +221,3 @@ index fc4348b6024..44be7169ffd 100644 } } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch index f3f51bc15d..dbbdb079c7 100644 --- a/Spigot-Server-Patches/0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch +++ b/Spigot-Server-Patches/0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch @@ -1,4 +1,4 @@ -From 8e94206baea84377f5af244de9b5081b4805f69b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 27 May 2019 17:35:39 -0500 Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative @@ -6,7 +6,7 @@ Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative diff --git a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java -index e8f3e55fd3f..44289c23013 100644 +index e8f3e55fd3feb4f35bc37dd2fe03925352929bac..44289c23013d14af589762442d83ba5a2c79c4ad 100644 --- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java +++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java @@ -175,6 +175,12 @@ public class EntityAreaEffectCloud extends Entity { @@ -22,6 +22,3 @@ index e8f3e55fd3f..44289c23013 100644 if (this.world.isClientSide) { ParticleParam particleparam = this.getParticle(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0376-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0376-ChunkMapDistance-CME.patch index a53ea9d156..961614e788 100644 --- a/Spigot-Server-Patches/0376-ChunkMapDistance-CME.patch +++ b/Spigot-Server-Patches/0376-ChunkMapDistance-CME.patch @@ -1,11 +1,11 @@ -From 384ed7ddbd1fb6ee901787fc1b89fd8078bd6421 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 29 May 2019 04:01:22 +0100 Subject: [PATCH] ChunkMapDistance CME diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index ae661297774..0244768f76d 100644 +index ae661297774f51c8b61fc08ca43e13ba368d0021..0244768f76d83af427a07bd235c9bcec8ad5429e 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -33,7 +33,7 @@ public abstract class ChunkMapDistance { @@ -49,6 +49,3 @@ index ae661297774..0244768f76d 100644 return true; } else { if (!this.l.isEmpty()) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0377-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0377-Implement-CraftBlockSoundGroup.patch index e3a41ac798..b11752d229 100644 --- a/Spigot-Server-Patches/0377-Implement-CraftBlockSoundGroup.patch +++ b/Spigot-Server-Patches/0377-Implement-CraftBlockSoundGroup.patch @@ -1,4 +1,4 @@ -From 16268e83f7a03f9362cc71c8485458ac118f6850 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: simpleauthority Date: Tue, 28 May 2019 03:48:51 -0700 Subject: [PATCH] Implement CraftBlockSoundGroup @@ -6,7 +6,7 @@ Subject: [PATCH] Implement CraftBlockSoundGroup diff --git a/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java new file mode 100644 -index 00000000000..99f99330d01 +index 0000000000000000000000000000000000000000..99f99330d01fc61ce8ede9f225b0c42bd8f9ded1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java @@ -0,0 +1,38 @@ @@ -49,7 +49,7 @@ index 00000000000..99f99330d01 + } +} diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java -index c1ff62aa525..de43881653f 100644 +index c1ff62aa52595decd7ed8278eb63e7c6e46feefe..de43881653ff37e38dc42c7f953dc96126a30c61 100644 --- a/src/main/java/net/minecraft/server/IBlockData.java +++ b/src/main/java/net/minecraft/server/IBlockData.java @@ -275,6 +275,7 @@ public class IBlockData extends BlockDataAbstract implements @@ -61,7 +61,7 @@ index c1ff62aa525..de43881653f 100644 return this.getBlock().getStepSound(this); } diff --git a/src/main/java/net/minecraft/server/SoundEffectType.java b/src/main/java/net/minecraft/server/SoundEffectType.java -index b774d2d8d90..0184bf3fc9e 100644 +index b774d2d8d903acc1ce4c5bd9240b2e96779e1d53..0184bf3fc9e206cec003c5a325d5ee21f6b59dda 100644 --- a/src/main/java/net/minecraft/server/SoundEffectType.java +++ b/src/main/java/net/minecraft/server/SoundEffectType.java @@ -27,10 +27,10 @@ public class SoundEffectType { @@ -96,7 +96,7 @@ index b774d2d8d90..0184bf3fc9e 100644 return this.D; } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index ef81c1d3a96..db446c25c41 100644 +index ef81c1d3a9679b0e65b453431de3cd0216f05bb6..db446c25c41ec3122155510f9d96dfdeee626896 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -701,4 +701,11 @@ public class CraftBlock implements Block { @@ -111,6 +111,3 @@ index ef81c1d3a96..db446c25c41 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0378-Chunk-debug-command.patch b/Spigot-Server-Patches/0378-Chunk-debug-command.patch index 29dca4c934..693e358e7d 100644 --- a/Spigot-Server-Patches/0378-Chunk-debug-command.patch +++ b/Spigot-Server-Patches/0378-Chunk-debug-command.patch @@ -1,4 +1,4 @@ -From 90e4bcf58d0c12a6b6069c3f829ae0a65d07a18a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 1 Jun 2019 13:00:55 -0700 Subject: [PATCH] Chunk debug command @@ -32,7 +32,7 @@ https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528273&page=com.atlass https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528577&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-528577 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 5acad8e44f0..af810987846 100644 +index 5acad8e44f024d3ddf5ef4fd320460ac516e0fb8..af810987846efcd2bffbd23c31481b2d31c168dd 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -28,14 +28,14 @@ public class PaperCommand extends Command { @@ -185,7 +185,7 @@ index 5acad8e44f0..af810987846 100644 * Ported from MinecraftForge - author: LexManos - License: LGPLv2.1 */ diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 8c6550433c2..e6d08756f76 100644 +index 8c6550433c20c54cbe390219821ce393c5720da8..e6d08756f76360b29b29f18305e5ec84d09f2d54 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -22,7 +22,7 @@ import org.apache.logging.log4j.Logger; @@ -198,7 +198,7 @@ index 8c6550433c2..e6d08756f76 100644 public final ChunkGenerator chunkGenerator; private final WorldServer world; diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 3342278bcd4..2dcecc1bbd0 100644 +index 3342278bcd42a6d5a1793e33bc7fe4356be02451..2dcecc1bbd00e46b0a9b5e48bc580475fc8b4cb3 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -4,7 +4,13 @@ import com.destroystokyo.paper.block.TargetBlockInfo; @@ -399,7 +399,7 @@ index 3342278bcd4..2dcecc1bbd0 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 6e9f402fb0f..a640cb3845a 100644 +index 6e9f402fb0faccc222b4289deb36e2d85a66eb7c..a640cb3845a853780b8cc2dbfc6e9be3728817e7 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -26,7 +26,7 @@ public class PlayerChunk { @@ -412,7 +412,7 @@ index 6e9f402fb0f..a640cb3845a 100644 private int dirtyCount; private int r; diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 1d255ce3833..34f470779fa 100644 +index 1d255ce3833a0ea735bedbb33ae8259751346ab2..34f470779fa5d1cf9638431253024481236c073b 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -58,7 +58,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -434,7 +434,7 @@ index 1d255ce3833..34f470779fa 100644 private final DefinedStructureManager definedStructureManager; private final File w; diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java -index 77bb6b092a0..7a8397815a5 100644 +index 77bb6b092a0763ff27f90f0401a8a81b15aebb8c..7a8397815a5b7f79f3e3a0348aeedf63fe879f8f 100644 --- a/src/main/java/net/minecraft/server/Ticket.java +++ b/src/main/java/net/minecraft/server/Ticket.java @@ -6,8 +6,8 @@ public final class Ticket implements Comparable> { @@ -456,6 +456,3 @@ index 77bb6b092a0..7a8397815a5 100644 public int b() { return this.b; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0379-incremental-chunk-saving.patch b/Spigot-Server-Patches/0379-incremental-chunk-saving.patch index f9b29e273d..136d25fbb7 100644 --- a/Spigot-Server-Patches/0379-incremental-chunk-saving.patch +++ b/Spigot-Server-Patches/0379-incremental-chunk-saving.patch @@ -1,11 +1,11 @@ -From c03e491a8ed8909f4fb05239f72cd6701aa85c3c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 9 Jun 2019 03:53:22 +0100 Subject: [PATCH] incremental chunk saving diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 071e5e7f729..48676152152 100644 +index 071e5e7f729d6c3ffb70506e7ef32eebee1e9118..48676152152faf7a7b9524ac37d8b4a8c32c4e2c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -487,4 +487,19 @@ public class PaperWorldConfig { @@ -29,7 +29,7 @@ index 071e5e7f729..48676152152 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 165cb994e84..af0d6aff4de 100644 +index 165cb994e84bbcbdeb5ec14b561433257fd0df28..af0d6aff4de78e81fd3feb16719efdccc05ccb90 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -42,7 +42,7 @@ public class Chunk implements IChunkAccess { @@ -42,7 +42,7 @@ index 165cb994e84..af0d6aff4de 100644 private long inhabitedTime; @Nullable diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index e6d08756f76..6713b7667ae 100644 +index e6d08756f76360b29b29f18305e5ec84d09f2d54..6713b7667ae4fe3f1f555a71321832b4a9492162 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -515,6 +515,15 @@ public class ChunkProviderServer extends IChunkProvider { @@ -62,7 +62,7 @@ index e6d08756f76..6713b7667ae 100644 public void close() throws IOException { // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0ee1d8e4869..7ecf7812631 100644 +index 0ee1d8e4869bfd0ccba21a227e115a36ff027984..7ecf781263179d87c943b08e192d8f010cf20d3e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -168,6 +168,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 100) { // Spigot diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index a640cb3845a..3d255b19647 100644 +index a640cb3845a853780b8cc2dbfc6e9be3728817e7..3d255b19647fb37f53a420c907bc634181580c18 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -40,6 +40,9 @@ public class PlayerChunk { @@ -175,7 +175,7 @@ index a640cb3845a..3d255b19647 100644 public void a(ProtoChunkExtension protochunkextension) { for (int i = 0; i < this.statusFutures.length(); ++i) { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 34f470779fa..4f5b5161448 100644 +index 34f470779fa5d1cf9638431253024481236c073b..4f5b516144829a7ae11f21a56789ac7a1f256250 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -332,6 +332,64 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -261,7 +261,7 @@ index 34f470779fa..4f5b5161448 100644 return PlayerChunk.getChunkState(playerchunk.getTicketLevel()); }); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ce506e0e129..ad5e538b249 100644 +index ce506e0e1293343ce5f9b6fbb71ef593abaf515b..ad5e538b2498ed0e6d0cb79a6d5055732cddbc14 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -814,11 +814,44 @@ public class WorldServer extends World { @@ -318,6 +318,3 @@ index ce506e0e129..ad5e538b249 100644 protected void m_() throws ExceptionWorldConflict { this.checkSession(); this.worldProvider.i(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0380-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0380-Catch-exceptions-from-dispenser-entity-spawns.patch index 7e39cf3a22..7fccaa308e 100644 --- a/Spigot-Server-Patches/0380-Catch-exceptions-from-dispenser-entity-spawns.patch +++ b/Spigot-Server-Patches/0380-Catch-exceptions-from-dispenser-entity-spawns.patch @@ -1,11 +1,11 @@ -From e91ccdfcf67e3cb91dfac91124dc2b9b90d458ad Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 10 Jun 2019 09:36:40 +0100 Subject: [PATCH] Catch exceptions from dispenser entity spawns diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java -index 5a8c4dc6ba3..b6b7e3c6c97 100644 +index 5a8c4dc6ba370af2da15949c1b514317a85e743b..b6b7e3c6c973886e35bde0bf10787b62c7f015ca 100644 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java @@ -163,7 +163,14 @@ public interface IDispenseBehavior { @@ -23,6 +23,3 @@ index 5a8c4dc6ba3..b6b7e3c6c97 100644 // itemstack.subtract(1); // Handled during event processing // CraftBukkit end return itemstack; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0381-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0381-Fix-World-isChunkGenerated-calls.patch index 32f6adfd00..744b0afbf2 100644 --- a/Spigot-Server-Patches/0381-Fix-World-isChunkGenerated-calls.patch +++ b/Spigot-Server-Patches/0381-Fix-World-isChunkGenerated-calls.patch @@ -1,4 +1,4 @@ -From 9c05bc01b61c0d3e656e41ba6e037f24422aa8f5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 15 Jun 2019 08:54:33 -0700 Subject: [PATCH] Fix World#isChunkGenerated calls @@ -8,7 +8,7 @@ This patch also adds a chunk status cache on region files (note that its only purpose is to cache the status on DISK) diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 6713b7667ae..4c9c8e48397 100644 +index 6713b7667ae4fe3f1f555a71321832b4a9492162..4c9c8e483974f8869d6711626620cfd7d814d956 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -28,7 +28,7 @@ public class ChunkProviderServer extends IChunkProvider { @@ -43,7 +43,7 @@ index 6713b7667ae..4c9c8e48397 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index f54572773c2..8e4b3e52cbc 100644 +index f54572773c25b6716a68166efa8d3fc8b22b6258..8e4b3e52cbc95e24b1d72aed9ec8c32b94a91561 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -403,6 +403,17 @@ public class ChunkRegionLoader { @@ -65,7 +65,7 @@ index f54572773c2..8e4b3e52cbc 100644 if (nbttagcompound != null) { ChunkStatus chunkstatus = ChunkStatus.a(nbttagcompound.getCompound("Level").getString("Status")); diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java -index efdf611e66f..134a4f0b7d2 100644 +index efdf611e66ffd782291de749d8a48f3bf08f2129..134a4f0b7d254b5dd8ca26a9c5874532826978c4 100644 --- a/src/main/java/net/minecraft/server/ChunkStatus.java +++ b/src/main/java/net/minecraft/server/ChunkStatus.java @@ -176,6 +176,7 @@ public class ChunkStatus { @@ -95,7 +95,7 @@ index efdf611e66f..134a4f0b7d2 100644 return (ChunkStatus) IRegistry.CHUNK_STATUS.get(MinecraftKey.a(s)); } diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java -index f0a052eec2f..2f95174fcc4 100644 +index f0a052eec2fb72b11dc70bf62a5e57f599bbc190..2f95174fcc467908808ed3f2dc956bdcafdc3558 100644 --- a/src/main/java/net/minecraft/server/IChunkLoader.java +++ b/src/main/java/net/minecraft/server/IChunkLoader.java @@ -8,7 +8,7 @@ import javax.annotation.Nullable; @@ -108,7 +108,7 @@ index f0a052eec2f..2f95174fcc4 100644 @Nullable private PersistentStructureLegacy c; diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 3d255b19647..040d4b41ea2 100644 +index 3d255b19647fb37f53a420c907bc634181580c18..040d4b41ea2223937ca22de2d40560f97b310f9a 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -114,6 +114,19 @@ public class PlayerChunk { @@ -132,7 +132,7 @@ index 3d255b19647..040d4b41ea2 100644 public CompletableFuture> getStatusFutureUnchecked(ChunkStatus chunkstatus) { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 4f5b5161448..1d517fd1aea 100644 +index 4f5b516144829a7ae11f21a56789ac7a1f256250..1d517fd1aea90edf470388fd857a41f2be149327 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -969,12 +969,62 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -201,7 +201,7 @@ index 4f5b5161448..1d517fd1aea 100644 // Spigot start return isOutsideOfRange(chunkcoordintpair, false); diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index 6b543f89d4e..d37abf2cf30 100644 +index 6b543f89d4e32fb79bfe9aa7b815e4117dbea602..d37abf2cf304f81405e570588c8accbc44a629f4 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -36,6 +36,30 @@ public class RegionFile implements AutoCloseable { @@ -250,7 +250,7 @@ index 6b543f89d4e..d37abf2cf30 100644 this.c(); } finally { diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 942b7d32393..2f8af42e2aa 100644 +index 942b7d323936a872d83c536c1901b4b436aa7e7c..2f8af42e2aadeb1b11db94fdb54ec0ba9e30f095 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -18,7 +18,14 @@ public final class RegionFileCache implements AutoCloseable { @@ -280,7 +280,7 @@ index 942b7d32393..2f8af42e2aa 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 8f8c18c5a4f..50467656df0 100644 +index 8f8c18c5a4f483acee0d61a8007577ac8193bef9..50467656df0b54c2dcba8696b5677a2fc975b178 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -19,6 +19,7 @@ import java.util.Objects; @@ -375,6 +375,3 @@ index 8f8c18c5a4f..50467656df0 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0382-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0382-Show-blockstate-location-if-we-failed-to-read-it.patch index 1706e20b7b..76414879fa 100644 --- a/Spigot-Server-Patches/0382-Show-blockstate-location-if-we-failed-to-read-it.patch +++ b/Spigot-Server-Patches/0382-Show-blockstate-location-if-we-failed-to-read-it.patch @@ -1,11 +1,11 @@ -From 68d3254c13adaa72ad19d365d9b93228659f8f6a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 15 Jun 2019 10:28:25 -0700 Subject: [PATCH] Show blockstate location if we failed to read it diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index f6401e2cde9..3e22d558ea0 100644 +index f6401e2cde9d56547cee7f8d9e4b2a58764ee895..3e22d558ea09a6554e1bc71f8ca10277ec480705 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -19,6 +19,8 @@ public class CraftBlockEntityState extends CraftBlockState @@ -32,6 +32,3 @@ index f6401e2cde9..3e22d558ea0 100644 } public final boolean snapshotDisabled; // Paper --- -2.26.2 - diff --git a/Spigot-Server-Patches/0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch b/Spigot-Server-Patches/0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch index 01a4bda272..8c582ade94 100644 --- a/Spigot-Server-Patches/0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch +++ b/Spigot-Server-Patches/0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch @@ -1,4 +1,4 @@ -From 752b4b4ee83b0fb68b360836985b4b5868f5193f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 21 Jun 2019 14:42:48 -0700 Subject: [PATCH] Log other thread in DataPaletteBlock lock failure @@ -6,7 +6,7 @@ Subject: [PATCH] Log other thread in DataPaletteBlock lock failure diff --git a/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java new file mode 100644 -index 00000000000..a3b174618d4 +index 0000000000000000000000000000000000000000..a3b174618d4947bc1f1b94df8dd4fe2ccf719fe9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java @@ -0,0 +1,11 @@ @@ -22,7 +22,7 @@ index 00000000000..a3b174618d4 + } +} diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index d5f5a51872d..2c1d1b1a556 100644 +index d5f5a51872dfabdbb828b6c20d61893aed2efec7..2c1d1b1a5568ab104fb1a0f283f289680d59e81e 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -22,14 +22,17 @@ public class DataPaletteBlock implements DataPaletteExpandable { @@ -46,6 +46,3 @@ index d5f5a51872d..2c1d1b1a556 100644 CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Thread dumps"); crashreportsystemdetails.a("Thread dumps", (Object) s); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch b/Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch index 0e7bdbdcbc..f94c70b4cf 100644 --- a/Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch +++ b/Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch @@ -1,4 +1,4 @@ -From fcb0693eae0508c934823b90905ecac2ba6fc5f8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 22 Jun 2019 04:20:47 -0700 Subject: [PATCH] Use ChunkStatus cache when saving protochunks @@ -7,7 +7,7 @@ The cache should contain the chunk status when saving. If not it will load it. diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 1d517fd1aea..9171785ad54 100644 +index 1d517fd1aea90edf470388fd857a41f2be149327..9171785ad54a26e95dea8b30509c1e49a5d9b22d 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -845,8 +845,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -23,6 +23,3 @@ index 1d517fd1aea..9171785ad54 100644 return false; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0385-Anti-Xray.patch b/Spigot-Server-Patches/0385-Anti-Xray.patch index 66da612058..3af4016135 100644 --- a/Spigot-Server-Patches/0385-Anti-Xray.patch +++ b/Spigot-Server-Patches/0385-Anti-Xray.patch @@ -1,11 +1,11 @@ -From 081c30c2fad9c1e70600d092292f753ca4054587 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 48676152152..ca2ac17747d 100644 +index 48676152152faf7a7b9524ac37d8b4a8c32c4e2c..ca2ac17747d4f2acf1df056759c5c182be050125 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -1,7 +1,9 @@ @@ -54,7 +54,7 @@ index 48676152152..ca2ac17747d 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 00000000000..df7e4183d88 +index 0000000000000000000000000000000000000000..df7e4183d8842f5be8ae9d0698f8fa90742ff43c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java @@ -0,0 +1,40 @@ @@ -100,7 +100,7 @@ index 00000000000..df7e4183d88 +} 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 00000000000..9c017eb027c +index 0000000000000000000000000000000000000000..9c017eb027ce52ea6a2414af2d0190b3bd52522c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java @@ -0,0 +1,628 @@ @@ -734,7 +734,7 @@ index 00000000000..9c017eb027c +} 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 00000000000..41618994b46 +index 0000000000000000000000000000000000000000..41618994b463267e41a9eb312db682e497c68e1b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java @@ -0,0 +1,81 @@ @@ -821,7 +821,7 @@ index 00000000000..41618994b46 +} 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 00000000000..e61421d87a1 +index 0000000000000000000000000000000000000000..e61421d87a19bf2f6ce8836b48c445ffdb6772df --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java @@ -0,0 +1,30 @@ @@ -857,7 +857,7 @@ index 00000000000..e61421d87a1 +} 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 00000000000..c5a7b186e96 +index 0000000000000000000000000000000000000000..c5a7b186e96901d55680283500f423025ededbe8 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java @@ -0,0 +1,56 @@ @@ -919,7 +919,7 @@ index 00000000000..c5a7b186e96 +} 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 00000000000..2eff19f6aaa +index 0000000000000000000000000000000000000000..2eff19f6aaa31245f80910c6fbb541e32c672a31 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java @@ -0,0 +1,84 @@ @@ -1008,7 +1008,7 @@ index 00000000000..2eff19f6aaa + } +} diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index af0d6aff4de..2604fe9756e 100644 +index af0d6aff4de78e81fd3feb16719efdccc05ccb90..2604fe9756e90cb70d3d527edddb917772e70973 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -416,7 +416,7 @@ public class Chunk implements IChunkAccess { @@ -1021,7 +1021,7 @@ index af0d6aff4de..2604fe9756e 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 8e4b3e52cbc..d287ea55c55 100644 +index 8e4b3e52cbc95e24b1d72aed9ec8c32b94a91561..d287ea55c550dbebbbc1d5f815296ae7ba6315e9 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 { @@ -1043,7 +1043,7 @@ index 8e4b3e52cbc..d287ea55c55 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 e056fbcb216..eeb7eee925d 100644 +index e056fbcb216977401fd2778fcd3ee7ed5f020214..eeb7eee925d31d1ed8e6bbd55888cb5ebe54afa2 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -1,5 +1,6 @@ @@ -1099,7 +1099,7 @@ index e056fbcb216..eeb7eee925d 100644 public int j() { diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index 2c1d1b1a556..2c7872bd051 100644 +index 2c1d1b1a5568ab104fb1a0f283f289680d59e81e..2c7872bd0516c820a42682b5281dbbaa1b467beb 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; @@ -1220,7 +1220,7 @@ index 2c1d1b1a556..2c7872bd051 100644 if (this.h == this.b) { diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 23223f3f452..9b608d73869 100644 +index 23223f3f45210cf23f44f9012f292db80df781a0..9b608d73869bd2907f705562c8378bc2f205767b 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -1,5 +1,6 @@ @@ -1312,7 +1312,7 @@ index 23223f3f452..9b608d73869 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 9171785ad54..94b0c54d9d4 100644 +index 9171785ad54a26e95dea8b30509c1e49a5d9b22d..94b0c54d9d4d77b724087be55ffe6ce464a0bbe7 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -604,7 +604,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -1325,7 +1325,7 @@ index 9171785ad54..94b0c54d9d4 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 17b7eddac4f..ce66090b8dc 100644 +index 17b7eddac4fadfd1cc3027fe6fbcd2bd5611fb84..ce66090b8dcd846db4507b99e3ef1a2d6104d19b 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -266,6 +266,8 @@ public class PlayerInteractManager { @@ -1338,7 +1338,7 @@ index 17b7eddac4f..ce66090b8dc 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 39339fa2755..deb7fb09019 100644 +index 39339fa27551b06a9bfd8ea67b1ec8c66726f488..deb7fb090196c4a33c0bb224f1c4e899aa3cd8c3 100644 --- a/src/main/java/net/minecraft/server/ProtoChunk.java +++ b/src/main/java/net/minecraft/server/ProtoChunk.java @@ -45,16 +45,24 @@ public class ProtoChunk implements IChunkAccess { @@ -1379,7 +1379,7 @@ index 39339fa2755..deb7fb09019 100644 return this.j[i]; diff --git a/src/main/java/net/minecraft/server/ProtoChunkExtension.java b/src/main/java/net/minecraft/server/ProtoChunkExtension.java -index 01bf28dc34d..caa18b046cd 100644 +index 01bf28dc34dd69dbcee5f470cc71ec2fbb2fcc12..caa18b046cd4231b1caa9c70e766ab60e11b3164 100644 --- a/src/main/java/net/minecraft/server/ProtoChunkExtension.java +++ b/src/main/java/net/minecraft/server/ProtoChunkExtension.java @@ -11,7 +11,7 @@ public class ProtoChunkExtension extends ProtoChunk { @@ -1392,7 +1392,7 @@ index 01bf28dc34d..caa18b046cd 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8cf3c10274b..0bde1717431 100644 +index 8cf3c10274b8320bf1938b95dd9f447deeb2c4d0..0bde1717431d770a9a73e83b56388d6f4923e404 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; @@ -1429,7 +1429,7 @@ index 8cf3c10274b..0bde1717431 100644 if (iblockdata1 == null) { // CraftBukkit start - remove blockstate if failed (or the same) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index a53bb7295c5..47f1b970b9b 100644 +index a53bb7295c5d510f2976ff3787d68857548e11cc..47f1b970b9ba39f9050ac34a5ac15593c25f8a70 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -38,7 +38,7 @@ public class CraftChunk implements Chunk { @@ -1451,7 +1451,7 @@ index a53bb7295c5..47f1b970b9b 100644 sectionBlockIDs[i] = blockids; diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java -index 8191e7c3489..bb18740ebdf 100644 +index 8191e7c34899e204b8afbb2fd11d235e8ef8db99..bb18740ebdf4a14ced9944efa82103b350b32ba5 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 { @@ -1475,6 +1475,3 @@ index 8191e7c3489..bb18740ebdf 100644 } return section; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch index cd5b4018ca..1a776c40b6 100644 --- a/Spigot-Server-Patches/0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch +++ b/Spigot-Server-Patches/0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch @@ -1,4 +1,4 @@ -From 59d1d306e9914f440eb7f2b3c41b8bf530da8229 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 01:01:32 -0400 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob @@ -17,7 +17,7 @@ This should fully solve all of the issues around it so that only natural influences natural spawns. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ca2ac17747d..a3fc76b5122 100644 +index ca2ac17747d4f2acf1df056759c5c182be050125..a3fc76b512244ed6ca6b4d8f4babcb81f3cce226 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -505,6 +505,16 @@ public class PaperWorldConfig { @@ -38,7 +38,7 @@ index ca2ac17747d..a3fc76b5122 100644 public boolean asynchronous; public EngineMode engineMode; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ad5e538b249..5d1fa08f697 100644 +index ad5e538b2498ed0e6d0cb79a6d5055732cddbc14..5d1fa08f6973ec12198b063d210b31615adbfeaa 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -957,6 +957,13 @@ public class WorldServer extends World { @@ -55,6 +55,3 @@ index ad5e538b249..5d1fa08f697 100644 object2intmap.mergeInt(enumcreaturetype, 1, Integer::sum); } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0387-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0387-Configurable-projectile-relative-velocity.patch index 673789e211..b6fc52b54c 100644 --- a/Spigot-Server-Patches/0387-Configurable-projectile-relative-velocity.patch +++ b/Spigot-Server-Patches/0387-Configurable-projectile-relative-velocity.patch @@ -1,4 +1,4 @@ -From 36f980352d9ce16a9745728412d3483c095aa88b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Lucavon Date: Tue, 23 Jul 2019 20:29:20 -0500 Subject: [PATCH] Configurable projectile relative velocity @@ -25,7 +25,7 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this server-internal fix makes this change future-proof. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a3fc76b5122..90ba51e05bb 100644 +index a3fc76b512244ed6ca6b4d8f4babcb81f3cce226..90ba51e05bbed0366b43bc9315f6dfa9e39eee03 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -543,4 +543,9 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index a3fc76b5122..90ba51e05bb 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 634e2bd3049..9c97edf9c9e 100644 +index 634e2bd3049d65bbef4ef12e2264049a6980fd71..9c97edf9c9e9a8cdf029264f6b563090142c686b 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -85,7 +85,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -52,7 +52,7 @@ index 634e2bd3049..9c97edf9c9e 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java -index 6c091b68087..f5c8074dcf1 100644 +index 6c091b68087d60b0b916871eb0ce06c6a2776bf8..f5c8074dcf1c6275bc13eb8f2b67c04ca547877b 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -43,7 +43,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile { @@ -64,6 +64,3 @@ index 6c091b68087..f5c8074dcf1 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch index 310475ec04..e734c4b71c 100644 --- a/Spigot-Server-Patches/0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch +++ b/Spigot-Server-Patches/0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch @@ -1,11 +1,11 @@ -From 18edd33aa38027c5395645ceb17dbc4a3c4a384a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 28 Jul 2019 00:51:11 +0100 Subject: [PATCH] Mark entities as being ticked when notifying navigation diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5d1fa08f697..8561f96b9a1 100644 +index 5d1fa08f6973ec12198b063d210b31615adbfeaa..8561f96b9a10cc2faa3ec1087a05ddb4c6164938 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1410,6 +1410,7 @@ public class WorldServer extends World { @@ -24,6 +24,3 @@ index 5d1fa08f697..8561f96b9a1 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0389-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0389-offset-item-frame-ticking.patch index 7bd7811622..7e53a08ee4 100644 --- a/Spigot-Server-Patches/0389-offset-item-frame-ticking.patch +++ b/Spigot-Server-Patches/0389-offset-item-frame-ticking.patch @@ -1,11 +1,11 @@ -From 728b0a752597f2df4b25e41c18b95acdf661e782 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Tue, 30 Jul 2019 03:17:16 +0500 Subject: [PATCH] offset item frame ticking diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java -index 21dbc9b2ab7..ef9c4717c31 100644 +index 21dbc9b2ab7c6edf2691f5c4f9e466ba33ba7580..ef9c4717c31c9fae4d9ac2e357ce22dab8fa3cce 100644 --- a/src/main/java/net/minecraft/server/EntityHanging.java +++ b/src/main/java/net/minecraft/server/EntityHanging.java @@ -15,7 +15,7 @@ public abstract class EntityHanging extends Entity { @@ -17,6 +17,3 @@ index 21dbc9b2ab7..ef9c4717c31 100644 public BlockPosition blockPosition; protected EnumDirection direction; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0390-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0390-Avoid-hopper-searches-if-there-are-no-items.patch index 78be34afc7..5ab8c61b05 100644 --- a/Spigot-Server-Patches/0390-Avoid-hopper-searches-if-there-are-no-items.patch +++ b/Spigot-Server-Patches/0390-Avoid-hopper-searches-if-there-are-no-items.patch @@ -1,4 +1,4 @@ -From c2fa94a9b7c538d689b2de14058ad48e90d78e9b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: CullanP Date: Thu, 3 Mar 2016 02:13:38 -0600 Subject: [PATCH] Avoid hopper searches if there are no items @@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear Combined, this adds up a lot. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 2604fe9756e..a2a0ca3394c 100644 +index 2604fe9756e90cb70d3d527edddb917772e70973..a2a0ca3394c3231aad9888fecebdaf82d4d9e9f7 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -84,6 +84,10 @@ public class Chunk implements IChunkAccess { @@ -100,7 +100,7 @@ index 2604fe9756e..a2a0ca3394c 100644 T t0 = (T) iterator.next(); // CraftBukkit - decompile error if (t0.shouldBeRemoved) continue; // Paper diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index 498f381099b..a2d1ef3602a 100644 +index 498f381099b2cf9460104688e12afc5f586e057a..a2d1ef3602a1c63d106d10140e18dfdb1d490805 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -11,6 +11,7 @@ public final class IEntitySelector { @@ -111,6 +111,3 @@ index 498f381099b..a2d1ef3602a 100644 public static final Predicate d = (entity) -> { return entity instanceof IInventory && entity.isAlive(); }; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0391-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0391-Asynchronous-chunk-IO-and-loading.patch index 9d487453f4..7015a28cab 100644 --- a/Spigot-Server-Patches/0391-Asynchronous-chunk-IO-and-loading.patch +++ b/Spigot-Server-Patches/0391-Asynchronous-chunk-IO-and-loading.patch @@ -1,4 +1,4 @@ -From 5cd7dc87cb723913b949c3c281ffb79145e6e43a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 @@ -121,7 +121,7 @@ tasks required to be executed by the chunk load task (i.e lighting and some poi tasks). diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java -index fa1c920ea60..98acbfa44dd 100644 +index fa1c920ea6092259149f9e7f9cd7cc1ed27bf338..98acbfa44dd9042b26fdf719d7748f92d201c928 100644 --- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java @@ -57,6 +57,17 @@ public class WorldTimingsHandler { @@ -161,7 +161,7 @@ index fa1c920ea60..98acbfa44dd 100644 public static Timing getTickList(WorldServer worldserver, String timingsType) { diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index dbd14399707..f4836e2da10 100644 +index dbd14399707cdd43f98af40191be8ff3e76edf43..f4836e2da1061e7aa62ddb01c8ca7b3467b18415 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -1,5 +1,6 @@ @@ -224,7 +224,7 @@ index dbd14399707..f4836e2da10 100644 } diff --git a/src/main/java/com/destroystokyo/paper/io/IOUtil.java b/src/main/java/com/destroystokyo/paper/io/IOUtil.java new file mode 100644 -index 00000000000..5af0ac3d9e8 +index 0000000000000000000000000000000000000000..5af0ac3d9e87c06053e65433060f15779c156c2a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/io/IOUtil.java @@ -0,0 +1,62 @@ @@ -292,7 +292,7 @@ index 00000000000..5af0ac3d9e8 +} diff --git a/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java b/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java new file mode 100644 -index 00000000000..4f10a8311ea +index 0000000000000000000000000000000000000000..4f10a8311ea931026079c85bb59e223b0122a4a9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java @@ -0,0 +1,661 @@ @@ -959,7 +959,7 @@ index 00000000000..4f10a8311ea +} diff --git a/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java b/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java new file mode 100644 -index 00000000000..97f2e433c48 +index 0000000000000000000000000000000000000000..97f2e433c483f1ebd7500ae142269e144ef5fda4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java @@ -0,0 +1,277 @@ @@ -1242,7 +1242,7 @@ index 00000000000..97f2e433c48 +} diff --git a/src/main/java/com/destroystokyo/paper/io/QueueExecutorThread.java b/src/main/java/com/destroystokyo/paper/io/QueueExecutorThread.java new file mode 100644 -index 00000000000..ee906b594b3 +index 0000000000000000000000000000000000000000..ee906b594b306906c170180a29a8b61997d05168 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/io/QueueExecutorThread.java @@ -0,0 +1,241 @@ @@ -1489,7 +1489,7 @@ index 00000000000..ee906b594b3 +} diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java new file mode 100644 -index 00000000000..ac9bc3e2316 +index 0000000000000000000000000000000000000000..ac9bc3e2316a9dc28d13f54296ee6fd5e81188a1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java @@ -0,0 +1,149 @@ @@ -1644,7 +1644,7 @@ index 00000000000..ac9bc3e2316 +} diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java new file mode 100644 -index 00000000000..60312b85f9e +index 0000000000000000000000000000000000000000..60312b85f9e7070378458f29afee0ebb7850d8a5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java @@ -0,0 +1,112 @@ @@ -1762,7 +1762,7 @@ index 00000000000..60312b85f9e +} diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTask.java new file mode 100644 -index 00000000000..1dfa8abfd86 +index 0000000000000000000000000000000000000000..1dfa8abfd869ca97e4cc566d44e509b444dbcdc5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTask.java @@ -0,0 +1,40 @@ @@ -1808,7 +1808,7 @@ index 00000000000..1dfa8abfd86 +} diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java new file mode 100644 -index 00000000000..2b20c159f6b +index 0000000000000000000000000000000000000000..2b20c159f6bb425be70201cf33159aa9e949eb54 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java @@ -0,0 +1,492 @@ @@ -2305,7 +2305,7 @@ index 00000000000..2b20c159f6b + +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 4c9c8e48397..259af7095c4 100644 +index 4c9c8e483974f8869d6711626620cfd7d814d956..259af7095c453e52e7c3a8662968d96de0efbbc8 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -299,11 +299,137 @@ public class ChunkProviderServer extends IChunkProvider { @@ -2475,7 +2475,7 @@ index 4c9c8e48397..259af7095c4 100644 } finally { playerChunkMap.callbackExecutor.run(); diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index d287ea55c55..34cd09a503b 100644 +index d287ea55c550dbebbbc1d5f815296ae7ba6315e9..34cd09a503bfe617bd50808927bae0ccf43e53fc 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.longs.LongOpenHashSet; @@ -2740,7 +2740,7 @@ index d287ea55c55..34cd09a503b 100644 nbttagcompound1.set("PostProcessing", a(ichunkaccess.l())); diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java -index 134a4f0b7d2..40ce30cdc2a 100644 +index 134a4f0b7d254b5dd8ca26a9c5874532826978c4..40ce30cdc2a07b7a9c2d1f33070e87259f27cd27 100644 --- a/src/main/java/net/minecraft/server/ChunkStatus.java +++ b/src/main/java/net/minecraft/server/ChunkStatus.java @@ -153,6 +153,7 @@ public class ChunkStatus { @@ -2776,7 +2776,7 @@ index 134a4f0b7d2..40ce30cdc2a 100644 return this.c() >= chunkstatus.c(); } diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java -index 7e5ece9d50a..cfe43e882e5 100644 +index 7e5ece9d50af7151ad4cc084e3680dae41ac92be..cfe43e882e524b6ab3d9702e81269c97e6b75eba 100644 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java @@ -91,7 +91,7 @@ public abstract class IAsyncTaskHandler implements Mailbox { @@ -3814,7 +3814,7 @@ index 75ab9f185b3..8055f599821 100644 public static TicketType a(String s, Comparator comparator) { return new TicketType<>(s, comparator, 0L); diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java -index c999f8c9bf8..b59ef1a6333 100644 +index c999f8c9bf8a59e19b3d6d1b7ad8b5fb6e48b928..b59ef1a63338aa150d39e8014e12b2275da26d50 100644 --- a/src/main/java/net/minecraft/server/VillagePlace.java +++ b/src/main/java/net/minecraft/server/VillagePlace.java @@ -24,8 +24,16 @@ public class VillagePlace extends RegionFileSection { @@ -3903,7 +3903,7 @@ index c999f8c9bf8..b59ef1a6333 100644 HAS_SPACE(VillagePlaceRecord::d), IS_OCCUPIED(VillagePlaceRecord::e), ANY((villageplacerecord) -> { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 8561f96b9a1..c0476f69e4a 100644 +index 8561f96b9a10cc2faa3ec1087a05ddb4c6164938..c0476f69e4a3f079f9160a4d5d384556597ec279 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -82,6 +82,79 @@ public class WorldServer extends World { @@ -4009,7 +4009,7 @@ index 8561f96b9a1..c0476f69e4a 100644 } public void removeTicketsForSpawn(int radiusInBlocks, BlockPosition spawn) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 50467656df0..d3ac0ffe468 100644 +index 50467656df0b54c2dcba8696b5677a2fc975b178..d3ac0ffe4682e56b7654611f32beefb6bc779823 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -556,22 +556,23 @@ public class CraftWorld implements World { @@ -4070,7 +4070,7 @@ index 50467656df0..d3ac0ffe468 100644 // Spigot start @Override diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 07936eeba2a..5bdcdcf9e85 100644 +index 07936eeba2a1aa68d52f4183f663ce362c816a54..5bdcdcf9e85b73086722783bff26321d03382bb9 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -6,6 +6,7 @@ import java.lang.management.ThreadInfo; @@ -4089,6 +4089,3 @@ index 07936eeba2a..5bdcdcf9e85 100644 dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log ); log.log( Level.SEVERE, "------------------------------" ); // --- -2.26.2 - diff --git a/Spigot-Server-Patches/0392-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0392-Use-getChunkIfLoadedImmediately-in-places.patch index 07feeeb264..6d1c00d535 100644 --- a/Spigot-Server-Patches/0392-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/Spigot-Server-Patches/0392-Use-getChunkIfLoadedImmediately-in-places.patch @@ -1,4 +1,4 @@ -From 476570fd19de352c2635eb273083201bc817d103 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 65c171cec3c..f00653dfe7a 100644 +index 65c171cec3cc7c7c7433c63b3718fa7e1c16f148..f00653dfe7a769992069582f1743b477edb47eb9 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 { @@ -21,7 +21,7 @@ index 65c171cec3c..f00653dfe7a 100644 return; } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0bde1717431..311685180fe 100644 +index 0bde1717431d770a9a73e83b56388d6f4923e404..311685180fe720706dfb6c82b1b54f9876187b73 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -116,8 +116,16 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -69,7 +69,7 @@ index 0bde1717431..311685180fe 100644 if (chunk != null) { chunk.a(oclass, axisalignedbb, list, predicate); diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index f86404f83ae..92601c581cf 100644 +index f86404f83ae605159307a3ad2cca6c6c314a01af..92601c581cffac471872226abeb93ef9aa24f079 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -143,9 +143,10 @@ public class ActivationRange @@ -85,6 +85,3 @@ index f86404f83ae..92601c581cf 100644 } } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0393-Reduce-sync-loads.patch b/Spigot-Server-Patches/0393-Reduce-sync-loads.patch index 010f3dea25..8da5cfc0f2 100644 --- a/Spigot-Server-Patches/0393-Reduce-sync-loads.patch +++ b/Spigot-Server-Patches/0393-Reduce-sync-loads.patch @@ -1,4 +1,4 @@ -From 1440b353a0fab354863c290471a71877884150b2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 19 Jul 2019 03:29:14 -0700 Subject: [PATCH] Reduce sync loads @@ -11,7 +11,7 @@ it must be enabled by setting the startup flag -Dpaper.debug-sync-loads=true To get a debug log for sync loads, the command is /paper syncloadinfo diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index af810987846..ddb60e9a48e 100644 +index af810987846efcd2bffbd23c31481b2d31c168dd..ddb60e9a48e5e7225ad575240b94fda24b6b78ca 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -1,9 +1,13 @@ @@ -108,7 +108,7 @@ index af810987846..ddb60e9a48e 100644 if (args.length < 2 || args[1].equals("*")) { diff --git a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java new file mode 100644 -index 00000000000..59aec103295 +index 0000000000000000000000000000000000000000..59aec103295f747793fdc0a52eb45f4121aba921 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java @@ -0,0 +1,172 @@ @@ -285,7 +285,7 @@ index 00000000000..59aec103295 + } +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 259af7095c4..ea1117dc86e 100644 +index 259af7095c453e52e7c3a8662968d96de0efbbc8..ea1117dc86e9621c37ab4ba0f7c42e7b172648b3 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -459,6 +459,7 @@ public class ChunkProviderServer extends IChunkProvider { @@ -297,7 +297,7 @@ index 259af7095c4..ea1117dc86e 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 311685180fe..568e04faa31 100644 +index 311685180fe720706dfb6c82b1b54f9876187b73..568e04faa314552e14286efdfcdfb79e682fda95 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1173,7 +1173,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -328,7 +328,7 @@ index 311685180fe..568e04faa31 100644 if (chunk != null) { chunk.a(oclass, axisalignedbb, list, predicate); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index c0476f69e4a..2fa1b86adf8 100644 +index c0476f69e4a3f079f9160a4d5d384556597ec279..2fa1b86adf89bb9b2398806bf30b0a6e436a4577 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -154,6 +154,12 @@ public class WorldServer extends World { @@ -344,6 +344,3 @@ index c0476f69e4a..2fa1b86adf8 100644 // Add env and gen to constructor public WorldServer(MinecraftServer minecraftserver, Executor executor, WorldNBTStorage worldnbtstorage, WorldData worlddata, DimensionManager dimensionmanager, GameProfilerFiller gameprofilerfiller, WorldLoadListener worldloadlistener, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0394-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0394-Implement-alternative-item-despawn-rate.patch index 43519f2a78..0b1c7fb694 100644 --- a/Spigot-Server-Patches/0394-Implement-alternative-item-despawn-rate.patch +++ b/Spigot-Server-Patches/0394-Implement-alternative-item-despawn-rate.patch @@ -1,11 +1,11 @@ -From a17b7e027112d322e786d0ed8e61cd678291c482 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Mon, 3 Jun 2019 02:02:39 -0400 Subject: [PATCH] Implement alternative item-despawn-rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 90ba51e05bb..b1d09eb457c 100644 +index 90ba51e05bbed0366b43bc9315f6dfa9e39eee03..b1d09eb457cfd1be7590f200abfa8cb2236600ef 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -1,10 +1,15 @@ @@ -78,7 +78,7 @@ index 90ba51e05bb..b1d09eb457c 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index ef2cf6565b5..507627a29f6 100644 +index ef2cf6565b5935b1f1a80f12670609017aebb2c8..507627a29f67c380314d2fa8ee56807ced8ee56a 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -6,6 +6,7 @@ import java.util.Objects; @@ -125,6 +125,3 @@ index ef2cf6565b5..507627a29f6 100644 @Override public Packet L() { return new PacketPlayOutSpawnEntity(this); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch index 879802b7b3..851b0e02df 100644 --- a/Spigot-Server-Patches/0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch +++ b/Spigot-Server-Patches/0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch @@ -1,4 +1,4 @@ -From 8c33530822f43e437a88985da1c0cc9146cda55d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paul Sauve Date: Sun, 14 Jul 2019 21:05:03 -0500 Subject: [PATCH] Do less work if we have a custom Bukkit generator @@ -7,7 +7,7 @@ If the Bukkit generator already has a spawn, use it immediately instead of spending time generating one that we won't use diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 2fa1b86adf8..731f6a83200 100644 +index 2fa1b86adf89bb9b2398806bf30b0a6e436a4577..731f6a83200b4f7608fe1f1f3f0e04d827913e72 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -811,12 +811,13 @@ public class WorldServer extends World { @@ -44,6 +44,3 @@ index 2fa1b86adf8..731f6a83200 100644 if (blockposition == null) { WorldServer.LOGGER.warn("Unable to find spawn biome"); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0396-Fix-MC-158900.patch b/Spigot-Server-Patches/0396-Fix-MC-158900.patch index 06803639bd..823f96afc1 100644 --- a/Spigot-Server-Patches/0396-Fix-MC-158900.patch +++ b/Spigot-Server-Patches/0396-Fix-MC-158900.patch @@ -1,4 +1,4 @@ -From 26b1db2584c921ed605b3b10df6f7f96aaab36db Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 13 Aug 2019 06:35:17 -0700 Subject: [PATCH] Fix MC-158900 @@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it was expired at that point, then it would be null. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index b8302de65a7..b45911cf819 100644 +index b8302de65a7b04790594d23e0bb730b2d3a1b191..b45911cf8198c2e532639ea654d7b360358ae008 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -502,8 +502,10 @@ public abstract class PlayerList { @@ -23,6 +23,3 @@ index b8302de65a7..b45911cf819 100644 chatmessage = new ChatMessage("multiplayer.disconnect.banned.reason", new Object[]{gameprofilebanentry.getReason()}); if (gameprofilebanentry.getExpires() != null) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0397-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0397-implement-optional-per-player-mob-spawns.patch index 52aceee68b..51468e3575 100644 --- a/Spigot-Server-Patches/0397-implement-optional-per-player-mob-spawns.patch +++ b/Spigot-Server-Patches/0397-implement-optional-per-player-mob-spawns.patch @@ -1,11 +1,11 @@ -From 4a1df7264ddf4407e0ba8e6a8b87874d15da0eac Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 98acbfa44dd..a94ebf7c76f 100644 +index 98acbfa44dd9042b26fdf719d7748f92d201c928..a94ebf7c76f167d3b66f7d243910c13d4bfaaba3 100644 --- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java @@ -56,6 +56,7 @@ public class WorldTimingsHandler { @@ -25,7 +25,7 @@ index 98acbfa44dd..a94ebf7c76f 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 b1d09eb457c..515673e0fec 100644 +index b1d09eb457cfd1be7590f200abfa8cb2236600ef..515673e0fec1dc5c8a188d594f5c9b698c47d0e1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -601,4 +601,9 @@ public class PaperWorldConfig { @@ -40,7 +40,7 @@ index b1d09eb457c..515673e0fec 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 00000000000..9ebd7ecb7a0 +index 0000000000000000000000000000000000000000..9ebd7ecb7a0ac73ccacf34c097056598bb5d26e8 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java @@ -0,0 +1,253 @@ @@ -299,7 +299,7 @@ index 00000000000..9ebd7ecb7a0 +} 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 00000000000..4f13d3ff839 +index 0000000000000000000000000000000000000000..4f13d3ff8391793a99f067189f854078334499c6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java @@ -0,0 +1,241 @@ @@ -545,7 +545,7 @@ index 00000000000..4f13d3ff839 + } +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index ea1117dc86e..fe894a68bc2 100644 +index ea1117dc86e9621c37ab4ba0f7c42e7b172648b3..fe894a68bc28ed01819bb538079856712f813713 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -741,7 +741,22 @@ public class ChunkProviderServer extends IChunkProvider { @@ -599,7 +599,7 @@ index ea1117dc86e..fe894a68bc2 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index f375c9507c0..fcd887ce30d 100644 +index f375c9507c0ec0c2f810f8fff5304e70e02b7064..fcd887ce30dac081712811d740049d03c73db83d 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 f375c9507c0..fcd887ce30d 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 8427ee2ee8b..0f04bcc8b7c 100644 +index 8427ee2ee8b90d5deb686412bb2eefb9a574b75a..0f04bcc8b7cd5bd0536dd3fccab0f4dae6b0130b 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 8427ee2ee8b..0f04bcc8b7c 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 963ce3eeec6..692388821a7 100644 +index 963ce3eeec6f9eea087054ea48b714eeb236bbfa..692388821a795f60ffab8459475a764e1c409e2e 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 963ce3eeec6..692388821a7 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 fdac5bb3a2d..58bbf2f9d2e 100644 +index fdac5bb3a2d4a73035e1d914979b87fc224b6b20..58bbf2f9d2ec91715051d40e108e16067bb36561 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 fdac5bb3a2d..58bbf2f9d2e 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 731f6a83200..38c5b721bf1 100644 +index 731f6a83200b4f7608fe1f1f3f0e04d827913e72..38c5b721bf145c0083cf560763f1c6327210aebf 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1028,7 +1028,20 @@ public class WorldServer extends World { @@ -799,6 +799,3 @@ index 731f6a83200..38c5b721bf1 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0398-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0398-Prevent-consuming-the-wrong-itemstack.patch index 6d9939567c..57c5e1bcaa 100644 --- a/Spigot-Server-Patches/0398-Prevent-consuming-the-wrong-itemstack.patch +++ b/Spigot-Server-Patches/0398-Prevent-consuming-the-wrong-itemstack.patch @@ -1,11 +1,11 @@ -From d5bc6d208f0997975cd195b00f77c0aac8b420c9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Mon, 19 Aug 2019 19:42:35 +0500 Subject: [PATCH] Prevent consuming the wrong itemstack diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index aecd5011cbe..24594aa0e9b 100644 +index aecd5011cbe8c6f78be436084621f4c31cdac23a..24594aa0e9b8741811acfc9f84f4db7552832bd2 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2896,10 +2896,13 @@ public abstract class EntityLiving extends Entity { @@ -43,6 +43,3 @@ index aecd5011cbe..24594aa0e9b 100644 ((EntityPlayer) this).getBukkitEntity().updateInventory(); } // Paper end --- -2.26.2 - diff --git a/Spigot-Server-Patches/0399-only-add-passanger-entities-once-from-spawners.patch b/Spigot-Server-Patches/0399-only-add-passanger-entities-once-from-spawners.patch index caa07d8b47..63a8d16c97 100644 --- a/Spigot-Server-Patches/0399-only-add-passanger-entities-once-from-spawners.patch +++ b/Spigot-Server-Patches/0399-only-add-passanger-entities-once-from-spawners.patch @@ -1,11 +1,11 @@ -From ba41a67600a5a7c8c3a78fb8324c27602b7dc25e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Wed, 21 Aug 2019 23:57:32 +0500 Subject: [PATCH] only add passanger entities once from spawners diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 41001b02a65..df494d37be6 100644 +index 41001b02a654194c4a8e25ad5f7af8fdd91090b2..df494d37be687860878c2709ae7996510118a559 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -196,7 +196,7 @@ public abstract class MobSpawnerAbstract { @@ -17,6 +17,3 @@ index 41001b02a65..df494d37be6 100644 Iterator iterator = entity.getPassengers().iterator(); while (iterator.hasNext()) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0400-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0400-Fix-nether-portal-creation.patch index 097cc1b0dc..fa2903fd89 100644 --- a/Spigot-Server-Patches/0400-Fix-nether-portal-creation.patch +++ b/Spigot-Server-Patches/0400-Fix-nether-portal-creation.patch @@ -1,11 +1,11 @@ -From 1325f69d8a53b77ce1222d8becb2df817c717796 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Mon, 9 Sep 2019 13:21:17 +1000 Subject: [PATCH] Fix nether portal creation diff --git a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java -index 60330f753fc..c22dbbfbe8b 100644 +index 60330f753fcbdef679a9444c3888f1656b2fa344..c22dbbfbe8b16d4c2f1df1f9efd3b06e330ac909 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java +++ b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java @@ -38,6 +38,11 @@ public class BlockStateListPopulator extends DummyGeneratorAccess { @@ -20,6 +20,3 @@ index 60330f753fc..c22dbbfbe8b 100644 CraftBlockState state = CraftBlockState.getBlockState(world, position, flag); state.setData(data); list.put(position, state); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0401-Generator-Settings.patch b/Spigot-Server-Patches/0401-Generator-Settings.patch index 3964117e95..64f1d6e8bb 100644 --- a/Spigot-Server-Patches/0401-Generator-Settings.patch +++ b/Spigot-Server-Patches/0401-Generator-Settings.patch @@ -1,11 +1,11 @@ -From 9dd618ac5d7b843d3800dd344f34050a17425308 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 02:17:54 -0600 Subject: [PATCH] Generator Settings diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 515673e0fec..928fefb4195 100644 +index 515673e0fec1dc5c8a188d594f5c9b698c47d0e1..928fefb4195bd5d629b59b2b3c7d005b79bdf161 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -606,4 +606,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 515673e0fec..928fefb4195 100644 + } } diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java -index af81a841428..2268fbdd871 100644 +index af81a841428a656bc4c4a23c9dcafb25e4c96ee2..2268fbdd8716233ce8f5a8a68d17a8a460a6685f 100644 --- a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java +++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java @@ -211,8 +211,8 @@ public abstract class ChunkGeneratorAbstract @@ -51,6 +51,3 @@ index af81a841428..2268fbdd871 100644 ichunkaccess.setType(blockposition_mutableblockposition.d(blockposition.getX(), i1, blockposition.getZ()), Blocks.BEDROCK.getBlockData(), false); } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch b/Spigot-Server-Patches/0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch index eda265e6fe..59714e6626 100644 --- a/Spigot-Server-Patches/0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch +++ b/Spigot-Server-Patches/0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch @@ -1,11 +1,11 @@ -From 448237ec196c32d672999706de094510b261366e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sun, 15 Sep 2019 11:32:32 -0500 Subject: [PATCH] Fix zero-tick instant grow farms MC-113809 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 928fefb4195..44210855560 100644 +index 928fefb4195bd5d629b59b2b3c7d005b79bdf161..442108555604b06c6217f4330c19b4997451126c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -554,6 +554,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 928fefb4195..44210855560 100644 public Map altItemDespawnRateMap; private void altItemDespawnRate() { diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 540fcce1dd4..e29ec958b35 100644 +index 540fcce1dd4d64dee51e2594f2199fac5299c6a0..e29ec958b3519d92cda215a50e97e6852d71c684 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -46,6 +46,7 @@ public class Block implements IMaterial { @@ -33,7 +33,7 @@ index 540fcce1dd4..e29ec958b35 100644 private final boolean i; private final boolean j; diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java -index c482aad3e3e..02c548dd9c9 100644 +index c482aad3e3e255dfe13b622859ed61b780a9e08e..02c548dd9c9a97bfb55d39ba2f6d4ab85ada0573 100644 --- a/src/main/java/net/minecraft/server/BlockBamboo.java +++ b/src/main/java/net/minecraft/server/BlockBamboo.java @@ -85,6 +85,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement { @@ -45,7 +45,7 @@ index c482aad3e3e..02c548dd9c9 100644 int i = this.b(worldserver, blockposition) + 1; diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java -index e0974e256f0..3524fcb9278 100644 +index e0974e256f0f10e047b9eb8e362982c6578d2d98..3524fcb927865d7b8754d9fbf85b853f09b94bb8 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -21,6 +21,7 @@ public class BlockCactus extends Block { @@ -57,7 +57,7 @@ index e0974e256f0..3524fcb9278 100644 if (worldserver.isEmpty(blockposition1)) { diff --git a/src/main/java/net/minecraft/server/BlockChorusFlower.java b/src/main/java/net/minecraft/server/BlockChorusFlower.java -index d70b52cadf1..b624cf38047 100644 +index d70b52cadf1b76eff7984127837b0a3aa36f6a0e..b624cf38047e242569d30ee4e3ad971455b5ff0a 100644 --- a/src/main/java/net/minecraft/server/BlockChorusFlower.java +++ b/src/main/java/net/minecraft/server/BlockChorusFlower.java @@ -22,6 +22,7 @@ public class BlockChorusFlower extends Block { @@ -69,7 +69,7 @@ index d70b52cadf1..b624cf38047 100644 if (worldserver.isEmpty(blockposition1) && blockposition1.getY() < 256) { diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java -index 55b07444e1d..3bc3c5aa29f 100644 +index 55b07444e1d769952f2a411b1b5d1032565af8a1..3bc3c5aa29f45cd2ee1c0401b1ee1b1d49e81926 100644 --- a/src/main/java/net/minecraft/server/BlockReed.java +++ b/src/main/java/net/minecraft/server/BlockReed.java @@ -23,6 +23,7 @@ public class BlockReed extends Block { @@ -81,7 +81,7 @@ index 55b07444e1d..3bc3c5aa29f 100644 for (i = 1; worldserver.getType(blockposition.down(i)).getBlock() == this; ++i) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 38c5b721bf1..17560a20fce 100644 +index 38c5b721bf145c0083cf560763f1c6327210aebf..17560a20fce7f42f98aacc42b9d4c3ab992af3cf 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -589,7 +589,9 @@ public class WorldServer extends World { @@ -94,6 +94,3 @@ index 38c5b721bf1..17560a20fce 100644 } Fluid fluid = iblockdata.getFluid(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0403-Fix-MC-161754.patch b/Spigot-Server-Patches/0403-Fix-MC-161754.patch index 7676e3f874..9ba10c6d76 100644 --- a/Spigot-Server-Patches/0403-Fix-MC-161754.patch +++ b/Spigot-Server-Patches/0403-Fix-MC-161754.patch @@ -1,4 +1,4 @@ -From a7e308ddce1453a5f3299aabfaa20e90924c22a1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 24 Sep 2019 16:03:00 -0700 Subject: [PATCH] Fix MC-161754 @@ -9,7 +9,7 @@ We can use an entity valid check since this method is invoked for each inventory iteraction (thanks to CB) and on player tick (vanilla). diff --git a/src/main/java/net/minecraft/server/ContainerHorse.java b/src/main/java/net/minecraft/server/ContainerHorse.java -index c95ce0124d9..18e1ae7f0a4 100644 +index c95ce0124d948626732e796c386b7544e34b36c4..18e1ae7f0a4b06ec7d7400e791ac79e5192eb8d8 100644 --- a/src/main/java/net/minecraft/server/ContainerHorse.java +++ b/src/main/java/net/minecraft/server/ContainerHorse.java @@ -76,7 +76,7 @@ public class ContainerHorse extends Container { @@ -21,6 +21,3 @@ index c95ce0124d9..18e1ae7f0a4 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0404-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0404-Performance-improvement-for-Chunk.getEntities.patch index db2dcacf0c..e58b04f559 100644 --- a/Spigot-Server-Patches/0404-Performance-improvement-for-Chunk.getEntities.patch +++ b/Spigot-Server-Patches/0404-Performance-improvement-for-Chunk.getEntities.patch @@ -1,4 +1,4 @@ -From a8c688477c9552a27a27d5ffb34fbb4cfb2116c0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: wea_ondara Date: Thu, 10 Oct 2019 11:29:42 +0200 Subject: [PATCH] Performance improvement for Chunk.getEntities @@ -10,7 +10,7 @@ operation. This patch will reduce the load of plugins which for example implement custom moblimits and depend on Chunk.getEntities(). diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index 47f1b970b9b..39ef95cbbb1 100644 +index 47f1b970b9ba39f9050ac34a5ac15593c25f8a70..39ef95cbbb1d1d049354ae1e8991309e918d0462 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -111,14 +111,14 @@ public class CraftChunk implements Chunk { @@ -33,6 +33,3 @@ index 47f1b970b9b..39ef95cbbb1 100644 } return entities; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch index 2629619573..25b6b75383 100644 --- a/Spigot-Server-Patches/0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch +++ b/Spigot-Server-Patches/0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch @@ -1,4 +1,4 @@ -From 8d846ecb9651d3bae713144b60c900bdc226404b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MisterErwin Date: Wed, 30 Oct 2019 16:57:54 +0100 Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and @@ -6,7 +6,7 @@ Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d3ac0ffe468..07ebd78acc7 100644 +index d3ac0ffe4682e56b7654611f32beefb6bc779823..07ebd78acc7498616887f90a82300b4d5b71fab1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1850,7 +1850,12 @@ public class CraftWorld implements World { @@ -23,6 +23,3 @@ index d3ac0ffe468..07ebd78acc7 100644 final BlockPosition pos = new BlockPosition(x, y, z); for (BlockFace dir : faces) { IBlockData nmsBlock = world.getType(pos.shift(CraftBlock.blockFaceToNotch(dir))); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0406-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0406-Expose-the-internal-current-tick.patch index 3aa7022b6a..cb23c2a1b5 100644 --- a/Spigot-Server-Patches/0406-Expose-the-internal-current-tick.patch +++ b/Spigot-Server-Patches/0406-Expose-the-internal-current-tick.patch @@ -1,11 +1,11 @@ -From 7ca24be41ff4d779959e669c370dd878b5621e26 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 14cc12d772f..e8d3528d515 100644 +index 14cc12d772fe8c879a282275e3ee76cd66047c6b..e8d3528d515754affb14c947109ccdf1739d9745 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2203,5 +2203,10 @@ public final class CraftServer implements Server { @@ -19,6 +19,3 @@ index 14cc12d772f..e8d3528d515 100644 + } // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch index 7974dc6e25..ee7c504b89 100644 --- a/Spigot-Server-Patches/0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch +++ b/Spigot-Server-Patches/0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch @@ -1,11 +1,11 @@ -From 740e4d3c326a5a0c1c02831286cf6d16e382b28d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 9 Oct 2019 21:51:43 -0500 Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index fcd887ce30d..bb10857cf37 100644 +index fcd887ce30dac081712811d740049d03c73db83d..bb10857cf377e731db432fd98611c371bc5d4db5 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -984,6 +984,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -18,7 +18,7 @@ index fcd887ce30d..bb10857cf37 100644 PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld()); this.world.getServer().getPluginManager().callEvent(changeEvent); diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index b45911cf819..909d86e14c7 100644 +index b45911cf8198c2e532639ea654d7b360358ae008..909d86e14c7860cd6d8a6f38ef4aedb183acae3f 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -718,6 +718,8 @@ public abstract class PlayerList { @@ -30,6 +30,3 @@ index b45911cf819..909d86e14c7 100644 // Fire advancement trigger entityplayer.triggerDimensionAdvancements(((CraftWorld) fromWorld).getHandle()); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0408-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0408-Add-option-to-disable-pillager-patrols.patch index f48691391c..a70ca1aa85 100644 --- a/Spigot-Server-Patches/0408-Add-option-to-disable-pillager-patrols.patch +++ b/Spigot-Server-Patches/0408-Add-option-to-disable-pillager-patrols.patch @@ -1,11 +1,11 @@ -From 8471e9c56c520609a50898b884c3f32df04fc4df Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 9 Oct 2019 21:46:15 -0500 Subject: [PATCH] Add option to disable pillager patrols diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 44210855560..1c703e48e99 100644 +index 442108555604b06c6217f4330c19b4997451126c..1c703e48e99cd93be76bfeb0d9223507ba072b41 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -616,4 +616,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 44210855560..1c703e48e99 100644 + } } diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java -index 33488b37e4d..a0f58280760 100644 +index 33488b37e4d0dd295e0f48b59c43d30208eb531a..a0f582807605b9cc5bbf31d84907e56fba393e2e 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java @@ -9,6 +9,7 @@ public class MobSpawnerPatrol { @@ -30,6 +30,3 @@ index 33488b37e4d..a0f58280760 100644 if (!flag) { return 0; } else if (!worldserver.getGameRules().getBoolean(GameRules.DO_PATROL_SPAWNING)) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch index 007b12b625..9b0de986d9 100644 --- a/Spigot-Server-Patches/0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch +++ b/Spigot-Server-Patches/0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch @@ -1,4 +1,4 @@ -From ee57e7fe0f18155f1f8cf5c41e5c909b39f50bc4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Lukasz Derlatka Date: Mon, 11 Nov 2019 16:08:13 +0100 Subject: [PATCH] Fix AssertionError when player hand set to empty type @@ -7,7 +7,7 @@ Fixes an AssertionError when setting the player's item in hand to null or a new Fixes GH-2718 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 24594aa0e9b..aada8d3b08b 100644 +index 24594aa0e9b8741811acfc9f84f4db7552832bd2..aada8d3b08b437f81f68f8e988412c1071287d54 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1891,6 +1891,7 @@ public abstract class EntityLiving extends Entity { @@ -19,7 +19,7 @@ index 24594aa0e9b..aada8d3b08b 100644 if (enumhand == EnumHand.MAIN_HAND) { return this.getEquipment(EnumItemSlot.MAINHAND); diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f00653dfe7a..71d045ee00d 100644 +index f00653dfe7a769992069582f1743b477edb47eb9..71d045ee00d1f172d88f076d15cf82bae2527ae8 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1430,6 +1430,10 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -33,6 +33,3 @@ index f00653dfe7a..71d045ee00d 100644 this.player.playerInteractManager.a(this.player, worldserver, itemstack, enumhand); } // CraftBukkit end --- -2.26.2 - diff --git a/Spigot-Server-Patches/0410-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0410-PlayerLaunchProjectileEvent.patch index f0dc15e0cf..d5773b74c1 100644 --- a/Spigot-Server-Patches/0410-PlayerLaunchProjectileEvent.patch +++ b/Spigot-Server-Patches/0410-PlayerLaunchProjectileEvent.patch @@ -1,11 +1,11 @@ -From ea764df2fe7d68b0f6d484394d59f19d4a2d298e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 03:11:03 -0500 Subject: [PATCH] PlayerLaunchProjectileEvent diff --git a/src/main/java/net/minecraft/server/InteractionResultWrapper.java b/src/main/java/net/minecraft/server/InteractionResultWrapper.java -index 5cab47a2821..886babdcda0 100644 +index 5cab47a2821adf869693132f8ce1193b1543f896..886babdcda0b559fc6a760b48074bec44e0f9da1 100644 --- a/src/main/java/net/minecraft/server/InteractionResultWrapper.java +++ b/src/main/java/net/minecraft/server/InteractionResultWrapper.java @@ -10,6 +10,7 @@ public class InteractionResultWrapper { @@ -17,7 +17,7 @@ index 5cab47a2821..886babdcda0 100644 return this.a; } diff --git a/src/main/java/net/minecraft/server/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java -index 6fccd70a034..16f1b734e01 100644 +index 6fccd70a034b5d70729f57e0f2ee56e59e6f9cbc..16f1b734e01ee7cf917d2f9a4a4dc1e98e4f2af9 100644 --- a/src/main/java/net/minecraft/server/ItemEgg.java +++ b/src/main/java/net/minecraft/server/ItemEgg.java @@ -16,21 +16,35 @@ public class ItemEgg extends Item { @@ -61,7 +61,7 @@ index 6fccd70a034..16f1b734e01 100644 return InteractionResultWrapper.success(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java -index cab869e8e9b..b57e9f7e72b 100644 +index cab869e8e9b6a505e23c109c4434178a8824ba45..b57e9f7e72b892165129c3857d5d03a088bee3ee 100644 --- a/src/main/java/net/minecraft/server/ItemEnderPearl.java +++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java @@ -16,22 +16,37 @@ public class ItemEnderPearl extends Item { @@ -113,7 +113,7 @@ index cab869e8e9b..b57e9f7e72b 100644 return InteractionResultWrapper.success(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java -index 071688b3ab4..1d575af5269 100644 +index 071688b3ab45a527a642c3d16c8d8b1f3682e63c..1d575af5269762f6f2616884a7733470cca06be5 100644 --- a/src/main/java/net/minecraft/server/ItemExpBottle.java +++ b/src/main/java/net/minecraft/server/ItemExpBottle.java @@ -15,19 +15,38 @@ public class ItemExpBottle extends Item { @@ -158,7 +158,7 @@ index 071688b3ab4..1d575af5269 100644 return InteractionResultWrapper.success(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java -index c19b678cfb2..7672e31fc0c 100644 +index c19b678cfb2bc3c27858488031e119d482905f8b..7672e31fc0c915c49c8752ba864c2706f1292e86 100644 --- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java +++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java @@ -8,7 +8,11 @@ public class ItemLingeringPotion extends ItemPotionThrowable { @@ -176,7 +176,7 @@ index c19b678cfb2..7672e31fc0c 100644 } } diff --git a/src/main/java/net/minecraft/server/ItemPotionThrowable.java b/src/main/java/net/minecraft/server/ItemPotionThrowable.java -index 5d1f118c513..d1beab1ab72 100644 +index 5d1f118c5139540a809dbaeee0982fbc7e9c3996..d1beab1ab72dffd3ee671982991d414b9244973d 100644 --- a/src/main/java/net/minecraft/server/ItemPotionThrowable.java +++ b/src/main/java/net/minecraft/server/ItemPotionThrowable.java @@ -15,13 +15,31 @@ public class ItemPotionThrowable extends ItemPotion { @@ -213,7 +213,7 @@ index 5d1f118c513..d1beab1ab72 100644 return InteractionResultWrapper.success(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java -index 56ec5089596..e6044e654b7 100644 +index 56ec5089596de4209780a823a2a3f37676ec515b..e6044e654b78ab8ef9d73ef7bd6ad82a079745a8 100644 --- a/src/main/java/net/minecraft/server/ItemSnowball.java +++ b/src/main/java/net/minecraft/server/ItemSnowball.java @@ -17,19 +17,27 @@ public class ItemSnowball extends Item { @@ -251,7 +251,7 @@ index 56ec5089596..e6044e654b7 100644 /* if (!entityhuman.abilities.canInstantlyBuild) { diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java -index 18bd846ceec..e71e933fffb 100644 +index 18bd846ceecf638fa1184a6cceb5c909ec49372c..e71e933fffb04aa4a00d02cfbc284da8ad3ee925 100644 --- a/src/main/java/net/minecraft/server/ItemSplashPotion.java +++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java @@ -8,7 +8,11 @@ public class ItemSplashPotion extends ItemPotionThrowable { @@ -268,6 +268,3 @@ index 18bd846ceec..e71e933fffb 100644 + // Paper end } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch index a158856803..b743ce7df5 100644 --- a/Spigot-Server-Patches/0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch +++ b/Spigot-Server-Patches/0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch @@ -1,11 +1,11 @@ -From 53e658495045a486753890686545c837ab02ee2e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BlackHole Date: Sun, 15 Dec 2019 19:12:39 +0100 Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion() diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index b1e1b59d451..770375ed420 100644 +index b1e1b59d451674b42cdc6f896d3e2b707a03b923..770375ed4207920e71d2d0799c611c4b3cdbe6f7 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -308,6 +308,11 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -20,6 +20,3 @@ index b1e1b59d451..770375ed420 100644 // Paper end /** --- -2.26.2 - diff --git a/Spigot-Server-Patches/0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch index 2c5a5fa29d..7535c03fa5 100644 --- a/Spigot-Server-Patches/0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch +++ b/Spigot-Server-Patches/0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch @@ -1,11 +1,11 @@ -From 2237a0b7aab90a43277efa7838da2ab4c2da5059 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Callahan Date: Mon, 13 Jan 2020 23:47:28 -0600 Subject: [PATCH] Prevent sync chunk loads when villagers try to find beds diff --git a/src/main/java/net/minecraft/server/BehaviorSleep.java b/src/main/java/net/minecraft/server/BehaviorSleep.java -index fa575dde192..dfe0f66500a 100644 +index fa575dde1924d840b966791aab8553108a877be4..dfe0f66500ab2ea733fd5ef84d7d80f32e2dfaab 100644 --- a/src/main/java/net/minecraft/server/BehaviorSleep.java +++ b/src/main/java/net/minecraft/server/BehaviorSleep.java @@ -31,7 +31,8 @@ public class BehaviorSleep extends Behavior { @@ -18,6 +18,3 @@ index fa575dde192..dfe0f66500a 100644 return globalpos.getBlockPosition().a((IPosition) entityliving.getPositionVector(), 2.0D) && iblockdata.getBlock().a(TagsBlock.BEDS) && !(Boolean) iblockdata.get(BlockBed.OCCUPIED); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0413-Fix-spawn-radius-being-treated-as-0.patch b/Spigot-Server-Patches/0413-Fix-spawn-radius-being-treated-as-0.patch index dbc4d97fdc..c6549e794a 100644 --- a/Spigot-Server-Patches/0413-Fix-spawn-radius-being-treated-as-0.patch +++ b/Spigot-Server-Patches/0413-Fix-spawn-radius-being-treated-as-0.patch @@ -1,11 +1,11 @@ -From 035022176e8ef626fd9639c6cdf37753fdf22b86 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 15 Dec 2019 19:41:28 +0000 Subject: [PATCH] Fix spawn radius being treated as 0 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index bb10857cf37..b9d1747ab2a 100644 +index bb10857cf377e731db432fd98611c371bc5d4db5..b9d1747ab2a2f4efb33ae5cbe3fda5429a60ac59 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -129,7 +129,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -17,6 +17,3 @@ index bb10857cf37..b9d1747ab2a 100644 int i = Math.max(0, this.server.a(worldserver)); int j = MathHelper.floor(worldserver.getWorldBorder().b((double) blockposition.getX(), (double) blockposition.getZ())); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0414-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0414-MC-145656-Fix-Follow-Range-Initial-Target.patch index 7219f19a22..3fb14c0a95 100644 --- a/Spigot-Server-Patches/0414-MC-145656-Fix-Follow-Range-Initial-Target.patch +++ b/Spigot-Server-Patches/0414-MC-145656-Fix-Follow-Range-Initial-Target.patch @@ -1,11 +1,11 @@ -From 294494a32012632470ca8fc99e7ff36a9c9f3027 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 18 Dec 2019 22:21:35 -0600 Subject: [PATCH] MC-145656 Fix Follow Range Initial Target diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 1c703e48e99..e89ad807ed9 100644 +index 1c703e48e99cd93be76bfeb0d9223507ba072b41..e89ad807ed96205a7bf1110d849c3459a995188d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -621,4 +621,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 1c703e48e99..e89ad807ed9 100644 + } } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java -index cd17bf2be53..b85e67a85d1 100644 +index cd17bf2be53a92bcbe9c54794981753153bbef07..b85e67a85d16934c2158621b58701df403a42ff3 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java @@ -25,6 +25,7 @@ public class PathfinderGoalNearestAttackableTarget exten @@ -31,7 +31,7 @@ index cd17bf2be53..b85e67a85d1 100644 @Override diff --git a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java -index c76a43837b4..e35ec2db078 100644 +index c76a43837b443d09c0648d520b045765530d9af9..e35ec2db078cc888333cfdd44e1cd3fda71246da 100644 --- a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java +++ b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java @@ -80,7 +80,7 @@ public class PathfinderTargetCondition { @@ -62,6 +62,3 @@ index c76a43837b4..e35ec2db078 100644 + } + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0415-Optimize-Hoppers.patch b/Spigot-Server-Patches/0415-Optimize-Hoppers.patch index 45fb566791..3461c48ca2 100644 --- a/Spigot-Server-Patches/0415-Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/0415-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From 2e3c16be1393bef658a5488a38309fde4c6550be Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Optimize Hoppers @@ -13,7 +13,7 @@ Subject: [PATCH] Optimize Hoppers * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins) diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e89ad807ed9..fca4b6e20ab 100644 +index e89ad807ed96205a7bf1110d849c3459a995188d..fca4b6e20ab407ecaef3c5909c3d5e23a944e01b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -626,4 +626,13 @@ public class PaperWorldConfig { @@ -31,7 +31,7 @@ index e89ad807ed9..fca4b6e20ab 100644 + } } diff --git a/src/main/java/net/minecraft/server/IHopper.java b/src/main/java/net/minecraft/server/IHopper.java -index e1aa272e526..4da26365ec5 100644 +index e1aa272e526950e6405221e566cf4299c869a6b2..4da26365ec59ed33e10b55789e535a1c0e7b92a1 100644 --- a/src/main/java/net/minecraft/server/IHopper.java +++ b/src/main/java/net/minecraft/server/IHopper.java @@ -12,12 +12,13 @@ public interface IHopper extends IInventory { @@ -53,7 +53,7 @@ index e1aa272e526..4da26365ec5 100644 + double B();default double getZ() { return B(); } // Paper - OBFHELPER } diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index d953cdef14a..d6e43313bf0 100644 +index d953cdef14a9b62833a35a4fe94a22b5e9b19c2d..d6e43313bf0c678cf78fe77de2f8f4b6f819e3f4 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -482,11 +482,12 @@ public final class ItemStack { @@ -73,7 +73,7 @@ index d953cdef14a..d6e43313bf0 100644 itemstack.d(this.C()); if (this.tag != null) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 26be3498704..63db74993c1 100644 +index 26be34987047370b0a8971f387cf959468031ebd..63db74993c12671292b6beef45c2e8be577d4a50 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1219,6 +1219,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/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 958279249fd..a8e64dfdab1 100644 +index 958279249fdadfe5c2808d2a046636f06c3bd500..a8e64dfdab1e73894144a65c10c15d22f9198d3d 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -62,6 +62,7 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -105,7 +105,7 @@ index 958279249fd..a8e64dfdab1 100644 this.world.b(this.position, this); if (!this.c.isAir()) { diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index 907d088c869..280c4e99e82 100644 +index 907d088c8691eec5d72836ccda420a7a0703ad22..280c4e99e828114d6b517d5b7bb018ec8f4565e3 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -168,6 +168,160 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -370,7 +370,7 @@ index 907d088c869..280c4e99e82 100644 if (!list.isEmpty()) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 568e04faa31..9e161746f2a 100644 +index 568e04faa314552e14286efdfcdfb79e682fda95..9e161746f2acbe544140979bddb51ac26ee0d20f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1205,8 +1205,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -384,6 +384,3 @@ index 568e04faa31..9e161746f2a 100644 this.getMethodProfiler().c("getEntities"); int i = MathHelper.floor((axisalignedbb.minX - 2.0D) / 16.0D); int j = MathHelper.f((axisalignedbb.maxX + 2.0D) / 16.0D); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0416-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0416-PlayerDeathEvent-shouldDropExperience.patch index c1d300574b..8548fef6cd 100644 --- a/Spigot-Server-Patches/0416-PlayerDeathEvent-shouldDropExperience.patch +++ b/Spigot-Server-Patches/0416-PlayerDeathEvent-shouldDropExperience.patch @@ -1,11 +1,11 @@ -From 52c3847535ea2a326b260c32333f8a225b644fac Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 24 Dec 2019 00:35:42 +0000 Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index b9d1747ab2a..cf837bdb3b2 100644 +index b9d1747ab2a2f4efb33ae5cbe3fda5429a60ac59..cf837bdb3b2f9c89fab94e423766c6d99d31f923 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -645,7 +645,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -17,6 +17,3 @@ index b9d1747ab2a..cf837bdb3b2 100644 // we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory. if (!event.getKeepInventory()) { // Paper start - replace logic --- -2.26.2 - diff --git a/Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch index f1109a04fd..5aa65f1fea 100644 --- a/Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch +++ b/Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch @@ -1,11 +1,11 @@ -From 7a9acb2b929b4ae045ccae931154e35470d8145d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 5 Jan 2020 17:24:34 -0600 Subject: [PATCH] Prevent bees loading chunks checking hive position diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java -index b39599654e3..73e01625784 100644 +index b39599654e3e0a1120a37d254c80749ba70b3c15..73e016257847e5654e37ec6dbf8c689c36593216 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -386,6 +386,7 @@ public class EntityBee extends EntityAnimal implements EntityBird { @@ -16,6 +16,3 @@ index b39599654e3..73e01625784 100644 TileEntity tileentity = this.world.getTileEntity(this.hivePos); return tileentity != null && tileentity.getTileType() == TileEntityTypes.BEEHIVE; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch index 209c448037..ed2db84aa9 100644 --- a/Spigot-Server-Patches/0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch +++ b/Spigot-Server-Patches/0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch @@ -1,4 +1,4 @@ -From 79c84119b1beba2108c113c9b559c5c727b64cd7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Nov 2016 20:28:12 -0400 Subject: [PATCH] Don't load Chunks from Hoppers and other things @@ -13,7 +13,7 @@ This of course is undesirable, so just return the loaded side as "primary" and treat it as a single chest if the other sides are unloaded diff --git a/src/main/java/net/minecraft/server/DoubleBlockFinder.java b/src/main/java/net/minecraft/server/DoubleBlockFinder.java -index 3cb6e608956..7a16a3e0e20 100644 +index 3cb6e60895637405f163c1fac731926ee2cf0d2c..7a16a3e0e209b254db0ec15212d51fab71c17f60 100644 --- a/src/main/java/net/minecraft/server/DoubleBlockFinder.java +++ b/src/main/java/net/minecraft/server/DoubleBlockFinder.java @@ -21,8 +21,12 @@ public class DoubleBlockFinder { @@ -31,6 +31,3 @@ index 3cb6e608956..7a16a3e0e20 100644 if (iblockdata1.getBlock() == iblockdata.getBlock()) { DoubleBlockFinder.BlockType doubleblockfinder_blocktype1 = (DoubleBlockFinder.BlockType) function.apply(iblockdata1); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0419-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0419-Guard-against-serializing-mismatching-chunk-coordina.patch index a19e072db4..c654bb838c 100644 --- a/Spigot-Server-Patches/0419-Guard-against-serializing-mismatching-chunk-coordina.patch +++ b/Spigot-Server-Patches/0419-Guard-against-serializing-mismatching-chunk-coordina.patch @@ -1,4 +1,4 @@ -From dbf60c4aea0812474c4a45c78473fafcb0ca11e9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 27 Dec 2019 09:42:26 -0800 Subject: [PATCH] Guard against serializing mismatching chunk coordinate @@ -6,7 +6,7 @@ Subject: [PATCH] Guard against serializing mismatching chunk coordinate Should help if something dumb happens diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 34cd09a503b..fa893b14bce 100644 +index 34cd09a503bfe617bd50808927bae0ccf43e53fc..fa893b14bcef9bab6891dea2c4375b09d74ac038 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -23,6 +23,13 @@ public class ChunkRegionLoader { @@ -35,7 +35,7 @@ index 34cd09a503b..fa893b14bce 100644 if (!Objects.equals(chunkcoordintpair, chunkcoordintpair1)) { ChunkRegionLoader.LOGGER.error("Chunk file at {} is in the wrong location; relocating. (Expected {}, got {})", chunkcoordintpair, chunkcoordintpair, chunkcoordintpair1); diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java -index 134c76065bf..25c8b131fec 100644 +index 134c76065bf382912e6c28d15449db3f9827f848..25c8b131fec6d9076120bd8ef516b14956a668ec 100644 --- a/src/main/java/net/minecraft/server/IChunkLoader.java +++ b/src/main/java/net/minecraft/server/IChunkLoader.java @@ -106,6 +106,13 @@ public class IChunkLoader extends RegionFileCache implements AutoCloseable { @@ -52,6 +52,3 @@ index 134c76065bf..25c8b131fec 100644 super.write(chunkcoordintpair, nbttagcompound); if (this.c != null) { synchronized (this.persistentDataLock) { // Paper - Async chunk loading --- -2.26.2 - diff --git a/Spigot-Server-Patches/0420-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0420-Optimise-IEntityAccess-getPlayerByUUID.patch index 78b7a3374d..a63c91e208 100644 --- a/Spigot-Server-Patches/0420-Optimise-IEntityAccess-getPlayerByUUID.patch +++ b/Spigot-Server-Patches/0420-Optimise-IEntityAccess-getPlayerByUUID.patch @@ -1,4 +1,4 @@ -From cfb3679c56aa60beb888f2049d0951d665eadd81 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 11 Jan 2020 21:50:56 -0800 Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID Use the world entity map instead of iterating over all players diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index d5c284cdd10..4157e50e4d9 100644 +index d5c284cdd10d33f5f1b7f456d6a384a44eafb139..4157e50e4d99c029759bffcb48a8d645487554c8 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -219,6 +219,12 @@ public interface IEntityAccess { @@ -23,7 +23,7 @@ index d5c284cdd10..4157e50e4d9 100644 EntityHuman entityhuman = (EntityHuman) this.getPlayers().get(i); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 17560a20fce..c348e3e5008 100644 +index 17560a20fce7f42f98aacc42b9d4c3ab992af3cf..c348e3e5008e9213f96f2eb718cfb07c340bf77b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -82,6 +82,15 @@ public class WorldServer extends World { @@ -42,6 +42,3 @@ index 17560a20fce..c348e3e5008 100644 // Paper start - Asynchronous IO public final com.destroystokyo.paper.io.PaperFileIOThread.ChunkDataController poiDataController = new com.destroystokyo.paper.io.PaperFileIOThread.ChunkDataController() { @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0421-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0421-Fix-items-not-falling-correctly.patch index c811b6dada..ac6d68d294 100644 --- a/Spigot-Server-Patches/0421-Fix-items-not-falling-correctly.patch +++ b/Spigot-Server-Patches/0421-Fix-items-not-falling-correctly.patch @@ -1,4 +1,4 @@ -From 9536954962f7fc1e7c43193037bbf4e192b11076 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AJMFactsheets Date: Fri, 17 Jan 2020 17:17:54 -0600 Subject: [PATCH] Fix items not falling correctly @@ -15,7 +15,7 @@ This patch resolves the conflict by offsetting checking an item's move method from Spigot's entity activation range check. diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 507627a29f6..2926fbb9570 100644 +index 507627a29f67c380314d2fa8ee56807ced8ee56a..2926fbb95705f4389ca599c3bf0421267b83d401 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -86,7 +86,7 @@ public class EntityItem extends Entity { @@ -27,6 +27,3 @@ index 507627a29f6..2926fbb9570 100644 this.move(EnumMoveType.SELF, this.getMot()); float f = 0.98F; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0422-Lag-compensate-eating.patch b/Spigot-Server-Patches/0422-Lag-compensate-eating.patch index bc88aa0b9c..7970fefe87 100644 --- a/Spigot-Server-Patches/0422-Lag-compensate-eating.patch +++ b/Spigot-Server-Patches/0422-Lag-compensate-eating.patch @@ -1,4 +1,4 @@ -From 9efcbab890c45f84253c9abc75fe640c019cc4da Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Jan 2020 15:28:28 -0800 Subject: [PATCH] Lag compensate eating @@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating. Change to also use a time check instead if it passes. diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index aada8d3b08b..252b3c59294 100644 +index aada8d3b08b437f81f68f8e988412c1071287d54..252b3c59294a75618622950286969f5e656da85a 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -113,7 +113,7 @@ public abstract class EntityLiving extends Entity { @@ -82,6 +82,3 @@ index aada8d3b08b..252b3c59294 100644 } public boolean isBlocking() { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0423-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0423-Optimize-call-to-getFluid-for-explosions.patch index 6b70b7c074..1657736d45 100644 --- a/Spigot-Server-Patches/0423-Optimize-call-to-getFluid-for-explosions.patch +++ b/Spigot-Server-Patches/0423-Optimize-call-to-getFluid-for-explosions.patch @@ -1,11 +1,11 @@ -From b60afe8cf95e5f6ab6881e2a007dd2465b662ae4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BrodyBeckwith Date: Tue, 14 Jan 2020 17:49:03 -0500 Subject: [PATCH] Optimize call to getFluid for explosions diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index d99d2defe99..a353f3d5fa5 100644 +index d99d2defe9916e191ba7a2bfbd94bd72a2f5872a..a353f3d5fa5a5f54335f73584589de3f5cb20d3e 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -117,7 +117,7 @@ public class Explosion { @@ -17,6 +17,3 @@ index d99d2defe99..a353f3d5fa5 100644 if (!iblockdata.isAir() || !fluid.isEmpty()) { float f2 = Math.max(iblockdata.getBlock().getDurability(), fluid.k()); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch index bfd36a4072..a1c44ea4f9 100644 --- a/Spigot-Server-Patches/0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch +++ b/Spigot-Server-Patches/0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch @@ -1,4 +1,4 @@ -From 31e232a99f09f39503c31eb590d2becbc780d2ed Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 17 Jan 2020 18:44:55 -0800 Subject: [PATCH] Fix last firework in stack not having effects when dispensed @@ -9,7 +9,7 @@ dispensed. The resulting item would have size == 0 and therefore be convertered to air, hence why the effects disappeared. diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java -index b6b7e3c6c97..3af686c7f1e 100644 +index b6b7e3c6c973886e35bde0bf10787b62c7f015ca..3af686c7f1e483afd4dbf5e2b27c484e2ef321d0 100644 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java @@ -265,7 +265,7 @@ public interface IDispenseBehavior { @@ -21,6 +21,3 @@ index b6b7e3c6c97..3af686c7f1e 100644 entityfireworks.shoot(d0, d1, d2, 0.5F, 1.0F); isourceblock.getWorld().addEntity(entityfireworks); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0425-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0425-Entity-Activation-Range-2.0.patch index 883ac13c2a..a7d42b11bb 100644 --- a/Spigot-Server-Patches/0425-Entity-Activation-Range-2.0.patch +++ b/Spigot-Server-Patches/0425-Entity-Activation-Range-2.0.patch @@ -1,4 +1,4 @@ -From 33013e82ce9c1ab73845fe489fc0bf3030bb62d8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 13 May 2016 01:38:06 -0400 Subject: [PATCH] Entity Activation Range 2.0 @@ -14,7 +14,7 @@ Adds flying monsters to control ghast and phantoms Adds villagers as separate config diff --git a/src/main/java/net/minecraft/server/BehaviorController.java b/src/main/java/net/minecraft/server/BehaviorController.java -index a1883eba63e..7c6e687707c 100644 +index a1883eba63e0da420a3cf57b8da6ebdb2afbad80..7c6e687707cdf32638eee41e549818a494cd45ab 100644 --- a/src/main/java/net/minecraft/server/BehaviorController.java +++ b/src/main/java/net/minecraft/server/BehaviorController.java @@ -161,6 +161,7 @@ public class BehaviorController implements MinecraftSeri @@ -26,7 +26,7 @@ index a1883eba63e..7c6e687707c 100644 return this.g.contains(activity); } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index fd6dad8437b..067420f1955 100644 +index fd6dad8437b6a73439b1b4bae34902e1c71c9bd3..067420f19559f66860a2859a33e7d11786273315 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -192,6 +192,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -68,7 +68,7 @@ index fd6dad8437b..067420f1955 100644 // Paper start return this.pushedByWater(); diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java -index b40c8d2f83a..4eda130750f 100644 +index b40c8d2f83a80bcb8925632a1e7d6bb4cc0caebf..4eda130750ff4903c3dc7d2afae09b8b77ff62b9 100644 --- a/src/main/java/net/minecraft/server/EntityCreature.java +++ b/src/main/java/net/minecraft/server/EntityCreature.java @@ -7,6 +7,7 @@ import org.bukkit.event.entity.EntityUnleashEvent; @@ -80,7 +80,7 @@ index b40c8d2f83a..4eda130750f 100644 protected EntityCreature(EntityTypes entitytypes, World world) { super(entitytypes, world); diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 6d53254f838..5aca7a91317 100644 +index 6d53254f8381f3a957673930c7fdf42d4b9d2f36..5aca7a9131787415fb2edba1ebec9601e8a56d3a 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -46,7 +46,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -111,7 +111,7 @@ index 6d53254f838..5aca7a91317 100644 if (this.isPassenger() && this.getVehicle() instanceof EntityInsentient) { EntityInsentient entityinsentient = (EntityInsentient) this.getVehicle(); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 252b3c59294..38f666bb115 100644 +index 252b3c59294a75618622950286969f5e656da85a..38f666bb115d7d29da8eac1f4848ba23ef29ba43 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -91,7 +91,7 @@ public abstract class EntityLiving extends Entity { @@ -124,7 +124,7 @@ index 252b3c59294..38f666bb115 100644 public float ba; public float bb; diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java -index 6d4d41c88c2..193dbfc5f68 100644 +index 6d4d41c88c206ad63f3733b5c8b3f23eb40dde52..193dbfc5f684bfe46f69cb2ab2c52dbb44707792 100644 --- a/src/main/java/net/minecraft/server/EntityLlama.java +++ b/src/main/java/net/minecraft/server/EntityLlama.java @@ -382,6 +382,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn @@ -136,7 +136,7 @@ index 6d4d41c88c2..193dbfc5f68 100644 return this.bJ != null; } diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java -index f22f12eeb0b..bdb90a34663 100644 +index f22f12eeb0b10d038fcd74cc4b19e888b134c3c7..bdb90a346639db37d3c72359c28b72d021d1b389 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java @@ -20,7 +20,10 @@ public abstract class PathfinderGoal { @@ -152,7 +152,7 @@ index f22f12eeb0b..bdb90a34663 100644 public void e() {} diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java -index 41fb166ce0a..e93129f0b28 100644 +index 41fb166ce0ab29148ebd40e147fef98d1a2e9609..e93129f0b281e242383e36c99d19f6b0577a0b6b 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java @@ -4,12 +4,12 @@ import java.util.EnumSet; @@ -193,7 +193,7 @@ index 41fb166ce0a..e93129f0b28 100644 } } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java -index 44bb18c5945..935136771e7 100644 +index 44bb18c5945b69f09b3a6e6272f2c3a5477780c7..935136771e776fe498f608a159a41393340adc4e 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java @@ -24,10 +24,11 @@ public class PathfinderGoalSelector { @@ -237,7 +237,7 @@ index 44bb18c5945..935136771e7 100644 this.d.stream().filter((pathfindergoalwrapped) -> { return pathfindergoalwrapped.j() == pathfindergoal; diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java -index 5a8c60ad909..29657fed751 100644 +index 5a8c60ad909394413427851db8068ba79c058b63..29657fed75184aee0c89e56f5e642a5d68eda444 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java @@ -64,6 +64,7 @@ public class PathfinderGoalWrapped extends PathfinderGoal { @@ -249,7 +249,7 @@ index 5a8c60ad909..29657fed751 100644 return this.c; } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9e161746f2a..228e6e9ab99 100644 +index 9e161746f2acbe544140979bddb51ac26ee0d20f..228e6e9ab997394dc99775a5f787455b8b7d6d63 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -76,6 +76,12 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -266,7 +266,7 @@ index 9e161746f2a..228e6e9ab99 100644 public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 92601c581cf..d873b8cf3ae 100644 +index 92601c581cffac471872226abeb93ef9aa24f079..d873b8cf3aec01b791565c33b252889f99f181f9 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -2,24 +2,34 @@ package org.spigotmc; @@ -653,7 +653,7 @@ index 92601c581cf..d873b8cf3ae 100644 isActive = false; } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 5e932a5d979..9d706626bf2 100644 +index 5e932a5d979a7253059e3c29c6ee846ad39214a5..9d706626bf25c278eb1c3a232eeacc4d241a466e 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -180,13 +180,59 @@ public class SpigotWorldConfig @@ -716,6 +716,3 @@ index 5e932a5d979..9d706626bf2 100644 tickInactiveVillagers = getBoolean( "entity-activation-range.tick-inactive-villagers", tickInactiveVillagers ); log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Ra " + raiderActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers ); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0426-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0426-Add-effect-to-block-break-naturally.patch index 3778a1940a..fdcffa3b0f 100644 --- a/Spigot-Server-Patches/0426-Add-effect-to-block-break-naturally.patch +++ b/Spigot-Server-Patches/0426-Add-effect-to-block-break-naturally.patch @@ -1,11 +1,11 @@ -From 7c5edd1b9c247c6fa959d7ee26b1bc1c2df83208 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 12:25:07 -0600 Subject: [PATCH] Add effect to block break naturally diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index db446c25c41..01c524cc017 100644 +index db446c25c41ec3122155510f9d96dfdeee626896..01c524cc01768fe0f2dbf062bcc19fcb982d32da 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -606,12 +606,20 @@ public class CraftBlock implements Block { @@ -29,6 +29,3 @@ index db446c25c41..01c524cc017 100644 result = true; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0427-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0427-Tracking-Range-Improvements.patch index 40311e96d3..62c61d5bfb 100644 --- a/Spigot-Server-Patches/0427-Tracking-Range-Improvements.patch +++ b/Spigot-Server-Patches/0427-Tracking-Range-Improvements.patch @@ -1,4 +1,4 @@ -From 6b6cdf8d8327e083ce4870d76cc47be1e12460b6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Sat, 21 Dec 2019 15:22:09 -0500 Subject: [PATCH] Tracking Range Improvements @@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code Also ignores Enderdragon, defaulting it to Mojang's setting diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 692388821a7..6eb05591317 100644 +index 692388821a795f60ffab8459475a764e1c409e2e..6eb055913177b0c01a027b2b356190dc561072c5 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1737,6 +1737,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -20,7 +20,7 @@ index 692388821a7..6eb05591317 100644 if (j > i) { i = j; diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java -index 6f8e6c1d079..765bdaf9b52 100644 +index 6f8e6c1d079f82d7706d0b4f710bfb9b50e209d9..765bdaf9b525a989ec8d37a2fe856dcfcbd06782 100644 --- a/src/main/java/org/spigotmc/TrackingRange.java +++ b/src/main/java/org/spigotmc/TrackingRange.java @@ -1,6 +1,7 @@ @@ -73,6 +73,3 @@ index 6f8e6c1d079..765bdaf9b52 100644 return config.otherTrackingRange; } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch b/Spigot-Server-Patches/0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch index 92be5c7557..3e04bb18fc 100644 --- a/Spigot-Server-Patches/0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch +++ b/Spigot-Server-Patches/0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch @@ -1,11 +1,11 @@ -From b718f60b6d3b66c86051d1a17e260526aec7a9a0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 22 Jan 2020 21:00:21 +0000 Subject: [PATCH] Fix comparator behavior for EntityPhanton goal diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index 82323bf4acc..90eeddb1af5 100644 +index 82323bf4acc140d279c399cc64fa393a0db90136..90eeddb1af59126ea7ca19c2cc909da72578fb6c 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -224,7 +224,7 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -17,6 +17,3 @@ index 82323bf4acc..90eeddb1af5 100644 }); Iterator iterator = list.iterator(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch index ef0a9d9ac7..314ab758ba 100644 --- a/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch +++ b/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch @@ -1,4 +1,4 @@ -From 46307cc2e05cfdd0f870bef095db58e521aff169 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AJMFactsheets Date: Wed, 22 Jan 2020 19:52:28 -0600 Subject: [PATCH] Fix items vanishing through end portal @@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the heightmap resolves the issue without having to load all spawn chunks. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 067420f1955..599bcabd14a 100644 +index 067420f19559f66860a2859a33e7d11786273315..599bcabd14a7f234d2cf7f2755d76413e7d0ceac 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2611,6 +2611,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -28,6 +28,3 @@ index 067420f1955..599bcabd14a 100644 // CraftBukkit start EntityPortalEvent event = CraftEventFactory.callEntityPortalEvent(this, worldserver1, worldserver1.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, worldserver1.getSpawn()), 0); if (event == null) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0430-Seed-based-feature-search.patch b/Spigot-Server-Patches/0430-Seed-based-feature-search.patch index 1bf66dd5cd..17e9a84772 100644 --- a/Spigot-Server-Patches/0430-Seed-based-feature-search.patch +++ b/Spigot-Server-Patches/0430-Seed-based-feature-search.patch @@ -1,4 +1,4 @@ -From 9af59b7f553993afac4f6d5725550b3c8ce38d4a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Mon, 13 Jan 2020 15:40:32 +0100 Subject: [PATCH] Seed based feature search @@ -15,7 +15,7 @@ changes but this should usually not happen. A config option to disable this improvement is added though in case that should ever be necessary. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index fca4b6e20ab..ade7af40eff 100644 +index fca4b6e20ab407ecaef3c5909c3d5e23a944e01b..ade7af40effbfff72e731628ac45c5fc40507c99 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -357,6 +357,12 @@ public class PaperWorldConfig { @@ -32,7 +32,7 @@ index fca4b6e20ab..ade7af40eff 100644 private void maxEntityCollision() { maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) ); diff --git a/src/main/java/net/minecraft/server/BiomeManager.java b/src/main/java/net/minecraft/server/BiomeManager.java -index e96f544f126..68423645df3 100644 +index e96f544f126371f6f629a20ba3c99ba42d31e04a..68423645df3aa08d4c5126ff068d5e566927f744 100644 --- a/src/main/java/net/minecraft/server/BiomeManager.java +++ b/src/main/java/net/minecraft/server/BiomeManager.java @@ -12,10 +12,12 @@ public class BiomeManager { @@ -49,7 +49,7 @@ index e96f544f126..68423645df3 100644 return this.c.a(this.b, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this.a); } diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java -index f2a19acd845..09f1308b0d0 100644 +index f2a19acd84561e746bfc8da0331b5d4055e95327..09f1308b0d092877fae64ce3ab4cce7e460e3c4d 100644 --- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java +++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java @@ -64,10 +64,12 @@ public class ChunkCoordIntPair { @@ -66,7 +66,7 @@ index f2a19acd845..09f1308b0d0 100644 return this.z << 4; } diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java -index e8ce2ecf23e..acfe732af5b 100644 +index e8ce2ecf23e58d82febf6b9441e0004e69cdc858..acfe732af5b9f63fc2f6b78499defabe2e73ee45 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -109,6 +109,15 @@ public abstract class StructureGenerator @@ -94,7 +94,7 @@ index e8ce2ecf23e..acfe732af5b 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 228e6e9ab99..f1d072a39cc 100644 +index 228e6e9ab997394dc99775a5f787455b8b7d6d63..f1d072a39cc2f0f7b214e7794f8dc5dcc282d6b3 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1569,8 +1569,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -108,6 +108,3 @@ index 228e6e9ab99..f1d072a39cc 100644 return this.biomeManager; } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch index e431e22dba..f20d611888 100644 --- a/Spigot-Server-Patches/0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch +++ b/Spigot-Server-Patches/0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch @@ -1,11 +1,11 @@ -From 493bb05332e776809acae159664d69fd7c222185 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 26 Jan 2020 16:30:19 -0600 Subject: [PATCH] Bees get gravity in void. Fixes MC-167279 diff --git a/src/main/java/net/minecraft/server/ControllerMove.java b/src/main/java/net/minecraft/server/ControllerMove.java -index 7e3671dae61..a5c4cbb67f0 100644 +index 7e3671dae6194a9caad68054fb61c9e441b2d538..a5c4cbb67f030760e64e75e618285bd98083c5b5 100644 --- a/src/main/java/net/minecraft/server/ControllerMove.java +++ b/src/main/java/net/minecraft/server/ControllerMove.java @@ -2,7 +2,7 @@ package net.minecraft.server; @@ -18,7 +18,7 @@ index 7e3671dae61..a5c4cbb67f0 100644 protected double c; protected double d; diff --git a/src/main/java/net/minecraft/server/ControllerMoveFlying.java b/src/main/java/net/minecraft/server/ControllerMoveFlying.java -index 2b6ac2eeb0f..0496c0c5dbb 100644 +index 2b6ac2eeb0fdf35e75c35144941d7fb82cb8adc1..0496c0c5dbbcf89461c947881129673fa4f33e42 100644 --- a/src/main/java/net/minecraft/server/ControllerMoveFlying.java +++ b/src/main/java/net/minecraft/server/ControllerMoveFlying.java @@ -12,7 +12,7 @@ public class ControllerMoveFlying extends ControllerMove { @@ -31,7 +31,7 @@ index 2b6ac2eeb0f..0496c0c5dbb 100644 this.h = ControllerMove.Operation.WAIT; this.a.setNoGravity(true); diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java -index 73e01625784..c7d79efdf6e 100644 +index 73e016257847e5654e37ec6dbf8c689c36593216..c7d79efdf6ee3b1ac910ff48bfd4b0ef084b4d43 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -36,7 +36,17 @@ public class EntityBee extends EntityAnimal implements EntityBird { @@ -53,6 +53,3 @@ index 73e01625784..c7d79efdf6e 100644 this.lookController = new EntityBee.j(this); this.a(PathType.WATER, -1.0F); this.a(PathType.COCOA, -1.0F); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch index 483c538893..1f97d6f40e 100644 --- a/Spigot-Server-Patches/0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch +++ b/Spigot-Server-Patches/0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch @@ -1,4 +1,4 @@ -From 549612dc773af3de62aa21bc9d14542502120044 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 fe894a68bc2..e67e0065357 100644 +index fe894a68bc28ed01819bb538079856712f813713..e67e00653575c3e57fe16980d2ff074d8413a95e 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -435,6 +435,12 @@ public class ChunkProviderServer extends IChunkProvider { @@ -65,7 +65,7 @@ index fe894a68bc2..e67e0065357 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index f1d072a39cc..0c23fc89d7a 100644 +index f1d072a39cc2f0f7b214e7794f8dc5dcc282d6b3..0c23fc89d7ad980aa8b094784e88e2d91fb4f07b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -265,6 +265,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -83,6 +83,3 @@ index f1d072a39cc..0c23fc89d7a 100644 return (Chunk) this.getChunkAt(i, j, ChunkStatus.FULL); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0433-Be-more-tolerant-of-invalid-attributes.patch b/Spigot-Server-Patches/0433-Be-more-tolerant-of-invalid-attributes.patch index 21aec1a5db..9f40d486f6 100644 --- a/Spigot-Server-Patches/0433-Be-more-tolerant-of-invalid-attributes.patch +++ b/Spigot-Server-Patches/0433-Be-more-tolerant-of-invalid-attributes.patch @@ -1,4 +1,4 @@ -From a56e3e783fa197e1fc497e76640855b6f1d9b66f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 6 Feb 2020 19:20:27 -0600 Subject: [PATCH] Be more tolerant of invalid attributes @@ -11,7 +11,7 @@ In a more perfect world the API would expose some way to interact with these att particularly flexible in this area. Perhaps this is an area for future expansion at a later time. diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java -index 77e584b129a..007d28b16ce 100644 +index 77e584b129ab21959b7c33ac45e5841935e86ac8..007d28b16ce16295c7d398c09557b8c0777657c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java +++ b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java @@ -47,6 +47,12 @@ public class CraftAttributeMap implements Attributable { @@ -27,6 +27,3 @@ index 77e584b129a..007d28b16ce 100644 String generic = split[0]; String descriptor = CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, split[1]); // movementSpeed -> MOVEMENT_SPEED String fin = generic + "_" + descriptor; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0434-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0434-Allow-overriding-the-java-version-check.patch index 81ace371c4..0f8fe08741 100644 --- a/Spigot-Server-Patches/0434-Allow-overriding-the-java-version-check.patch +++ b/Spigot-Server-Patches/0434-Allow-overriding-the-java-version-check.patch @@ -1,4 +1,4 @@ -From 564d94bbaa8140e3e35a3ee2611bdf8e0db6abc2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 8 Feb 2020 18:02:24 -0600 Subject: [PATCH] Allow overriding the java version check @@ -6,7 +6,7 @@ Subject: [PATCH] Allow overriding the java version check -DPaper.IgnoreJavaVersion=true diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index bf0a0201894..093dbeae278 100644 +index bf0a020189425d6507fa75f68f8e754723c58818..093dbeae2784d51dae74f66e3e1ce5bf6a370428 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -175,7 +175,7 @@ public class Main { @@ -18,6 +18,3 @@ index bf0a0201894..093dbeae278 100644 } try { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0435-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0435-Add-ThrownEggHatchEvent.patch index 44bc30021e..42e3a2e270 100644 --- a/Spigot-Server-Patches/0435-Add-ThrownEggHatchEvent.patch +++ b/Spigot-Server-Patches/0435-Add-ThrownEggHatchEvent.patch @@ -1,4 +1,4 @@ -From 4f57e24a7223d126b1af51ee1a74086acf79a2f9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 9 Feb 2020 00:19:05 -0600 Subject: [PATCH] Add ThrownEggHatchEvent @@ -7,7 +7,7 @@ Adds a new event similar to PlayerEggThrowEvent, but without the Player requirem (dispensers can throw eggs to hatch them, too). diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java -index 970f9109d9b..bdd82d052a2 100644 +index 970f9109d9bdea5556dc2ac7752860378623ecfa..bdd82d052a2b04744435e5695b4578c7872d8d52 100644 --- a/src/main/java/net/minecraft/server/EntityEgg.java +++ b/src/main/java/net/minecraft/server/EntityEgg.java @@ -52,6 +52,16 @@ public class EntityEgg extends EntityProjectileThrowable { @@ -27,6 +27,3 @@ index 970f9109d9b..bdd82d052a2 100644 if (hatching) { for (int i = 0; i < b0; ++i) { Entity entity = world.getWorld().createEntity(new org.bukkit.Location(world.getWorld(), this.locX(), this.locY(), this.locZ(), this.yaw, 0.0F), hatchingType.getEntityClass()); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0436-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0436-Optimise-random-block-ticking.patch index 41738217e6..a1c03caef8 100644 --- a/Spigot-Server-Patches/0436-Optimise-random-block-ticking.patch +++ b/Spigot-Server-Patches/0436-Optimise-random-block-ticking.patch @@ -1,4 +1,4 @@ -From d45dfa8834ff0c2034f66e574de6f43bd26489d2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 00000000000..3edc8e52e06 +index 0000000000000000000000000000000000000000..3edc8e52e06a62ce9f8cc734fd7458b37cfaad91 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/math/ThreadUnsafeRandom.java @@ -0,0 +1,46 @@ @@ -71,7 +71,7 @@ index 00000000000..3edc8e52e06 + } +} diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index e29ec958b35..e40375b67a4 100644 +index e29ec958b3519d92cda215a50e97e6852d71c684..e40375b67a4a321048c87002a07fde5c5d2395db 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 e29ec958b35..e40375b67a4 100644 } diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java -index 6d351f0979e..a44f65f40d2 100644 +index 6d351f0979ecfa8e500edf8dd03b4a455fd5d180..a44f65f40d2080b63069602a454266ee6fe6cff7 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 6d351f0979e..a44f65f40d2 100644 @Override diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index db7ba12fd4f..9010359fbdc 100644 +index db7ba12fd4fa4f30b94471f1efbec5426b99a5db..9010359fbdc393e43ab2a0702cfc27427458b1ff 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -451,6 +451,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -111,7 +111,7 @@ index db7ba12fd4f..9010359fbdc 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 a2a0ca3394c..bb95fe20e8a 100644 +index a2a0ca3394c3231aad9888fecebdaf82d4d9e9f7..bb95fe20e8aee58cf20fa764000b9f9123f367d3 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -586,8 +586,8 @@ public class Chunk implements IChunkAccess { @@ -126,7 +126,7 @@ index a2a0ca3394c..bb95fe20e8a 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index eeb7eee925d..64b625e988f 100644 +index eeb7eee925d31d1ed8e6bbd55888cb5ebe54afa2..64b625e988f6bb6dc7129b4cb70e266015ab0867 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -6,12 +6,14 @@ import javax.annotation.Nullable; @@ -202,7 +202,7 @@ index eeb7eee925d..64b625e988f 100644 } diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java -index f9680b6830c..a61cffa3f49 100644 +index f9680b6830c77f31e1eb8b6845dd6d58d04f624a..a61cffa3f494be5fea785a573b0faf05b149a30d 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 { @@ -253,7 +253,7 @@ index f9680b6830c..a61cffa3f49 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index 2c7872bd051..be5f98c3c36 100644 +index 2c7872bd0516c820a42682b5281dbbaa1b467beb..be5f98c3c368cb046112dc488344bb529fc395c1 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -281,6 +281,14 @@ public class DataPaletteBlock implements DataPaletteExpandable { @@ -272,7 +272,7 @@ index 2c7872bd051..be5f98c3c36 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 dd02cb34850..b24a5100b45 100644 +index dd02cb3485021c3afd23c2985a71e93c6b0ab07d..b24a5100b452f69f771b724ca96d34613c7fa170 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 { @@ -285,7 +285,7 @@ index dd02cb34850..b24a5100b45 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 de43881653f..e821c236b45 100644 +index de43881653ff37e38dc42c7f953dc96126a30c61..e821c236b45993cf4fb670cafbc979ead7d207a1 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 @@ -338,7 +338,7 @@ index de43881653f..e821c236b45 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 0c23fc89d7a..de9f49b8848 100644 +index 0c23fc89d7ad980aa8b094784e88e2d91fb4f07b..de9f49b884838105c537b73d69234eb26fddb708 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1563,10 +1563,19 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -363,7 +363,7 @@ index 0c23fc89d7a..de9f49b8848 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 c348e3e5008..fcbc9f29139 100644 +index c348e3e5008e9213f96f2eb718cfb07c340bf77b..fcbc9f29139ce5cd3b165130006f9c326a5d9eea 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -531,7 +531,12 @@ public class WorldServer extends World { @@ -506,6 +506,3 @@ index c348e3e5008..fcbc9f29139 100644 } protected BlockPosition a(BlockPosition blockposition) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0437-Entity-Jump-API.patch b/Spigot-Server-Patches/0437-Entity-Jump-API.patch index f2d026599a..929f727354 100644 --- a/Spigot-Server-Patches/0437-Entity-Jump-API.patch +++ b/Spigot-Server-Patches/0437-Entity-Jump-API.patch @@ -1,11 +1,11 @@ -From 2ff08448c0940e1c33341da273166f342dfd9549 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 8 Feb 2020 23:26:11 -0600 Subject: [PATCH] Entity Jump API diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 38f666bb115..253e35826f6 100644 +index 38f666bb115d7d29da8eac1f4848ba23ef29ba43..253e35826f6f51145c278b083d195599affca2a7 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2608,8 +2608,10 @@ public abstract class EntityLiving extends Entity { @@ -20,7 +20,7 @@ index 38f666bb115..253e35826f6 100644 } else { this.jumpTicks = 0; diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java -index cd41c80f191..f50ed190802 100644 +index cd41c80f19105633305be933ac20fc5548b1c5f7..f50ed19080257b9199bf1b8b846877a2ba1cafbb 100644 --- a/src/main/java/net/minecraft/server/EntityPanda.java +++ b/src/main/java/net/minecraft/server/EntityPanda.java @@ -438,7 +438,9 @@ public class EntityPanda extends EntityAnimal { @@ -34,7 +34,7 @@ index cd41c80f191..f50ed190802 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 7d101d96308..245bd116d14 100644 +index 7d101d9630848b68b15acc5efdc16ae51dc1f132..245bd116d143af120127a9d25dcb7a0c43ad47a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -723,5 +723,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -58,6 +58,3 @@ index 7d101d96308..245bd116d14 100644 + // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch index f8dfa5c57c..474f67c4c4 100644 --- a/Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -1,11 +1,11 @@ -From e8a2b0157bca4740f685aace8f8a274bee018df7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 7 Feb 2020 14:36:56 -0600 Subject: [PATCH] Add option to nerf pigmen from nether portals diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ade7af40eff..47c6d66b78e 100644 +index ade7af40effbfff72e731628ac45c5fc40507c99..47c6d66b78ed312ef85dd90178c7d6059bc94661 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -641,4 +641,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index ade7af40eff..47c6d66b78e 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java -index 2dc3ab4cfa3..09c7c131833 100644 +index 2dc3ab4cfa3fb9335d271e91c89f0b22f21eeb39..09c7c131833ded951e49a7a1a2eb2e1f6f8cb989 100644 --- a/src/main/java/net/minecraft/server/BlockPortal.java +++ b/src/main/java/net/minecraft/server/BlockPortal.java @@ -45,6 +45,8 @@ public class BlockPortal extends Block { @@ -32,7 +32,7 @@ index 2dc3ab4cfa3..09c7c131833 100644 } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 599bcabd14a..00df89d6509 100644 +index 599bcabd14a7f234d2cf7f2755d76413e7d0ceac..00df89d65099cbdd96c77ac26c892f05a2c37d79 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -194,6 +194,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -61,6 +61,3 @@ index 599bcabd14a..00df89d6509 100644 if (nbttagcompound.hasKey("Paper.SpawnReason")) { String spawnReasonName = nbttagcompound.getString("Paper.SpawnReason"); try { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0439-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0439-Make-the-GUI-graph-fancier.patch index 957358ac95..877d9a385d 100644 --- a/Spigot-Server-Patches/0439-Make-the-GUI-graph-fancier.patch +++ b/Spigot-Server-Patches/0439-Make-the-GUI-graph-fancier.patch @@ -1,4 +1,4 @@ -From 5bf76c13c7e5ee7394a9cb9c57fba8869d30dac4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 2 Feb 2020 04:00:40 -0600 Subject: [PATCH] Make the GUI graph fancier @@ -6,7 +6,7 @@ Subject: [PATCH] Make the GUI graph fancier diff --git a/src/main/java/com/destroystokyo/paper/gui/GraphColor.java b/src/main/java/com/destroystokyo/paper/gui/GraphColor.java new file mode 100644 -index 00000000000..a4e641fdccc +index 0000000000000000000000000000000000000000..a4e641fdcccd3efcd1a2865dc6dc28d50671b995 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/gui/GraphColor.java @@ -0,0 +1,44 @@ @@ -56,7 +56,7 @@ index 00000000000..a4e641fdccc +} diff --git a/src/main/java/com/destroystokyo/paper/gui/GraphData.java b/src/main/java/com/destroystokyo/paper/gui/GraphData.java new file mode 100644 -index 00000000000..186fc722965 +index 0000000000000000000000000000000000000000..186fc722965e403f76b1480e1c2381fc34e29049 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/gui/GraphData.java @@ -0,0 +1,47 @@ @@ -109,7 +109,7 @@ index 00000000000..186fc722965 +} diff --git a/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java b/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java new file mode 100644 -index 00000000000..0f29ad583e7 +index 0000000000000000000000000000000000000000..0f29ad583e798c09b2fe3f568ed50cbc719e40e2 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java @@ -0,0 +1,41 @@ @@ -156,7 +156,7 @@ index 00000000000..0f29ad583e7 +} diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java new file mode 100644 -index 00000000000..e463a86a6ad +index 0000000000000000000000000000000000000000..e463a86a6ad6c4f2885f4df159411bad294e1208 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java @@ -0,0 +1,74 @@ @@ -236,7 +236,7 @@ index 00000000000..e463a86a6ad +} diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java b/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java new file mode 100644 -index 00000000000..c3e54da4ab6 +index 0000000000000000000000000000000000000000..c3e54da4ab6440811aab2f9dd1e218802ac13285 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java @@ -0,0 +1,144 @@ @@ -385,7 +385,7 @@ index 00000000000..c3e54da4ab6 + } +} diff --git a/src/main/java/net/minecraft/server/GuiStatsComponent.java b/src/main/java/net/minecraft/server/GuiStatsComponent.java -index c21db8e6b79..7b6e9352578 100644 +index c21db8e6b798cd5106801d666f14d1d73d5e84ed..7b6e9352578aecf37c5827ba2b2596d07851bf9a 100644 --- a/src/main/java/net/minecraft/server/GuiStatsComponent.java +++ b/src/main/java/net/minecraft/server/GuiStatsComponent.java @@ -12,7 +12,7 @@ import javax.swing.Timer; @@ -398,7 +398,7 @@ index c21db8e6b79..7b6e9352578 100644 }); private final int[] b = new int[256]; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 63db74993c1..d1f82eff218 100644 +index 63db74993c12671292b6beef45c2e8be577d4a50..d1f82eff218d6492bb27f05d82e03abd9add6909 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -105,7 +105,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 21 Feb 2020 18:44:28 +0000 Subject: [PATCH] Backport fix for MC-167561 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java -index db15d5e0a23..eec1e26b6eb 100644 +index db15d5e0a23c414742ac73785d29aeadd432d3d7..eec1e26b6eba07c31d251ecf69dc36199688110e 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -296,7 +296,14 @@ public class EntityWolf extends EntityTameableAnimal { @@ -39,6 +39,3 @@ index db15d5e0a23..eec1e26b6eb 100644 } else if (item == Items.BONE && !this.isAngry()) { if (!entityhuman.abilities.canInstantlyBuild) { itemstack.subtract(1); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch index d874c3aac1..e92e110b52 100644 --- a/Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch +++ b/Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch @@ -1,11 +1,11 @@ -From 0dc82d15ad22fe076a72056f2f33d5b3f2539d81 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Trigary Date: Sun, 1 Mar 2020 22:43:24 +0100 Subject: [PATCH] add hand to BlockMultiPlaceEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index fcf2b190aaf..c3f7e461210 100644 +index fcf2b190aaf7a9b7b4e34102f98e1ba7f428e868..c3f7e4612109f92ed789021b5acd1af8791d1666 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -303,13 +303,18 @@ public class CraftEventFactory { @@ -28,6 +28,3 @@ index fcf2b190aaf..c3f7e461210 100644 craftServer.getPluginManager().callEvent(event); return event; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0442-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0442-Prevent-teleporting-dead-entities.patch index c2f66c3bd9..34aad718c7 100644 --- a/Spigot-Server-Patches/0442-Prevent-teleporting-dead-entities.patch +++ b/Spigot-Server-Patches/0442-Prevent-teleporting-dead-entities.patch @@ -1,11 +1,11 @@ -From 5b9ca387d0968d488e0f86614a2143f982b51225 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 3 Mar 2020 05:26:40 +0000 Subject: [PATCH] Prevent teleporting dead entities diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 71d045ee00d..2e81f3a1d93 100644 +index 71d045ee00d1f172d88f076d15cf82bae2527ae8..2e81f3a1d93d66c94e9f0d425f9cee6db4940913 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1209,6 +1209,10 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -19,6 +19,3 @@ index 71d045ee00d..2e81f3a1d93 100644 // CraftBukkit start if (Float.isNaN(f)) { f = 0; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0443-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0443-Validate-tripwire-hook-placement-before-update.patch index 8e7f246f82..eb09d84299 100644 --- a/Spigot-Server-Patches/0443-Validate-tripwire-hook-placement-before-update.patch +++ b/Spigot-Server-Patches/0443-Validate-tripwire-hook-placement-before-update.patch @@ -1,11 +1,11 @@ -From f4a127bb46e7480a5709c3ba832b87e5fec90e0c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 7 Mar 2020 00:07:51 +0000 Subject: [PATCH] Validate tripwire hook placement before update diff --git a/src/main/java/net/minecraft/server/BlockTripwireHook.java b/src/main/java/net/minecraft/server/BlockTripwireHook.java -index 1b9d889af6b..a5e6e94fe0d 100644 +index 1b9d889af6bdefed0d6a3ebc832c39effb8af0b9..a5e6e94fe0d7702594a842bcfec2fcaae9f19d7f 100644 --- a/src/main/java/net/minecraft/server/BlockTripwireHook.java +++ b/src/main/java/net/minecraft/server/BlockTripwireHook.java @@ -149,6 +149,7 @@ public class BlockTripwireHook extends Block { @@ -16,6 +16,3 @@ index 1b9d889af6b..a5e6e94fe0d 100644 world.setTypeAndData(blockposition, (IBlockData) iblockdata3.set(BlockTripwireHook.FACING, enumdirection), 3); if (flag1) { this.a(world, blockposition, enumdirection); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch index f0babed976..dfcc131bd9 100644 --- a/Spigot-Server-Patches/0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch +++ b/Spigot-Server-Patches/0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch @@ -1,11 +1,11 @@ -From 192d3a89332e086f0647af17844cd05b19f1f7d8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 13 Apr 2019 16:50:58 -0500 Subject: [PATCH] Add option to allow iron golems to spawn in air diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 47c6d66b78e..b773b750ae4 100644 +index 47c6d66b78ed312ef85dd90178c7d6059bc94661..b773b750ae4cd41708e3fde4c88b5cf1af7098cb 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -413,6 +413,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 47c6d66b78e..b773b750ae4 100644 private void bedSearchRadius() { bedSearchRadius = getInt("bed-search-radius", 1); diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java -index 2f764776b2f..7f6a5677600 100644 +index 2f764776b2fd7b9fd7c2489f1ab914dc6d2f121a..7f6a56776000643ecc42b0b917f6673b7b038d79 100644 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java @@ -221,7 +221,7 @@ public class EntityIronGolem extends EntityGolem { @@ -33,6 +33,3 @@ index 2f764776b2f..7f6a5677600 100644 return false; } else { for (int i = 1; i < 3; ++i) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0445-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0445-Configurable-chance-of-villager-zombie-infection.patch index acdef7a845..15dd64a584 100644 --- a/Spigot-Server-Patches/0445-Configurable-chance-of-villager-zombie-infection.patch +++ b/Spigot-Server-Patches/0445-Configurable-chance-of-villager-zombie-infection.patch @@ -1,4 +1,4 @@ -From 6e2480233d20a29cead315f160935d6816919a4b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zero Date: Sat, 22 Feb 2020 16:10:31 -0500 Subject: [PATCH] Configurable chance of villager zombie infection @@ -8,7 +8,7 @@ This allows you to solve an issue in vanilla behavior where: * On normal difficulty they will have a 50% of getting infected or dying. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b773b750ae4..c3af4c9a9fe 100644 +index b773b750ae4cd41708e3fde4c88b5cf1af7098cb..c3af4c9a9fe67b7a9c0eda5606e1c97bad778927 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -651,4 +651,9 @@ public class PaperWorldConfig { @@ -22,7 +22,7 @@ index b773b750ae4..c3af4c9a9fe 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 8635d4f40ca..07ebc1d8161 100644 +index 8635d4f40ca153819e0fda014d7ea3795f86b940..07ebc1d81610bc506e51c7bbffefdcf676a2bb85 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -455,10 +455,14 @@ public class EntityZombie extends EntityMonster { @@ -43,6 +43,3 @@ index 8635d4f40ca..07ebc1d8161 100644 EntityVillager entityvillager = (EntityVillager) entityliving; EntityZombieVillager entityzombievillager = (EntityZombieVillager) EntityTypes.ZOMBIE_VILLAGER.a(this.world); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0446-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0446-Optimise-Chunk-getFluid.patch index 44e9bb3a94..a998a17cb4 100644 --- a/Spigot-Server-Patches/0446-Optimise-Chunk-getFluid.patch +++ b/Spigot-Server-Patches/0446-Optimise-Chunk-getFluid.patch @@ -1,4 +1,4 @@ -From 6268c9dcf697b86724085367d7ad14ddea65d49b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Jan 2020 14:59:08 -0800 Subject: [PATCH] Optimise Chunk#getFluid @@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it easier to inline due to code size diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index bb95fe20e8a..33456b0bb42 100644 +index bb95fe20e8aee58cf20fa764000b9f9123f367d3..33456b0bb421d253aa8366210f41a9da7dcd1699 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -379,17 +379,20 @@ public class Chunk implements IChunkAccess { @@ -48,7 +48,7 @@ index bb95fe20e8a..33456b0bb42 100644 // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index 64b625e988f..b7b06e082e5 100644 +index 64b625e988f6bb6dc7129b4cb70e266015ab0867..b7b06e082e59f8518be2036637385c7710d524ea 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -37,7 +37,7 @@ public class ChunkSection { @@ -60,6 +60,3 @@ index 64b625e988f..b7b06e082e5 100644 } public void a() { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0447-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0447-Optimise-TickListServer-by-rewriting-it.patch index dfb62e89d8..06d82293d0 100644 --- a/Spigot-Server-Patches/0447-Optimise-TickListServer-by-rewriting-it.patch +++ b/Spigot-Server-Patches/0447-Optimise-TickListServer-by-rewriting-it.patch @@ -1,4 +1,4 @@ -From 7953128bd96ef3878736f57eaa3a3c17915c1164 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 14 Feb 2020 01:24:39 -0800 Subject: [PATCH] Optimise TickListServer by rewriting it @@ -42,7 +42,7 @@ sets the excessive tick delay to the specified ticks (defaults to 60 * 20 ticks, aka 60 seconds) diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index f4836e2da10..647f6fc8efb 100644 +index f4836e2da1061e7aa62ddb01c8ca7b3467b18415..647f6fc8efb350fbd0bc4c40358a998f8b89b96a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -369,6 +369,13 @@ public class PaperConfig { @@ -61,7 +61,7 @@ index f4836e2da10..647f6fc8efb 100644 ConfigurationSection section; diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java new file mode 100644 -index 00000000000..ce653f6b4be +index 0000000000000000000000000000000000000000..ce653f6b4be3ab6c6d35cb3e9222e7f8c8759e25 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java @@ -0,0 +1,622 @@ @@ -689,7 +689,7 @@ index 00000000000..ce653f6b4be +} diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/TickListServerInterval.java b/src/main/java/com/destroystokyo/paper/server/ticklist/TickListServerInterval.java new file mode 100644 -index 00000000000..13cf1a55a9b +index 0000000000000000000000000000000000000000..13cf1a55a9babbffccbca1acfbe1c496e8925521 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/server/ticklist/TickListServerInterval.java @@ -0,0 +1,41 @@ @@ -736,7 +736,7 @@ index 00000000000..13cf1a55a9b +} diff --git a/src/main/java/com/destroystokyo/paper/util/set/LinkedSortedSet.java b/src/main/java/com/destroystokyo/paper/util/set/LinkedSortedSet.java new file mode 100644 -index 00000000000..118988c39e5 +index 0000000000000000000000000000000000000000..118988c39e58f28e8a2851792b9c014f341f06fc --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/set/LinkedSortedSet.java @@ -0,0 +1,142 @@ @@ -883,7 +883,7 @@ index 00000000000..118988c39e5 + } +} diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 9010359fbdc..07813c55cdc 100644 +index 9010359fbdc393e43ab2a0702cfc27427458b1ff..07813c55cdc85e08697d4126973f829ae564cf41 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -125,6 +125,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -895,7 +895,7 @@ index 9010359fbdc..07813c55cdc 100644 return this.b(baseblockposition.getX(), baseblockposition.getY(), baseblockposition.getZ()); } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index e67e0065357..ca1b5b3b094 100644 +index e67e00653575c3e57fe16980d2ff074d8413a95e..ca1b5b3b094b847f96742d8466fc42c5bdedbff5 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -200,6 +200,13 @@ public class ChunkProviderServer extends IChunkProvider { @@ -913,7 +913,7 @@ index e67e0065357..ca1b5b3b094 100644 public ChunkProviderServer(WorldServer worldserver, File file, DataFixer datafixer, DefinedStructureManager definedstructuremanager, Executor executor, ChunkGenerator chunkgenerator, int i, WorldLoadListener worldloadlistener, Supplier supplier) { this.world = worldserver; diff --git a/src/main/java/net/minecraft/server/NextTickListEntry.java b/src/main/java/net/minecraft/server/NextTickListEntry.java -index 33cfeabdee0..2287e47d1b8 100644 +index 33cfeabdee03195a294f303f28044a313cb1c4ed..2287e47d1b891135a5f2579ec324c70589141192 100644 --- a/src/main/java/net/minecraft/server/NextTickListEntry.java +++ b/src/main/java/net/minecraft/server/NextTickListEntry.java @@ -5,11 +5,13 @@ import java.util.Comparator; @@ -984,7 +984,7 @@ index 33cfeabdee0..2287e47d1b8 100644 public String toString() { return this.e + ": " + this.a + ", " + this.b + ", " + this.c + ", " + this.f; diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index bf592125f4c..3d610e41969 100644 +index bf592125f4ce5d7ea6e802e637ee3bfbe25d23aa..3d610e41969768da0d2848fa1ae195035ccfd660 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -472,7 +472,9 @@ public class PlayerChunk { @@ -999,7 +999,7 @@ index bf592125f4c..3d610e41969 100644 } }); diff --git a/src/main/java/net/minecraft/server/StructureBoundingBox.java b/src/main/java/net/minecraft/server/StructureBoundingBox.java -index dbb565e74d2..185658e2306 100644 +index dbb565e74d211ef35d5d40b3d024e2f07cef9031..185658e230688a9939c89dae9167217cbee03571 100644 --- a/src/main/java/net/minecraft/server/StructureBoundingBox.java +++ b/src/main/java/net/minecraft/server/StructureBoundingBox.java @@ -4,12 +4,12 @@ import com.google.common.base.MoreObjects; @@ -1038,7 +1038,7 @@ index dbb565e74d2..185658e2306 100644 return baseblockposition.getX() >= this.a && baseblockposition.getX() <= this.d && baseblockposition.getZ() >= this.c && baseblockposition.getZ() <= this.f && baseblockposition.getY() >= this.b && baseblockposition.getY() <= this.e; } diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java -index f533860bbed..3f1aa5ced69 100644 +index f533860bbed19ff2915c90186c259b466f41ce90..3f1aa5ced697490b5481ba992cf5af5dc98b8166 100644 --- a/src/main/java/net/minecraft/server/TickListServer.java +++ b/src/main/java/net/minecraft/server/TickListServer.java @@ -42,6 +42,11 @@ public class TickListServer implements TickList { @@ -1161,7 +1161,7 @@ index f533860bbed..3f1aa5ced69 100644 } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index fcbc9f29139..5173731dc55 100644 +index fcbc9f29139ce5cd3b165130006f9c326a5d9eea..5173731dc55db416a312e13afd09e4e69d829e45 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -170,6 +170,15 @@ public class WorldServer extends World { @@ -1209,6 +1209,3 @@ index fcbc9f29139..5173731dc55 100644 this.navigators = Sets.newHashSet(); this.I = new ObjectLinkedOpenHashSet(); this.dataManager = worldnbtstorage; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch index bbfbf8a00f..c71ece84b6 100644 --- a/Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch +++ b/Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch @@ -1,4 +1,4 @@ -From aa15930df539329829a962e8319db810b79ae549 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sat, 1 Feb 2020 16:50:39 +0100 Subject: [PATCH] Pillager patrol spawn settings and per player options @@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per world and the world age for the start day. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index c3af4c9a9fe..3f44be577e3 100644 +index c3af4c9a9fe67b7a9c0eda5606e1c97bad778927..3f44be577e32af4122b2c8b6c2849e650f4541f5 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -629,10 +629,21 @@ public class PaperWorldConfig { @@ -36,7 +36,7 @@ index c3af4c9a9fe..3f44be577e3 100644 private void entitiesTargetWithFollowRange() { entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index cf837bdb3b2..900631ebe05 100644 +index cf837bdb3b2f9c89fab94e423766c6d99d31f923..900631ebe056bc982e58201626d51d32eaeb77b0 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -77,6 +77,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -48,7 +48,7 @@ index cf837bdb3b2..900631ebe05 100644 public boolean queueHealthUpdatePacket = false; public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket; diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java -index a0f58280760..edca6d3abdc 100644 +index a0f582807605b9cc5bbf31d84907e56fba393e2e..edca6d3abdc31701068cad4af493759f353d4407 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java @@ -4,12 +4,14 @@ import java.util.Random; @@ -128,7 +128,7 @@ index a0f58280760..edca6d3abdc 100644 if (entityhuman.isSpectator()) { return 0; diff --git a/src/main/java/net/minecraft/server/StatisticWrapper.java b/src/main/java/net/minecraft/server/StatisticWrapper.java -index 3b6034038a4..9c95c0ccfcd 100644 +index 3b6034038a4841ebc980b2392c71025d9b0dde35..9c95c0ccfcdc11d8b8bc60986365e76ca0821c68 100644 --- a/src/main/java/net/minecraft/server/StatisticWrapper.java +++ b/src/main/java/net/minecraft/server/StatisticWrapper.java @@ -27,6 +27,7 @@ public class StatisticWrapper implements Iterable> { @@ -139,6 +139,3 @@ index 3b6034038a4..9c95c0ccfcd 100644 public Statistic b(T t0) { return this.a(t0, Counter.DEFAULT); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch index 059f4a0fb7..54ac3f79fe 100644 --- a/Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch +++ b/Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch @@ -1,4 +1,4 @@ -From 2b1e709cee17ac542df6168116a7a4abe24dab3c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 29 Mar 2020 18:26:14 -0400 Subject: [PATCH] Ensure Entity is never double registered @@ -11,7 +11,7 @@ Vs behavior of non ticking of just overwriting state. We will now simply log a warning when this happens instead of crashing the server. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 00df89d6509..0dbe2dce111 100644 +index 00df89d65099cbdd96c77ac26c892f05a2c37d79..0dbe2dce111673f94d0618c7ac80262189f2926f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -59,6 +59,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -23,7 +23,7 @@ index 00df89d6509..0dbe2dce111 100644 private boolean locked = false; @Override diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5173731dc55..3fc25183ca4 100644 +index 5173731dc55db416a312e13afd09e4e69d829e45..3fc25183ca41a0a575334d02a4ae9db4da41348b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -532,6 +532,7 @@ public class WorldServer extends World { @@ -77,6 +77,3 @@ index 5173731dc55..3fc25183ca4 100644 this.entitiesById.put(entity.getId(), entity); if (entity instanceof EntityEnderDragon) { EntityComplexPart[] aentitycomplexpart = ((EntityEnderDragon) entity).eo(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch index 66ca95ec95..587f483765 100644 --- a/Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch +++ b/Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch @@ -1,4 +1,4 @@ -From 743d5c90a28b0f1f0a624cc429a8722d3128d880 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 31 Mar 2020 03:01:45 -0400 Subject: [PATCH] Fix unregistering entities from unloading chunks @@ -15,7 +15,7 @@ Combine that with a buggy detail of the previous implementation of the Dupe UUID patch, then this was the likely source of the "Ghost entities" diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 3fc25183ca4..9fbe8fa1b2b 100644 +index 3fc25183ca41a0a575334d02a4ae9db4da41348b..9fbe8fa1b2bb98b45fb406fcaf146d0e0b34c0ef 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1506,9 +1506,9 @@ public class WorldServer extends World { @@ -30,6 +30,3 @@ index 3fc25183ca4..9fbe8fa1b2b 100644 ((Chunk) ichunkaccess).b(entity); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch index b9bf81d464..e74f8cac97 100644 --- a/Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch +++ b/Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch @@ -1,4 +1,4 @@ -From 1f66dce82479f635273b51d5ed56cbe4dc287bb9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 31 Mar 2020 03:50:42 -0400 Subject: [PATCH] Remote Connections shouldn't hold up shutdown @@ -6,7 +6,7 @@ Subject: [PATCH] Remote Connections shouldn't hold up shutdown Bugs in the connection logic appears to leave stale connections even, preventing shutdown diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 349a0ea213f..1ef7890da59 100644 +index 349a0ea213f7f45e927d439985e121e8fa66c041..1ef7890da599d13e784861035e7891efcc4cd504 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -415,11 +415,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -23,6 +23,3 @@ index 349a0ea213f..1ef7890da59 100644 } System.exit(0); // CraftBukkit --- -2.26.2 - diff --git a/Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch index 99b38687db..f639d95a41 100644 --- a/Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch +++ b/Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch @@ -1,11 +1,11 @@ -From 93c5f228e9cf15809c3bb58aa9053697d17e7131 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: chickeneer Date: Tue, 17 Mar 2020 14:18:50 -0500 Subject: [PATCH] Do not allow bees to load chunks for beehives diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java -index c7d79efdf6e..dd1d246aeb5 100644 +index c7d79efdf6ee3b1ac910ff48bfd4b0ef084b4d43..dd1d246aeb5bd7c7d284175f936936ececb0f932 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -315,6 +315,7 @@ public class EntityBee extends EntityAnimal implements EntityBird { @@ -40,6 +40,3 @@ index c7d79efdf6e..dd1d246aeb5 100644 TileEntity tileentity = EntityBee.this.world.getTileEntity(EntityBee.this.hivePos); if (tileentity instanceof TileEntityBeehive) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch index 81d7143e62..21b7810714 100644 --- a/Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch +++ b/Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch @@ -1,4 +1,4 @@ -From 3bf2d6906af2ae65a709444f3d72597ead34cac1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 2 Apr 2020 01:42:39 -0400 Subject: [PATCH] Prevent Double PlayerChunkMap adds crashing server @@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding Stack will identify any causer of this and warn instead of crashing. diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 6eb05591317..4beae504c87 100644 +index 6eb055913177b0c01a027b2b356190dc561072c5..4beae504c875767ff00e26461fe7240498750e27 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1446,6 +1446,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -26,7 +26,7 @@ index 6eb05591317..4beae504c87 100644 if (!(entity instanceof EntityLightning)) { EntityTypes entitytypes = entity.getEntityType(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9fbe8fa1b2b..2a7a47c6707 100644 +index 9fbe8fa1b2bb98b45fb406fcaf146d0e0b34c0ef..2a7a47c6707c349af55ccd70eb3b8c48387c391a 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1472,7 +1472,7 @@ public class WorldServer extends World { @@ -46,6 +46,3 @@ index 9fbe8fa1b2b..2a7a47c6707 100644 // Paper start - Set origin location when the entity is being added to the world if (entity.origin == null) { entity.origin = entity.getBukkitEntity().getLocation(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch b/Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch index fbde5b8c00..7d0eda2a40 100644 --- a/Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch +++ b/Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch @@ -1,4 +1,4 @@ -From f48abf532a4b211d32fbbdf6e10cb30943ce3f67 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 2 Apr 2020 02:37:57 -0400 Subject: [PATCH] Optimize Collision Chunk lookup and avoid loading far chunks @@ -10,7 +10,7 @@ The collision code takes an AABB and generates a cuboid of checks rather than a cylinder, so at high velocity this can generate a lot of chunk checks. diff --git a/src/main/java/net/minecraft/server/ICollisionAccess.java b/src/main/java/net/minecraft/server/ICollisionAccess.java -index f851ed11df1..d154487294b 100644 +index f851ed11df14fd9aa8017f44d82fb6cfc3bde345..d154487294b89d5a316929ed665c75d4dd3cfc6b 100644 --- a/src/main/java/net/minecraft/server/ICollisionAccess.java +++ b/src/main/java/net/minecraft/server/ICollisionAccess.java @@ -83,15 +83,19 @@ public interface ICollisionAccess extends IBlockAccess { @@ -37,6 +37,3 @@ index f851ed11df1..d154487294b 100644 if (iblockaccess != null) { blockposition_mutableblockposition.d(k1, l1, i2); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch index 0b0d5784e5..3e7f4f8096 100644 --- a/Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch +++ b/Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch @@ -1,4 +1,4 @@ -From 61c81d1c8c5796bd292b9e00b82bbceb6d7fcbb3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 2 Apr 2020 17:16:48 -0400 Subject: [PATCH] Don't tick dead players @@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else. This is safe because Spectators are skipped in unloaded chunks too in vanilla. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 900631ebe05..aa9c903aa82 100644 +index 900631ebe056bc982e58201626d51d32eaeb77b0..aa9c903aa82640658d648642a0ef426eb993a3d9 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -429,7 +429,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -19,6 +19,3 @@ index 900631ebe05..aa9c903aa82 100644 super.tick(); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch b/Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch index c5871341be..558141ad32 100644 --- a/Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch +++ b/Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch @@ -1,4 +1,4 @@ -From 35120b7369791696840251d9cf452ccb8a3911b9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 2 Apr 2020 19:31:16 -0400 Subject: [PATCH] Dead Player's shouldn't be able to move @@ -7,7 +7,7 @@ This fixes a lot of game state issues where packets were delayed for processing due to 1.15's new queue but processed while dead. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 61c9e030a10..c4d43343050 100644 +index 61c9e030a105ee78a7e59fbf36cf7a77f87a0e88..c4d433430503e844121f1917c6caf05823af0a34 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -978,7 +978,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -19,6 +19,3 @@ index 61c9e030a10..c4d43343050 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch index d6c4b2e7ae..b4d7c74e33 100644 --- a/Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch +++ b/Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch @@ -1,4 +1,4 @@ -From 91df067828218cd2c2a6bcd9a1a61772eff3fede Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 8 Apr 2020 03:06:30 -0400 Subject: [PATCH] Optimize PlayerChunkMap memory use for visibleChunks @@ -13,7 +13,7 @@ This should result in siginificant memory use reduction and improved GC behavior diff --git a/src/main/java/com/destroystokyo/paper/util/map/Long2ObjectLinkedOpenHashMapFastCopy.java b/src/main/java/com/destroystokyo/paper/util/map/Long2ObjectLinkedOpenHashMapFastCopy.java new file mode 100644 -index 00000000000..e0ad725b2e6 +index 0000000000000000000000000000000000000000..e0ad725b2e63ffd329fc4725d15290cbf494b790 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/map/Long2ObjectLinkedOpenHashMapFastCopy.java @@ -0,0 +1,32 @@ @@ -50,7 +50,7 @@ index 00000000000..e0ad725b2e6 + } +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index ca1b5b3b094..c457e3b772e 100644 +index ca1b5b3b094b847f96742d8466fc42c5bdedbff5..c457e3b772ec9a77dc5028853512b7e50853315d 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -750,7 +750,7 @@ public class ChunkProviderServer extends IChunkProvider { @@ -63,7 +63,7 @@ index ca1b5b3b094..c457e3b772e 100644 if (optional.isPresent()) { diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index d9941b38ca0..71ab65e00fe 100644 +index d9941b38ca037a31f520784b3706080f1d322fb4..71ab65e00fe31ea4047cf8a5921c6deba13de6b9 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -529,7 +529,7 @@ public final class MCUtil { @@ -76,7 +76,7 @@ index d9941b38ca0..71ab65e00fe 100644 List allChunks = new ArrayList<>(visibleChunks.values()); List players = world.players; diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 4beae504c87..00f26ae23da 100644 +index 4beae504c875767ff00e26461fe7240498750e27..00f26ae23da65453073fc06ffec8a349ef28dd7e 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -55,8 +55,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -213,7 +213,7 @@ index 4beae504c87..00f26ae23da 100644 while (objectbidirectionaliterator.hasNext()) { Entry entry = (Entry) objectbidirectionaliterator.next(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 07ebd78acc7..b70c0fd977c 100644 +index 07ebd78acc7498616887f90a82300b4d5b71fab1..b70c0fd977ce71cc8cb484249cb234dc86b59f1f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -74,6 +74,7 @@ import net.minecraft.server.GameRules; @@ -270,6 +270,3 @@ index 07ebd78acc7..b70c0fd977c 100644 Long2ObjectLinkedOpenHashMap chunks = world.getChunkProvider().playerChunkMap.visibleChunks; return chunks.values().stream().map(PlayerChunk::getFullChunk).filter(Objects::nonNull).map(net.minecraft.server.Chunk::getBukkitChunk).toArray(Chunk[]::new); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch b/Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch index 06767d7412..57c4c44d1e 100644 --- a/Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch +++ b/Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch @@ -1,4 +1,4 @@ -From 438f8e07931fd9c3536a62fe8aad4fb0b1e288d1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 8 Apr 2020 21:07:08 -0400 Subject: [PATCH] Don't load chunks when attempting to unload a chunk @@ -6,7 +6,7 @@ Subject: [PATCH] Don't load chunks when attempting to unload a chunk Big Brain Logic diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b70c0fd977c..eb7b48422e0 100644 +index b70c0fd977ce71cc8cb484249cb234dc86b59f1f..eb7b48422e06d25974f19a582c31fecb3b80271c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -473,7 +473,7 @@ public class CraftWorld implements World { @@ -27,6 +27,3 @@ index b70c0fd977c..eb7b48422e0 100644 if (chunk == null) { return true; } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch index 3df8f63f80..3032f7ed44 100644 --- a/Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch +++ b/Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch @@ -1,4 +1,4 @@ -From 238da0bfbafde5fadcba5d39613c28eeb68e5e82 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 8 Apr 2020 21:24:05 -0400 Subject: [PATCH] Increase Light Queue Size @@ -14,7 +14,7 @@ light engine on shutdown... The queue size only puts a cap on max loss, doesn't solve that problem. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3f44be577e3..a4815f5e69c 100644 +index 3f44be577e32af4122b2c8b6c2849e650f4541f5..a4815f5e69c00c4471bf7354222d9cf175ceafcd 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -667,4 +667,9 @@ public class PaperWorldConfig { @@ -28,7 +28,7 @@ index 3f44be577e3..a4815f5e69c 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d1f82eff218..77adc64e30c 100644 +index d1f82eff218d6492bb27f05d82e03abd9add6909..77adc64e30cbc1d4542eb8f4a446788c1fdc61be 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -637,7 +637,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 9 Apr 2020 00:09:26 -0400 Subject: [PATCH] Mid Tick Chunk Tasks - Speed up processing of chunk loads and @@ -30,7 +30,7 @@ In a view distance of 15, chunk loading performance was visually faster on the c Flying at high speed in spectator mode was able to keep up with chunk loading (as long as they are already generated) diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java -index 223d3b1125d..37341d2d2e7 100644 +index 223d3b1125d0781758c45c6b469e6cccd13f187a..37341d2d2e7010b403708b6fc52524e8e36492c5 100644 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -13,6 +13,7 @@ import java.util.Map; @@ -42,7 +42,7 @@ index 223d3b1125d..37341d2d2e7 100644 public static final Timing commandFunctionsTimer = Timings.ofSafe("Command Functions"); public static final Timing connectionTimer = Timings.ofSafe("Connection Handler"); diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 647f6fc8efb..9f1662ece53 100644 +index 647f6fc8efb350fbd0bc4c40358a998f8b89b96a..9f1662ece533f5ea744662b718e2d89ace3107fb 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -421,4 +421,9 @@ public class PaperConfig { @@ -56,7 +56,7 @@ index 647f6fc8efb..9f1662ece53 100644 + } } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index c457e3b772e..747305619b5 100644 +index c457e3b772ec9a77dc5028853512b7e50853315d..747305619b5050e7dad3ae0ccd62200ee2246b5a 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -683,6 +683,7 @@ public class ChunkProviderServer extends IChunkProvider { @@ -135,7 +135,7 @@ index c457e3b772e..747305619b5 100644 protected boolean executeNext() { // CraftBukkit start - process pending Chunk loadCallback() and unloadCallback() after each run task diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 77adc64e30c..3c25436f158 100644 +index 77adc64e30cbc1d4542eb8f4a446788c1fdc61be..3c25436f158316d2e09cbf4673365eddb03ecef4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -907,6 +907,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 9 Apr 2020 21:20:33 -0400 Subject: [PATCH] Don't move existing players to world spawn @@ -10,7 +10,7 @@ larger than the keep loaded range. By skipping this, we avoid potential for a large spike on server start. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index aa9c903aa82..d51af68a920 100644 +index aa9c903aa82640658d648642a0ef426eb993a3d9..d51af68a92021e4f45631805529424831ca9b090 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -114,7 +114,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -40,7 +40,7 @@ index aa9c903aa82..d51af68a920 100644 this.dimension = ((WorldServer) this.world).getWorldProvider().getDimensionManager(); this.playerInteractManager.a((WorldServer) world); diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 909d86e14c7..0b5800649ab 100644 +index 909d86e14c7860cd6d8a6f38ef4aedb183acae3f..0b5800649abfc2fd6722e4cb5e8e40e51240a032 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -108,6 +108,7 @@ public abstract class PlayerList { @@ -51,6 +51,3 @@ index 909d86e14c7..0b5800649ab 100644 // CraftBukkit end entityplayer.spawnIn(worldserver); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch index 3bdc35863c..0fd43768a9 100644 --- a/Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch +++ b/Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch @@ -1,4 +1,4 @@ -From 93850a83c22596106fb1f58a397f75e2809da20c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 5 Apr 2020 22:23:14 -0500 Subject: [PATCH] Add tick times API and /mspt command @@ -6,7 +6,7 @@ Subject: [PATCH] Add tick times API and /mspt command diff --git a/src/main/java/com/destroystokyo/paper/MSPTCommand.java b/src/main/java/com/destroystokyo/paper/MSPTCommand.java new file mode 100644 -index 00000000000..d0211d4f39f +index 0000000000000000000000000000000000000000..d0211d4f39f9d6af1d751ac66342b42cc6d7ba6d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MSPTCommand.java @@ -0,0 +1,64 @@ @@ -75,7 +75,7 @@ index 00000000000..d0211d4f39f + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 9f1662ece53..e0d7832c3a0 100644 +index 9f1662ece533f5ea744662b718e2d89ace3107fb..e0d7832c3a081b54a0e3a27380015477897fdf6d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -70,6 +70,7 @@ public class PaperConfig { @@ -87,7 +87,7 @@ index 9f1662ece53..e0d7832c3a0 100644 version = getInt("config-version", 20); set("config-version", 20); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3c25436f158..5f57a9e1c8d 100644 +index 3c25436f158316d2e09cbf4673365eddb03ecef4..5f57a9e1c8d5f641facdadbd1877637a8fe8daf5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -106,6 +106,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 10 Apr 2020 21:24:12 -0400 Subject: [PATCH] Expose MinecraftServer#isRunning @@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4a41003203b..b627180729a 100644 +index 4a41003203b316e45622360f97a897d1fad6cda0..b627180729a24a83ca383f83aee53133ea1b398e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2218,5 +2218,10 @@ public final class CraftServer implements Server { @@ -20,6 +20,3 @@ index 4a41003203b..b627180729a 100644 + } // Paper end } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch b/Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch index 5d414935f3..57bf9bc864 100644 --- a/Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch +++ b/Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch @@ -1,4 +1,4 @@ -From cff0c275be13d76ea9ea6b1447bf8164d126604d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 11 Apr 2020 03:56:07 -0400 Subject: [PATCH] Implement Chunk Priority / Urgency System for World Gen @@ -16,7 +16,7 @@ lots of chunks already. This massively reduces the lag spikes from sync chunk gens. diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 747305619b5..746b5b55896 100644 +index 747305619b5050e7dad3ae0ccd62200ee2246b5a..746b5b55896eaf39edf92073f61796d7096c48c2 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -308,6 +308,7 @@ public class ChunkProviderServer extends IChunkProvider { @@ -59,7 +59,7 @@ index 747305619b5..746b5b55896 100644 return ichunkaccess1; }, (playerchunk_failure) -> { diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 3d610e41969..4b341c81fc9 100644 +index 3d610e41969768da0d2848fa1ae195035ccfd660..4b341c81fc97076a69aede729008c54674fa7adf 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -43,6 +43,111 @@ public class PlayerChunk { @@ -197,7 +197,7 @@ index 3d610e41969..4b341c81fc9 100644 private void d(int i) { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 00f26ae23da..6c178492b75 100644 +index 00f26ae23da65453073fc06ffec8a349ef28dd7e..6c178492b75134ba25b7730273bb550b693a7e4a 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -291,6 +291,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -279,6 +279,3 @@ index 00f26ae23da..6c178492b75 100644 CompletableFuture> completablefuture1 = completablefuture.thenApplyAsync((either) -> { return either.flatMap((list) -> { Chunk chunk = (Chunk) list.get(list.size() / 2); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch b/Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch index 16dbcfe438..7ae4a8f8c8 100644 --- a/Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch +++ b/Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch @@ -1,4 +1,4 @@ -From 25edafaf750a2a220974d2b56ef705278c51242b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 Apr 2020 17:53:29 -0700 Subject: [PATCH] Remove streams from Mob AI System @@ -10,7 +10,7 @@ Also optimise the stream.anyMatch statement to move to a bitset where we can replace the call with a single bitwise operation. diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java -index bdb90a34663..93009d83f07 100644 +index bdb90a346639db37d3c72359c28b72d021d1b389..93009d83f07bdaf7bc424ffb99cbfe716ca0d66d 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java @@ -1,10 +1,12 @@ @@ -53,7 +53,7 @@ index bdb90a34663..93009d83f07 100644 public static enum Type { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java -index 935136771e7..84d2abbcb90 100644 +index 935136771e776fe498f608a159a41393340adc4e..84d2abbcb90eb09a19fa0922cfc053c74f8c56e4 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java @@ -1,8 +1,10 @@ @@ -232,7 +232,7 @@ index 935136771e7..84d2abbcb90 100644 public void a(PathfinderGoal.Type pathfindergoal_type, boolean flag) { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java -index 29657fed751..1b800c558f0 100644 +index 29657fed75184aee0c89e56f5e642a5d68eda444..1b800c558f0988ffc0270b86d1a59ea3bb245116 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java @@ -59,9 +59,10 @@ public class PathfinderGoalWrapped extends PathfinderGoal { @@ -249,6 +249,3 @@ index 29657fed751..1b800c558f0 100644 } public boolean isRunning() { return this.g(); } // Paper - OBFHELPER --- -2.26.2 - diff --git a/Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch b/Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch index ac61c697a9..40db4c52b5 100644 --- a/Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch +++ b/Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch @@ -1,4 +1,4 @@ -From 9b4c7accbb78fe4cee5494775b0e2b41c6d4790f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 11 Apr 2020 21:23:42 -0400 Subject: [PATCH] Delay unsafe actions until after entity ticking is done @@ -6,7 +6,7 @@ Subject: [PATCH] Delay unsafe actions until after entity ticking is done This will help prevent many cases of unregistering entities during entity ticking diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9b5f24c262e..b3785775ecd 100644 +index 9b5f24c262edb82a424385f8f3cb6aa506c0dcd9..b3785775ecd8e3c13e7829f641f2c1b5fd0d9d47 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -60,6 +60,16 @@ public class WorldServer extends World { @@ -44,7 +44,7 @@ index 9b5f24c262e..b3785775ecd 100644 try (co.aikar.timings.Timing ignored = this.timings.newEntities.startTiming()) { // Paper - timings diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index eb7b48422e0..ac257d50dea 100644 +index eb7b48422e06d25974f19a582c31fecb3b80271c..ac257d50dea8f42a515f19bbae12ab5680e26bb4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2473,7 +2473,7 @@ public class CraftWorld implements World { @@ -56,6 +56,3 @@ index eb7b48422e0..ac257d50dea 100644 }); return ret; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0467-Async-command-map-building.patch b/Spigot-Server-Patches/0467-Async-command-map-building.patch index bdfe0a84eb..2d3efaa3ad 100644 --- a/Spigot-Server-Patches/0467-Async-command-map-building.patch +++ b/Spigot-Server-Patches/0467-Async-command-map-building.patch @@ -1,11 +1,11 @@ -From a868e8687cd2ec76eb08fd5e62bb8371aba369bd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Callahan Date: Wed, 8 Apr 2020 02:42:14 -0500 Subject: [PATCH] Async command map building diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java -index 37b1a7947c2..2414b0a552e 100644 +index 37b1a7947c2d5ce954d83f599453db86ca1eb131..2414b0a552e5d6fb449bca163add7a9bac39e943 100644 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java @@ -241,6 +241,14 @@ public class CommandDispatcher { @@ -38,6 +38,3 @@ index 37b1a7947c2..2414b0a552e 100644 PlayerCommandSendEvent event = new PlayerCommandSendEvent(entityplayer.getBukkitEntity(), new LinkedHashSet<>(bukkit)); event.getPlayer().getServer().getPluginManager().callEvent(event); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch b/Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch index 3bf7cb0a68..4a206749ff 100644 --- a/Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch +++ b/Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch @@ -1,4 +1,4 @@ -From f38831253210b7d537c57827d1e0aeffde5e8cd2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 12 Apr 2020 15:50:48 -0400 Subject: [PATCH] Forced Watchdog Crash support and Improve Async Shutdown @@ -36,7 +36,7 @@ We have to ensure Thread Death propagates correctly though to stop main complete This is to ensure that if main isn't truely stuck, it's not manipulating state we are trying to save. diff --git a/src/main/java/net/minecraft/server/CrashReport.java b/src/main/java/net/minecraft/server/CrashReport.java -index 3de19c998b7..c7dc8787cc3 100644 +index 3de19c998b749ccf74958c2412a8c9506457383e..c7dc8787cc3456c5540d6a00a6ff051533edc25a 100644 --- a/src/main/java/net/minecraft/server/CrashReport.java +++ b/src/main/java/net/minecraft/server/CrashReport.java @@ -257,6 +257,7 @@ public class CrashReport { @@ -48,7 +48,7 @@ index 3de19c998b7..c7dc8787cc3 100644 throwable = throwable.getCause(); } diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 1ef7890da59..e62ca0543f1 100644 +index 1ef7890da599d13e784861035e7891efcc4cd504..e62ca0543f1819259ad8720ad792fed3ef134d6a 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -750,7 +750,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -61,7 +61,7 @@ index 1ef7890da59..e62ca0543f1 100644 @Override diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java -index cfe43e882e5..2632c7c3ec7 100644 +index cfe43e882e524b6ab3d9702e81269c97e6b75eba..2632c7c3ec77918be7979f2aa49209e566cafc77 100644 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java @@ -135,6 +135,7 @@ public abstract class IAsyncTaskHandler implements Mailbox 0 && new File( split[0] ).isFile() ) diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 5bdcdcf9e85..fe4b8caf28b 100644 +index 5bdcdcf9e85b73086722783bff26321d03382bb9..fe4b8caf28b2d36b2034ac90b1a76dea7b691feb 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -41,6 +41,7 @@ public class WatchdogThread extends Thread @@ -344,6 +344,3 @@ index 5bdcdcf9e85..fe4b8caf28b 100644 } break; } // Paper end --- -2.26.2 - diff --git a/Spigot-Server-Patches/0469-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0469-Optimize-Pathfinding.patch index 77a09aff6d..b06ced5912 100644 --- a/Spigot-Server-Patches/0469-Optimize-Pathfinding.patch +++ b/Spigot-Server-Patches/0469-Optimize-Pathfinding.patch @@ -1,4 +1,4 @@ -From ed15355ebb8c3aeb9299598a9873c1fc7aee586b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 02:02:07 -0600 Subject: [PATCH] Optimize Pathfinding @@ -7,7 +7,7 @@ Prevents pathfinding from spamming failures for things such as arrow attacks. diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index f06764973fe..dc32107ec32 100644 +index f06764973feaa29ccbb4731b65372c544dcf3032..dc32107ec320fa54487f24c9d68ff8e5a6dea1bb 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -11,7 +11,7 @@ public abstract class NavigationAbstract { @@ -51,6 +51,3 @@ index f06764973fe..dc32107ec32 100644 } public boolean setDestination(@Nullable PathEntity pathentity, double speed) { return a(pathentity, speed); } // Paper - OBFHELPER --- -2.26.2 - diff --git a/Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch b/Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch index a03bc8c85d..8b5c367abc 100644 --- a/Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch +++ b/Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch @@ -1,11 +1,11 @@ -From e0154474288454c9edee7131fe44a3114600858f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Callahan Date: Wed, 8 Apr 2020 18:00:17 -0500 Subject: [PATCH] Port 20w15a Villager AI optimizations - DROP 1.16 diff --git a/src/main/java/net/minecraft/server/BehaviorController.java b/src/main/java/net/minecraft/server/BehaviorController.java -index 7c6e687707c..396b64ea0fc 100644 +index 7c6e687707cdf32638eee41e549818a494cd45ab..396b64ea0fc8a04d9e0aac289033d3d82385b86e 100644 --- a/src/main/java/net/minecraft/server/BehaviorController.java +++ b/src/main/java/net/minecraft/server/BehaviorController.java @@ -38,30 +38,22 @@ public class BehaviorController implements MinecraftSeri @@ -193,6 +193,3 @@ index 7c6e687707c..396b64ea0fc 100644 } private boolean a(Object object) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch b/Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch index 6b4071e026..0f4641263b 100644 --- a/Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch +++ b/Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch @@ -1,4 +1,4 @@ -From 663c7f09f1aa62d23a9cfad9826a93901969b489 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 Apr 2020 18:35:09 -0700 Subject: [PATCH] Reduce Either Optional allocation @@ -7,7 +7,7 @@ In order to get chunk values, we shouldn't need to create an optional each time. diff --git a/src/main/java/com/mojang/datafixers/util/Either.java b/src/main/java/com/mojang/datafixers/util/Either.java -index a90adac7bd7..3f65fe71024 100644 +index a90adac7bd7ebd423f480e9ae0f44cb9d521fa4f..3f65fe71024928e35111fc6719a290aab9a6859e 100644 --- a/src/main/java/com/mojang/datafixers/util/Either.java +++ b/src/main/java/com/mojang/datafixers/util/Either.java @@ -22,7 +22,7 @@ public abstract class Either implements App, L> { @@ -46,6 +46,3 @@ index a90adac7bd7..3f65fe71024 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch b/Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch index 983baf6a8b..a0ba9fe4c5 100644 --- a/Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch +++ b/Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch @@ -1,4 +1,4 @@ -From 5845b578162a1f609e1e6a9cc604f29fb0a17ddb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 Apr 2020 18:10:43 -0700 Subject: [PATCH] Remove streams from PairedQueue @@ -7,7 +7,7 @@ We shouldn't be doing stream calls just to see if the queue is empty. This creates loads of garbage thanks to how often it's called. diff --git a/src/main/java/net/minecraft/server/PairedQueue.java b/src/main/java/net/minecraft/server/PairedQueue.java -index 85bb22e4b73..2369afb4f37 100644 +index 85bb22e4b7376b676139048f2d55684e27a54055..2369afb4f37863c5c59456e46c48ad0d32f9eeb7 100644 --- a/src/main/java/net/minecraft/server/PairedQueue.java +++ b/src/main/java/net/minecraft/server/PairedQueue.java @@ -20,32 +20,30 @@ public interface PairedQueue { @@ -77,6 +77,3 @@ index 85bb22e4b73..2369afb4f37 100644 } } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch b/Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch index 51e4cb2b51..853063b15a 100644 --- a/Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch +++ b/Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch @@ -1,4 +1,4 @@ -From 7c90e9d5af0fd9d41e79510be2d7df5f2a9a9398 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 Apr 2020 18:06:24 -0700 Subject: [PATCH] Remove streams from MinecraftKey @@ -6,7 +6,7 @@ Subject: [PATCH] Remove streams from MinecraftKey They produce a lot of garbage. diff --git a/src/main/java/net/minecraft/server/MinecraftKey.java b/src/main/java/net/minecraft/server/MinecraftKey.java -index 2b271d3e509..b1beebf0ed5 100644 +index 2b271d3e509a5450c9136dced3ad4dc4d65af45a..b1beebf0ed5737c04875bf9138624fb2bd5dff27 100644 --- a/src/main/java/net/minecraft/server/MinecraftKey.java +++ b/src/main/java/net/minecraft/server/MinecraftKey.java @@ -125,15 +125,29 @@ public class MinecraftKey implements Comparable { @@ -45,6 +45,3 @@ index 2b271d3e509..b1beebf0ed5 100644 } public static class a implements JsonDeserializer, JsonSerializer { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch b/Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch index 9b1b0ee480..8f36b43e48 100644 --- a/Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch +++ b/Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch @@ -1,4 +1,4 @@ -From e83faf8d07cdd383c05d13bcc5e125550528d0de Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 Apr 2020 17:39:25 -0700 Subject: [PATCH] Reduce memory footprint of NBTTagCompound @@ -8,7 +8,7 @@ is important because we clone chunk data after reading it for safety. So, reduce the impact of the clone on GC. diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java -index 98deaba12ce..02a2ed1baa3 100644 +index 98deaba12ceb25f59d1b56420fb544a64b417ddd..02a2ed1baa3f82d302432b7bc627f3179751f886 100644 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java @@ -31,7 +31,7 @@ public class NBTTagCompound implements NBTBase { @@ -49,6 +49,3 @@ index 98deaba12ce..02a2ed1baa3 100644 } public boolean equals(Object object) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch index c9076f8f3d..3cbb5a74a9 100644 --- a/Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch +++ b/Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch @@ -1,11 +1,11 @@ -From cee5ee79b0e47a740b0544e662839b17dd0b1009 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 13 Apr 2020 07:31:44 +0100 Subject: [PATCH] Prevent opening inventories when frozen diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index d51af68a920..f453ccdb020 100644 +index d51af68a92021e4f45631805529424831ca9b090..f453ccdb020e911d84658f630a289612e1557db4 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -380,7 +380,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -36,7 +36,7 @@ index d51af68a920..f453ccdb020 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index a6d75c0e07a..a5e9fc90ffa 100644 +index a6d75c0e07a25fdb59dde2e3eb2a0213c7112515..a5e9fc90ffae794b9b14468337ce7b091fd0dc35 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -350,7 +350,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -57,6 +57,3 @@ index a6d75c0e07a..a5e9fc90ffa 100644 player.activeContainer = container; player.activeContainer.addSlotListener(player); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch b/Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch index 3119e77456..529f78279c 100644 --- a/Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch +++ b/Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch @@ -1,4 +1,4 @@ -From 81b188b50e526cb99c57f350c51457083dc56300 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Wed, 15 Apr 2020 18:23:28 -0700 Subject: [PATCH] Optimise ArraySetSorted#removeIf @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise ArraySetSorted#removeIf Remove iterator allocation and ensure the call is always O(n) diff --git a/src/main/java/net/minecraft/server/ArraySetSorted.java b/src/main/java/net/minecraft/server/ArraySetSorted.java -index 85f799a713d..7db6b5850b9 100644 +index 85f799a713db0c822d46b689010f9f6bd43f5280..7db6b5850b91588eb4d91f0d7e8b5dbbcb95b7cb 100644 --- a/src/main/java/net/minecraft/server/ArraySetSorted.java +++ b/src/main/java/net/minecraft/server/ArraySetSorted.java @@ -10,8 +10,8 @@ import java.util.NoSuchElementException; @@ -63,6 +63,3 @@ index 85f799a713d..7db6b5850b9 100644 public static > ArraySetSorted a(int i) { return new ArraySetSorted<>(i, (Comparator)Comparator.naturalOrder()); // Paper - decompile fix } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch index 1b86136485..fa10e6fb2d 100644 --- a/Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch +++ b/Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch @@ -1,4 +1,4 @@ -From 33ba8aeb0d9111fc2a29d9d2ae89e1c69e586d46 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Wed, 15 Apr 2020 17:56:07 -0700 Subject: [PATCH] Don't run entity collision code if not needed @@ -7,7 +7,7 @@ Will not run if max entity craming is disabled and the max collisions per entity is less than or equal to 0 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 253e35826f6..2c81344a65b 100644 +index 253e35826f6f51145c278b083d195599affca2a7..2c81344a65bf230a6ba09deb2a3bb45881144a39 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2666,10 +2666,16 @@ public abstract class EntityLiving extends Entity { @@ -28,6 +28,3 @@ index 253e35826f6..2c81344a65b 100644 int j; if (i > 0 && list.size() > i - 1 && this.random.nextInt(4) == 0) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch b/Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch index 9cee974781..da450aa956 100644 --- a/Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch +++ b/Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch @@ -1,4 +1,4 @@ -From 8ec1a7844e8695e13ee75b99bd67c2e759a2e20a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Wed, 15 Apr 2020 18:08:53 -0700 Subject: [PATCH] Optimise entity hard collision checking @@ -11,7 +11,7 @@ Less crammed entities are likely to show significantly less benefit. Effectively, this patch optimises crammed entity situations. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 33456b0bb42..750fb07756f 100644 +index 33456b0bb421d253aa8366210f41a9da7dcd1699..750fb07756f7e40b21f8ab0925f2e842aae50f7b 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -90,6 +90,54 @@ public class Chunk implements IChunkAccess { @@ -88,7 +88,7 @@ index 33456b0bb42..750fb07756f 100644 } if (entity instanceof EntityItem) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0dbe2dce111..324fd07bcee 100644 +index 0dbe2dce111673f94d0618c7ac80262189f2926f..324fd07bcee9fed7bdb5b2b47ef01ce341282c93 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -210,6 +210,40 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -133,7 +133,7 @@ index 0dbe2dce111..324fd07bcee 100644 this.id = Entity.entityCount.incrementAndGet(); this.passengers = Lists.newArrayList(); diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 5bf99e0028b..aecdaacfc7d 100644 +index 5bf99e0028b886a6ba1d2f39f8dc4cd3c9aa0943..aecdaacfc7da560759bc513680d76f55820d5046 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -847,6 +847,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -145,7 +145,7 @@ index 5bf99e0028b..aecdaacfc7d 100644 return this.children; } diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index 4157e50e4d9..5135308fb61 100644 +index 4157e50e4d99c029759bffcb48a8d645487554c8..5135308fb6137a34ed6fd061f0a210de6de4e81c 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -42,17 +42,26 @@ public interface IEntityAccess { @@ -178,7 +178,7 @@ index 4157e50e4d9..5135308fb61 100644 return stream.filter(axisalignedbb1::c).map(VoxelShapes::a); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c8619af2cf4..899c535c405 100644 +index c8619af2cf43041e3eebec74e24c7f127a662efe..899c535c4056cd2375ab8f834f03267d405f4bda 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1178,6 +1178,32 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -214,6 +214,3 @@ index c8619af2cf4..899c535c405 100644 @Override public List getEntities(@Nullable Entity entity, AxisAlignedBB axisalignedbb, @Nullable Predicate predicate) { this.getMethodProfiler().c("getEntities"); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch index 4fb37383b1..117ed8fb63 100644 --- a/Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch +++ b/Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch @@ -1,4 +1,4 @@ -From 82740c949a5a4f0526af2531218b2bee7acf5725 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Thu, 16 Apr 2020 16:13:59 -0700 Subject: [PATCH] Optimize ChunkProviderServer's chunk level checking helper @@ -9,7 +9,7 @@ so inline where possible, and avoid the abstraction of the Either class. diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 746b5b55896..c2e4e4f6f18 100644 +index 746b5b55896eaf39edf92073f61796d7096c48c2..c2e4e4f6f1895850bcac3552eee5bfedfb98c933 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -615,27 +615,37 @@ public class ChunkProviderServer extends IChunkProvider { @@ -60,6 +60,3 @@ index 746b5b55896..c2e4e4f6f18 100644 } private boolean a(long i, Function>> function) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch b/Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch index 9b415e04c3..2aa1db2b07 100644 --- a/Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch +++ b/Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch @@ -1,4 +1,4 @@ -From ee64b1f98b2e1a48027cfd90612cdd63cf415db7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 16 Apr 2020 20:07:29 -0500 Subject: [PATCH] Restrict vanilla teleport command to valid locations @@ -6,7 +6,7 @@ Subject: [PATCH] Restrict vanilla teleport command to valid locations Fixes GH-3165 diff --git a/src/main/java/net/minecraft/server/CommandTeleport.java b/src/main/java/net/minecraft/server/CommandTeleport.java -index 3060b4f68b1..79016b58707 100644 +index 3060b4f68b13abe05d31b85bb49690a0b476939f..79016b587072a6a1c5418648d7aa88e96fbeefff 100644 --- a/src/main/java/net/minecraft/server/CommandTeleport.java +++ b/src/main/java/net/minecraft/server/CommandTeleport.java @@ -116,6 +116,12 @@ public class CommandTeleport { @@ -22,6 +22,3 @@ index 3060b4f68b1..79016b58707 100644 if (entity instanceof EntityPlayer) { ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(new BlockPosition(d0, d1, d2)); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch index 0a34b1c7e9..0b8e9e456e 100644 --- a/Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch +++ b/Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch @@ -1,4 +1,4 @@ -From 8ddf7e68d9df72179c159d8d4db16b01dbe787ae Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Mon, 20 Jan 2020 21:38:15 +0100 Subject: [PATCH] Implement Player Client Options API @@ -6,7 +6,7 @@ Subject: [PATCH] Implement Player Client Options API diff --git a/src/main/java/com/destroystokyo/paper/PaperSkinParts.java b/src/main/java/com/destroystokyo/paper/PaperSkinParts.java new file mode 100644 -index 00000000000..b6f4400df3d +index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabba57885e1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperSkinParts.java @@ -0,0 +1,74 @@ @@ -85,7 +85,7 @@ index 00000000000..b6f4400df3d + } +} diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index c4d43343050..7df24be46e4 100644 +index c4d433430503e844121f1917c6caf05823af0a34..7df24be46e4471ae0ddad5cded5eef4937fd37a3 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -35,7 +35,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -98,7 +98,7 @@ index c4d43343050..7df24be46e4 100644 protected static final DataWatcherObject bs = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p); protected static final DataWatcherObject bt = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index f453ccdb020..bf2ba0548d9 100644 +index f453ccdb020e911d84658f630a289612e1557db4..bf2ba0548d93280651d89c2039a298c56a83b0bf 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -127,7 +127,7 @@ index f453ccdb020..bf2ba0548d9 100644 if (getMainHand() != packetplayinsettings.getMainHand()) { PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT); diff --git a/src/main/java/net/minecraft/server/PacketPlayInSettings.java b/src/main/java/net/minecraft/server/PacketPlayInSettings.java -index 8faebf9efed..4da63713819 100644 +index 8faebf9efed7c3529b151fddf8246e8c77a8b693..4da637138190c9b749d986ac32dddc051931d58f 100644 --- a/src/main/java/net/minecraft/server/PacketPlayInSettings.java +++ b/src/main/java/net/minecraft/server/PacketPlayInSettings.java @@ -37,18 +37,22 @@ public class PacketPlayInSettings implements Packet { @@ -154,7 +154,7 @@ index 8faebf9efed..4da63713819 100644 return this.e; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6672feaf519..dcbda5b35ab 100644 +index 6672feaf5198b89969796185a2fc110308678eb0..dcbda5b35ab4d44e6b1d6c34bb8763a7dd08e629 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,8 @@ @@ -199,6 +199,3 @@ index 6672feaf519..dcbda5b35ab 100644 // Paper end // Spigot start --- -2.26.2 - diff --git a/Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch b/Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch index b5d3e8f779..bb58a29a9c 100644 --- a/Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch +++ b/Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch @@ -1,4 +1,4 @@ -From 9c7f676e711c7849276b215466709681ba69d5a5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Apr 2020 04:36:11 -0400 Subject: [PATCH] Fix Chunk Post Processing deadlock risk @@ -25,7 +25,7 @@ This successfully fixed a reoccurring and highly reproduceable crash for heightmaps. diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index c2e4e4f6f18..78a8a3cc68f 100644 +index c2e4e4f6f1895850bcac3552eee5bfedfb98c933..78a8a3cc68f21ec3ade95c13ccacafd3a3a6c4e6 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -1048,6 +1048,7 @@ public class ChunkProviderServer extends IChunkProvider { @@ -37,7 +37,7 @@ index c2e4e4f6f18..78a8a3cc68f 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 6c178492b75..79133dd40c4 100644 +index 6c178492b75134ba25b7730273bb550b693a7e4a..79133dd40c465224b1dfa2afaf4c8d3f5a1c2190 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -108,6 +108,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -58,6 +58,3 @@ index 6c178492b75..79133dd40c4 100644 }); completablefuture1.thenAcceptAsync((either) -> { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch index 42e464d554..37a90ee533 100644 --- a/Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch +++ b/Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch @@ -1,4 +1,4 @@ -From 170facae670205f822b89153dbe25d9c7eeb2c98 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Apr 2020 15:59:41 -0400 Subject: [PATCH] Don't crash if player is attempted to be removed from @@ -7,7 +7,7 @@ Subject: [PATCH] Don't crash if player is attempted to be removed from I suspect it deals with teleporting as it uses players current x/y/z diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index 0244768f76d..279c7a85fb5 100644 +index 0244768f76d83af427a07bd235c9bcec8ad5429e..279c7a85fb5b4bff91fba1c9797c902bd68d8539 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -226,6 +226,7 @@ public abstract class ChunkMapDistance { @@ -18,6 +18,3 @@ index 0244768f76d..279c7a85fb5 100644 objectset.remove(entityplayer); if (objectset.isEmpty()) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch b/Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch index 37a9bb9caf..059381ccba 100644 --- a/Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch +++ b/Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch @@ -1,11 +1,11 @@ -From 1343b255a498178e51b1e1b27912225821add7a1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AvrooVulcan Date: Fri, 17 Apr 2020 00:15:23 +0100 Subject: [PATCH] Broadcast join message to console diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 62891d2dc6f..e79a4d9ff80 100644 +index 62891d2dc6f40bb57e92dfefcbcdf72f89ba5c4f..e79a4d9ff80390a67656d187b1e6ee0a83748918 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -188,9 +188,9 @@ public abstract class PlayerList { @@ -21,6 +21,3 @@ index 62891d2dc6f..e79a4d9ff80 100644 } // CraftBukkit end --- -2.26.2 - diff --git a/Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch index 9fda290f89..e8eafe7c46 100644 --- a/Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch +++ b/Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch @@ -1,4 +1,4 @@ -From da179ba8446e2c3ca110f65ae52b418bd2874dac Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 Apr 2020 00:05:46 -0400 Subject: [PATCH] Fix Longstanding Broken behavior of PlayerJoinEvent @@ -28,7 +28,7 @@ receives a deterministic result, and should no longer require 1 tick delays anymore. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index bf2ba0548d9..45df816980c 100644 +index bf2ba0548d93280651d89c2039a298c56a83b0bf..45df816980cd880b257632f0c4a381d475d2dfbd 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -100,6 +100,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -40,7 +40,7 @@ index bf2ba0548d9..45df816980c 100644 // CraftBukkit end public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 79133dd40c4..ea0086ceb64 100644 +index 79133dd40c465224b1dfa2afaf4c8d3f5a1c2190..ea0086ceb64ad88a64b8327f055836afb3191a0b 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1526,6 +1526,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -52,7 +52,7 @@ index 79133dd40c4..ea0086ceb64 100644 if (!(entity instanceof EntityComplexPart)) { if (!(entity instanceof EntityLightning)) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index e79a4d9ff80..6a4e4f93eb3 100644 +index e79a4d9ff80390a67656d187b1e6ee0a83748918..6a4e4f93eb36ca388523a36abf38bcae3ad375e8 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -177,6 +177,12 @@ public abstract class PlayerList { @@ -100,6 +100,3 @@ index e79a4d9ff80..6a4e4f93eb3 100644 entityplayer.syncInventory(); // Paper start - Add to collideRule team if needed final Scoreboard scoreboard = this.getServer().getWorldServer(DimensionManager.OVERWORLD).getScoreboard(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch index 0b73feeb40..b023c22ca7 100644 --- a/Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch +++ b/Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch @@ -1,11 +1,11 @@ -From 0a30b7a3e4a74081cc67dd17291ecfacee643fcb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 Apr 2020 04:28:29 -0400 Subject: [PATCH] Load Chunks for Login Asynchronously diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 324fd07bcee..01330045c0f 100644 +index 324fd07bcee9fed7bdb5b2b47ef01ce341282c93..01330045c0f3e0993af66c5a34c2a0246003758b 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1382,7 +1382,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index 324fd07bcee..01330045c0f 100644 public void setPositionRotation(BlockPosition blockposition, float f, float f1) { diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 45df816980c..48bbaec4b64 100644 +index 45df816980cd880b257632f0c4a381d475d2dfbd..48bbaec4b64bede8d280bd866436f5528578013e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -43,6 +43,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -38,7 +38,7 @@ index 45df816980c..48bbaec4b64 100644 // CraftBukkit end public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index f1222fcb2bd..28f48f22522 100644 +index f1222fcb2bd52b8781d0f92c94e1472fa7b1e493..28f48f22522ef8c3c66381abcf017f0859b45290 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -66,7 +66,7 @@ public class LoginListener implements PacketLoginInListener { @@ -60,7 +60,7 @@ index f1222fcb2bd..28f48f22522 100644 if (entityplayer != null) { this.g = LoginListener.EnumProtocolState.DELAY_ACCEPT; diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 2e81f3a1d93..8800a8fcf9a 100644 +index 2e81f3a1d93d66c94e9f0d425f9cee6db4940913..8800a8fcf9a09aa8cf5555e136734856d0c5b1f4 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -69,6 +69,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -90,7 +90,7 @@ index 2e81f3a1d93..8800a8fcf9a 100644 this.player.lastX = this.player.locX(); this.player.lastY = this.player.locY(); diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 6a4e4f93eb3..61c7f5f9528 100644 +index 6a4e4f93eb36ca388523a36abf38bcae3ad375e8..61c7f5f9528ceea34af8dbf4503b9c320b7f67a1 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -52,11 +52,12 @@ public abstract class PlayerList { @@ -249,6 +249,3 @@ index 6a4e4f93eb3..61c7f5f9528 100644 Iterator iterator = list.iterator(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch index a8b9f46152..0801d978ca 100644 --- a/Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch +++ b/Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch @@ -1,4 +1,4 @@ -From c1c61c4f63743bd676ae7e63c4f1cc6e69c2d3f3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: 2277 <38501234+2277@users.noreply.github.com> Date: Tue, 31 Mar 2020 10:33:55 +0100 Subject: [PATCH] Move player to spawn point if spawn in unloaded world @@ -7,7 +7,7 @@ The code following this has better support for null worlds to move them back to the world spawn. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 01330045c0f..9bb5a4bcf1e 100644 +index 01330045c0f3e0993af66c5a34c2a0246003758b..9bb5a4bcf1e76f271368dc4c65a061b531e9aaf0 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1790,9 +1790,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -25,6 +25,3 @@ index 01330045c0f..9bb5a4bcf1e 100644 spawnIn(bworld == null ? null : ((CraftWorld) bworld).getHandle()); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch b/Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch index 50cc57ec7a..617c7e9dcb 100644 --- a/Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch +++ b/Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch @@ -1,4 +1,4 @@ -From 3d403a23b0618443127a7abdac3576198a03a86b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Sun, 19 Apr 2020 12:25:20 +0200 Subject: [PATCH] Allow sleeping players to float @@ -9,7 +9,7 @@ their position to the ground/exit location when entering the bed, resulting in the server believing they're still in the air. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8800a8fcf9a..38ec22f4c03 100644 +index 8800a8fcf9a09aa8cf5555e136734856d0c5b1f4..38ec22f4c0348e9198eededee05cde58c0248de4 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -162,7 +162,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -21,6 +21,3 @@ index 8800a8fcf9a..38ec22f4c03 100644 if (++this.C > 80) { PlayerConnection.LOGGER.warn("{} was kicked for floating too long!", this.player.getDisplayName().getString()); this.disconnect(com.destroystokyo.paper.PaperConfig.flyingKickPlayerMessage); // Paper - use configurable kick message --- -2.26.2 - diff --git a/Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch index c9b3d55a4f..f5ba23a129 100644 --- a/Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -1,11 +1,11 @@ -From c72ed431f4cc362c8e828c425d88ce21c0190040 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Thu, 26 Mar 2020 19:44:50 -0700 Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 2c81344a65b..3fc2360a103 100644 +index 2c81344a65bf230a6ba09deb2a3bb45881144a39..3fc2360a103a5399f2878eccb0c13eb6e41e824d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1690,7 +1690,17 @@ public abstract class EntityLiving extends Entity { @@ -27,6 +27,3 @@ index 2c81344a65b..3fc2360a103 100644 } if (event.isCancelled()) { return false; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch index 2bc9a71166..340d0e054d 100644 --- a/Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch +++ b/Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch @@ -1,4 +1,4 @@ -From c3224481d028cf472836c79ccfcba95e70979901 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 21 Apr 2020 03:51:53 -0400 Subject: [PATCH] Allow multiple callbacks to schedule for Callback Executor @@ -14,7 +14,7 @@ Use an ArrayDeque to store this Queue We make sure to also implement a pattern that is recursion safe too. diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index ea0086ceb64..bdf835397aa 100644 +index ea0086ceb64ad88a64b8327f055836afb3191a0b..bdf835397aa691c41280f65a7785e777791b2891 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -87,24 +87,32 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -56,6 +56,3 @@ index ea0086ceb64..bdf835397aa 100644 }; // CraftBukkit end --- -2.26.2 - diff --git a/Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch b/Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch index 2b99f05aa9..b9ea27eb3c 100644 --- a/Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch +++ b/Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch @@ -1,4 +1,4 @@ -From fd9f5cd3a9853bba484a9ed61c5cf013ba2c285b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 23 Apr 2020 01:36:39 -0400 Subject: [PATCH] Don't fire BlockFade on worldgen threads @@ -6,7 +6,7 @@ Subject: [PATCH] Don't fire BlockFade on worldgen threads Caused a deadlock diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java -index b41de95a639..9e501514f30 100644 +index b41de95a6390910ba8bb21bfa12ab61c85900218..9e501514f30de00d68736d9593582a5e7c8b3cff 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -44,6 +44,7 @@ public class BlockFire extends Block { @@ -17,6 +17,3 @@ index b41de95a639..9e501514f30 100644 if (!iblockdata.canPlace(generatoraccess, blockposition)) { CraftBlockState blockState = CraftBlockState.getBlockState(generatoraccess, blockposition); blockState.setData(Blocks.AIR.getBlockData()); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0492-Add-phantom-creative-and-insomniac-controls.patch b/Spigot-Server-Patches/0492-Add-phantom-creative-and-insomniac-controls.patch index 2693b61418..668aeaca5d 100644 --- a/Spigot-Server-Patches/0492-Add-phantom-creative-and-insomniac-controls.patch +++ b/Spigot-Server-Patches/0492-Add-phantom-creative-and-insomniac-controls.patch @@ -1,11 +1,11 @@ -From 8a5d889963cb87f6facff13cc846278ded17aeaa Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 25 Apr 2020 15:13:41 -0500 Subject: [PATCH] Add phantom creative and insomniac controls diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a4815f5e69c..4612697569f 100644 +index a4815f5e69c00c4471bf7354222d9cf175ceafcd..4612697569fd6e3683b0e58453b61a9a8d077229 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -672,4 +672,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index a4815f5e69c..4612697569f 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index 90eeddb1af5..96b4912c483 100644 +index 90eeddb1af59126ea7ca19c2cc909da72578fb6c..96b4912c4832bee0337d35cb23e574cd02f64c3b 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -232,6 +232,7 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -33,7 +33,7 @@ index 90eeddb1af5..96b4912c483 100644 return true; } diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index a2d1ef3602a..1398c47a2f8 100644 +index a2d1ef3602a1c63d106d10140e18dfdb1d490805..1398c47a2f8b183b65f1553c735c3b183a8bfc9c 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -23,6 +23,7 @@ public final class IEntitySelector { @@ -45,7 +45,7 @@ index a2d1ef3602a..1398c47a2f8 100644 public static Predicate a(double d0, double d1, double d2, double d3) { double d4 = d3 * d3; diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java -index f488c22ed64..0db431cd6ad 100644 +index f488c22ed64a9fa1ce7746942b2a9ff4bc296703..0db431cd6add225304af48a73e1aa732b4c3ae58 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java @@ -31,7 +31,7 @@ public class MobSpawnerPhantom { @@ -57,6 +57,3 @@ index f488c22ed64..0db431cd6ad 100644 BlockPosition blockposition = new BlockPosition(entityhuman); if (!worldserver.worldProvider.f() || blockposition.getY() >= worldserver.getSeaLevel() && worldserver.f(blockposition)) { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch index f8c40a895e..b41ecacf4a 100644 --- a/Spigot-Server-Patches/0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/Spigot-Server-Patches/0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -1,4 +1,4 @@ -From c8d61cc54c9cf1c1cca1e6f6d615b0218e6fbdb7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 25 Apr 2020 06:46:35 -0400 Subject: [PATCH] Fix numerous item duplication issues and teleport issues @@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the same item twice because the source was destroyed. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9bb5a4bcf1e..14ba037c1dc 100644 +index 9bb5a4bcf1e76f271368dc4c65a061b531e9aaf0..14ba037c1dc042f81123b3f31ad5c3485e59b773 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1966,11 +1966,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -57,7 +57,7 @@ index 9bb5a4bcf1e..14ba037c1dc 100644 public float a(Explosion explosion, IBlockAccess iblockaccess, BlockPosition blockposition, IBlockData iblockdata, Fluid fluid, float f) { diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 8ad131e4fc2..d35a0b2d94e 100644 +index 8ad131e4fc20efc61b938a5f6ab64379da23bf0d..d35a0b2d94e4f52c257375c35f55b5a41c9f2c12 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -557,7 +557,7 @@ public class EntityArmorStand extends EntityLiving { @@ -79,7 +79,7 @@ index 8ad131e4fc2..d35a0b2d94e 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index c3f7e461210..73b271f6f3e 100644 +index c3f7e4612109f92ed789021b5acd1af8791d1666..73b271f6f3e68c08020bc9eb9185f7c07f8973bf 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -776,7 +776,8 @@ public class CraftEventFactory { @@ -92,6 +92,3 @@ index c3f7e461210..73b271f6f3e 100644 } return event; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch index 4468ca8843..0682c8dccd 100644 --- a/Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch +++ b/Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch @@ -1,4 +1,4 @@ -From e8941f176a44632fda8e8008fdc4df681d5ad10c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 Apr 2020 18:15:29 -0400 Subject: [PATCH] Implement Brigadier Mojang API @@ -10,7 +10,7 @@ Adds CommandRegisteredEvent - Allows manipulating the CommandNode to add more children/metadata for the client diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java -index 2414b0a552e..2d512aa4f9a 100644 +index 2414b0a552e5d6fb449bca163add7a9bac39e943..2d512aa4f9ab74dfadff748ba6dd72631eda9fe5 100644 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java @@ -267,6 +267,7 @@ public class CommandDispatcher { @@ -30,7 +30,7 @@ index 2414b0a552e..2d512aa4f9a 100644 event.getPlayer().getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/CommandListenerWrapper.java b/src/main/java/net/minecraft/server/CommandListenerWrapper.java -index 0b23a0548d5..c988c929f10 100644 +index 0b23a0548d52a30c064d624e39a896a9791aab3b..c988c929f1063b417d10d84b0c13127738f63e20 100644 --- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java +++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java @@ -15,7 +15,7 @@ import java.util.function.BinaryOperator; @@ -69,7 +69,7 @@ index 0b23a0548d5..c988c929f10 100644 public boolean hasPermission(int i) { // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 38ec22f4c03..a180df220e4 100644 +index 38ec22f4c0348e9198eededee05cde58c0248de4..a180df220e46eb62f00ae00e2482e1d8d07cb107 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -576,8 +576,12 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -101,7 +101,7 @@ index 38ec22f4c03..a180df220e4 100644 // Paper end - async tab completion diff --git a/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java -index 5f33c9e52ac..e16ecdea7d2 100644 +index 5f33c9e52ac51486d4b22a6dcbfac7f46e0412bb..e16ecdea7d27424053b3f21378af054b2f808eca 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java +++ b/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java @@ -17,7 +17,7 @@ import net.minecraft.server.CommandListenerWrapper; @@ -137,6 +137,3 @@ index 5f33c9e52ac..e16ecdea7d2 100644 } @Override --- -2.26.2 - diff --git a/Spigot-Server-Patches/0495-Villager-Restocks-API.patch b/Spigot-Server-Patches/0495-Villager-Restocks-API.patch index 9955611524..624bebd2c3 100644 --- a/Spigot-Server-Patches/0495-Villager-Restocks-API.patch +++ b/Spigot-Server-Patches/0495-Villager-Restocks-API.patch @@ -1,11 +1,11 @@ -From 4a5f84073599f79c8a5031bd29dcb7334d414a7c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: zbk Date: Sun, 26 Apr 2020 23:49:01 -0400 Subject: [PATCH] Villager Restocks API diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 6e0020ae0b4..ef2ee68cd67 100644 +index 6e0020ae0b4d2f2597843129b83fff0d194de337..ef2ee68cd6774d4ed51e78c4cc4a4d46a1911bfc 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -977,4 +977,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -23,7 +23,7 @@ index 6e0020ae0b4..ef2ee68cd67 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java -index fe726e7884c..a8384081c03 100644 +index fe726e7884c9f091d73c8f5d2cb58a87a16649f8..a8384081c03884c86578dca677914d77441c1863 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java @@ -82,6 +82,18 @@ public class CraftVillager extends CraftAbstractVillager implements Villager { @@ -45,6 +45,3 @@ index fe726e7884c..a8384081c03 100644 @Override public boolean sleep(Location location) { Preconditions.checkArgument(location != null, "Location cannot be null"); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0496-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0496-Validate-PickItem-Packet-and-kick-for-invalid.patch index 5e39baccb6..ed73c52b03 100644 --- a/Spigot-Server-Patches/0496-Validate-PickItem-Packet-and-kick-for-invalid.patch +++ b/Spigot-Server-Patches/0496-Validate-PickItem-Packet-and-kick-for-invalid.patch @@ -1,11 +1,11 @@ -From cd53caeea290b688b6b402da58cbc0fca194af7d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 May 2020 03:09:46 -0400 Subject: [PATCH] Validate PickItem Packet and kick for invalid diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a180df220e4..02bda8bee46 100644 +index a180df220e46eb62f00ae00e2482e1d8d07cb107..02bda8bee469da7d1f845fac58f5d5a762fe76c4 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -691,7 +691,14 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -24,6 +24,3 @@ index a180df220e4..02bda8bee46 100644 this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, this.player.inventory.itemInHandIndex, this.player.inventory.getItem(this.player.inventory.itemInHandIndex))); this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, packetplayinpickitem.b(), this.player.inventory.getItem(packetplayinpickitem.b()))); this.player.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex)); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0497-Expose-game-version.patch b/Spigot-Server-Patches/0497-Expose-game-version.patch index f7d910c653..8d6ba360d2 100644 --- a/Spigot-Server-Patches/0497-Expose-game-version.patch +++ b/Spigot-Server-Patches/0497-Expose-game-version.patch @@ -1,11 +1,11 @@ -From 22d0e4e2aded18b3561e3cda3e65d64a27ac17a5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Fri, 1 May 2020 17:39:26 +0300 Subject: [PATCH] Expose game version diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f49193d9d7c..1647c09756e 100644 +index f49193d9d7cd9655fdedf64bebdcf4e1a9b77f2c..1647c09756ed303a3f3e879e877b5b3de639f843 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -489,6 +489,13 @@ public final class CraftServer implements Server { @@ -22,6 +22,3 @@ index f49193d9d7c..1647c09756e 100644 @Override public List getOnlinePlayers() { return this.playerView; --- -2.26.2 - diff --git a/Spigot-Server-Patches/0498-Sync-position-on-teleportation.patch b/Spigot-Server-Patches/0498-Sync-position-on-teleportation.patch index d5dc090bfe..ed2dd30e23 100644 --- a/Spigot-Server-Patches/0498-Sync-position-on-teleportation.patch +++ b/Spigot-Server-Patches/0498-Sync-position-on-teleportation.patch @@ -1,4 +1,4 @@ -From 3e7391730310c563d073be105c8370cd1be5ac12 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 May 2020 14:25:55 -0400 Subject: [PATCH] Sync position on teleportation @@ -13,7 +13,7 @@ it is triggering a massive movement velocity. This will ensure that the servers position is synchronized anytime player is teleported. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 02bda8bee46..a188d9f3b60 100644 +index 02bda8bee469da7d1f845fac58f5d5a762fe76c4..a188d9f3b600e1013e31d681f9c6a8deb64ada7e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -500,6 +500,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -32,6 +32,3 @@ index 02bda8bee46..a188d9f3b60 100644 this.player.playerConnection.sendPacket(new PacketPlayOutPosition(d0 - d3, d1 - d4, d2 - d5, f - f2, f1 - f3, set, this.teleportAwait)); } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0499-Optimize-Voxel-Shape-Merging.patch b/Spigot-Server-Patches/0499-Optimize-Voxel-Shape-Merging.patch index f791c9a57a..17ce4b0e95 100644 --- a/Spigot-Server-Patches/0499-Optimize-Voxel-Shape-Merging.patch +++ b/Spigot-Server-Patches/0499-Optimize-Voxel-Shape-Merging.patch @@ -1,4 +1,4 @@ -From c9336ba6dcc9a9573528c62c22be1ddd7f6e1d07 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 May 2020 22:35:09 -0400 Subject: [PATCH] Optimize Voxel Shape Merging @@ -30,7 +30,7 @@ Additionally, this lets us avoid even allocating new objects for this too, furth reducing memory usage. diff --git a/src/main/java/net/minecraft/server/VoxelShapeMergerList.java b/src/main/java/net/minecraft/server/VoxelShapeMergerList.java -index 71d2ae2a9c5..232b0023773 100644 +index 71d2ae2a9c5a05351241b5a313e66ca15b0624ef..232b0023773008c19f19ad4658eb40fcd08c0333 100644 --- a/src/main/java/net/minecraft/server/VoxelShapeMergerList.java +++ b/src/main/java/net/minecraft/server/VoxelShapeMergerList.java @@ -6,10 +6,16 @@ import it.unimi.dsi.fastutil.ints.IntArrayList; @@ -75,7 +75,7 @@ index 71d2ae2a9c5..232b0023773 100644 this.b = new IntArrayList(i1); this.c = new IntArrayList(i1); diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java -index 08c83c62dfe..bb3a1a97df9 100644 +index 08c83c62dfe875600162a46a0ca4b835b0bfe199..bb3a1a97df96157d7e1b0dfcbc935689088f4818 100644 --- a/src/main/java/net/minecraft/server/VoxelShapes.java +++ b/src/main/java/net/minecraft/server/VoxelShapes.java @@ -316,9 +316,21 @@ public final class VoxelShapes { @@ -125,6 +125,3 @@ index 08c83c62dfe..bb3a1a97df9 100644 } public interface a { --- -2.26.2 - diff --git a/Spigot-Server-Patches/0500-Cleanup-Region-Files-Direct-Memory-on-close.patch b/Spigot-Server-Patches/0500-Cleanup-Region-Files-Direct-Memory-on-close.patch index af65db4354..6fbf1686d9 100644 --- a/Spigot-Server-Patches/0500-Cleanup-Region-Files-Direct-Memory-on-close.patch +++ b/Spigot-Server-Patches/0500-Cleanup-Region-Files-Direct-Memory-on-close.patch @@ -1,4 +1,4 @@ -From cee647e81a3c64791e2e231fbadf7b4da897b1c3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 May 2020 00:38:13 -0400 Subject: [PATCH] Cleanup Region Files Direct Memory on close @@ -10,7 +10,7 @@ Finalizers have no guarantee on when they will be ran, and since this is old generation memory, it might be a while before its called. diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index df728e2c0a2..20927d55c67 100644 +index df728e2c0a2bf660a91e0bd6342c4b4b1471dcb7..20927d55c6700f66f0931bfe3d20fd8959c87989 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -30,7 +30,7 @@ public class RegionFile implements AutoCloseable { @@ -82,6 +82,3 @@ index df728e2c0a2..20927d55c67 100644 private void c() throws IOException { int i = (int) this.dataFile.size(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0501-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0501-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch index 4fccea4404..4d0dcced19 100644 --- a/Spigot-Server-Patches/0501-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch +++ b/Spigot-Server-Patches/0501-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch @@ -1,4 +1,4 @@ -From 1a054b86819314f6e6aae65af695b3f048122466 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 May 2020 01:08:56 -0400 Subject: [PATCH] Set cap on JDK per-thread native byte buffer cache @@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache. Set system properly at server startup if not set already to help protect from this. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 093dbeae278..93340e9470b 100644 +index 093dbeae2784d51dae74f66e3e1ce5bf6a370428..93340e9470b23f2d8c91338e63e95c6465e69c3c 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -21,6 +21,7 @@ public class Main { @@ -28,6 +28,3 @@ index 093dbeae278..93340e9470b 100644 OptionParser parser = new OptionParser() { { acceptsAll(asList("?", "help"), "Show the help"); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0502-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0502-Implement-Mob-Goal-API.patch index 0fe447744c..eed5bb390a 100644 --- a/Spigot-Server-Patches/0502-Implement-Mob-Goal-API.patch +++ b/Spigot-Server-Patches/0502-Implement-Mob-Goal-API.patch @@ -1,11 +1,11 @@ -From fe881f4cdb74409b6af489ccebf374bee6c1e620 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Fri, 3 Jan 2020 16:26:19 +0100 Subject: [PATCH] Implement Mob Goal API diff --git a/pom.xml b/pom.xml -index bc8438ae1ae..0c0051f7f2a 100644 +index bc8438ae1ae939be4d2257d37df9a843a13ac301..0c0051f7f2a58d63b851e80b442acbb47ca75dfa 100644 --- a/pom.xml +++ b/pom.xml @@ -122,6 +122,13 @@ @@ -24,7 +24,7 @@ index bc8438ae1ae..0c0051f7f2a 100644 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java new file mode 100644 -index 00000000000..d6ee9410786 +index 0000000000000000000000000000000000000000..d6ee9410786006be0ffe137c7c0aa4a34e0a3025 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java @@ -0,0 +1,329 @@ @@ -359,7 +359,7 @@ index 00000000000..d6ee9410786 +} diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java new file mode 100644 -index 00000000000..8e4dc2708d7 +index 0000000000000000000000000000000000000000..8e4dc2708d71edcb8f32bb72a64f3c493052c2a8 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java @@ -0,0 +1,52 @@ @@ -417,7 +417,7 @@ index 00000000000..8e4dc2708d7 +} diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java new file mode 100644 -index 00000000000..d9df0236e82 +index 0000000000000000000000000000000000000000..d9df0236e8224d54587bbeac856a4d125f25f865 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java @@ -0,0 +1,236 @@ @@ -659,7 +659,7 @@ index 00000000000..d9df0236e82 +} diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java new file mode 100644 -index 00000000000..263e8c65b9e +index 0000000000000000000000000000000000000000..263e8c65b9e108bafb03638b3c27dd065eab86ee --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java @@ -0,0 +1,63 @@ @@ -727,7 +727,7 @@ index 00000000000..263e8c65b9e + } +} diff --git a/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java b/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java -index 9df0006c1a2..b3329c6fcd6 100644 +index 9df0006c1a283f77c4d01d9fce9062fc1c9bbb1f..b3329c6fcd6758a781a51f5ba8f5052ac1c77b49 100644 --- a/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java +++ b/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java @@ -64,4 +64,8 @@ public final class OptimizedSmallEnumSet> { @@ -740,7 +740,7 @@ index 9df0006c1a2..b3329c6fcd6 100644 + } } diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java -index 93009d83f07..2dfbecf3905 100644 +index 93009d83f07bdaf7bc424ffb99cbfe716ca0d66d..2dfbecf3905d9b3712dab240bba5dda3f11d5312 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java @@ -10,9 +10,9 @@ public abstract class PathfinderGoal { @@ -776,7 +776,7 @@ index 93009d83f07..2dfbecf3905 100644 this.goalTypes.clear(); this.goalTypes.addAllUnchecked(enumset); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java -index 84d2abbcb90..a68fc11ec66 100644 +index 84d2abbcb90eb09a19fa0922cfc053c74f8c56e4..a68fc11ec668576d1453459666caeacf5fbc49b8 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java @@ -26,7 +26,7 @@ public class PathfinderGoalSelector { @@ -815,7 +815,7 @@ index 84d2abbcb90..a68fc11ec66 100644 return this.d.stream().filter(PathfinderGoalWrapped::g); } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java -index 1b800c558f0..dee4e2beacb 100644 +index 1b800c558f0988ffc0270b86d1a59ea3bb245116..dee4e2beacb1bbb179f220ed186e873bef718340 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java @@ -5,8 +5,8 @@ import javax.annotation.Nullable; @@ -830,7 +830,7 @@ index 1b800c558f0..dee4e2beacb 100644 public PathfinderGoalWrapped(int i, PathfinderGoal pathfindergoal) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1647c09756e..b89f99a66fe 100644 +index 1647c09756ed303a3f3e879e877b5b3de639f843..b89f99a66fe2ab9ad4c956c38c9e4b1d79716c9c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2230,5 +2230,11 @@ public final class CraftServer implements Server { @@ -847,7 +847,7 @@ index 1647c09756e..b89f99a66fe 100644 } diff --git a/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java new file mode 100644 -index 00000000000..83d34761d91 +index 0000000000000000000000000000000000000000..83d34761d9197fa21cabe6d5859f0123bdda20bb --- /dev/null +++ b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java @@ -0,0 +1,92 @@ @@ -943,6 +943,3 @@ index 00000000000..83d34761d91 + if (shouldFail) Assert.fail("See above"); + } +} --- -2.26.2 - diff --git a/Spigot-Server-Patches/0503-Optimize-entity-list-iteration-requiring-entities-be.patch b/Spigot-Server-Patches/0503-Optimize-entity-list-iteration-requiring-entities-be.patch index b7bd73958a..8456425e61 100644 --- a/Spigot-Server-Patches/0503-Optimize-entity-list-iteration-requiring-entities-be.patch +++ b/Spigot-Server-Patches/0503-Optimize-entity-list-iteration-requiring-entities-be.patch @@ -1,4 +1,4 @@ -From f7902ec0612cd05ad9b4a86652810dd2f8449cb3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 5 May 2020 19:49:23 -0700 Subject: [PATCH] Optimize entity list iteration requiring entities be in @@ -7,7 +7,7 @@ Subject: [PATCH] Optimize entity list iteration requiring entities be in We retain a list of loaded entities specifically for this usage diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 750fb07756f..69bfece7d43 100644 +index 750fb07756f7e40b21f8ab0925f2e842aae50f7b..69bfece7d43bc9e0c4cf7f71bffec9a44c2b9a67 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -801,6 +801,7 @@ public class Chunk implements IChunkAccess { @@ -27,7 +27,7 @@ index 750fb07756f..69bfece7d43 100644 // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index b3785775ecd..d9b3aa285a7 100644 +index b3785775ecd8e3c13e7829f641f2c1b5fd0d9d47..d9b3aa285a7b187f692088bab320f1de2160300b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -189,6 +189,25 @@ public class WorldServer extends World { @@ -104,7 +104,7 @@ index b3785775ecd..d9b3aa285a7 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index ac257d50dea..995f706678f 100644 +index ac257d50dea8f42a515f19bbae12ab5680e26bb4..995f706678fa0f4e88078d5a15c62dcac25f5fca 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1110,16 +1110,16 @@ public class CraftWorld implements World { @@ -184,7 +184,7 @@ index ac257d50dea..995f706678f 100644 } break; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index ff60568ce43..f3771121617 100644 +index ff60568ce4320e6ebfa50489a564538b0f57da82..f3771121617ad6ad256562dc72a50f241f530929 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -180,6 +180,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -206,6 +206,3 @@ index ff60568ce43..f3771121617 100644 @Override public Chunk getChunk() { net.minecraft.server.Chunk currentChunk = entity.getCurrentChunk(); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0504-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0504-Use-distance-map-to-optimise-entity-tracker.patch index d86af64d46..df38f4969e 100644 --- a/Spigot-Server-Patches/0504-Use-distance-map-to-optimise-entity-tracker.patch +++ b/Spigot-Server-Patches/0504-Use-distance-map-to-optimise-entity-tracker.patch @@ -1,4 +1,4 @@ -From 6f44ef0cdfda2837e43c2a2cb02eb1677723b3bc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 5 May 2020 20:18:05 -0700 Subject: [PATCH] Use distance map to optimise entity tracker @@ -6,7 +6,7 @@ Subject: [PATCH] Use distance map to optimise entity tracker Use the distance map to find candidate players for tracking. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 14ba037c1dc..8820e4b6506 100644 +index 14ba037c1dc042f81123b3f31ad5c3485e59b773..8820e4b6506f645b98d23fe6eab044cc6cd54427 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -244,6 +244,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -32,7 +32,7 @@ index 14ba037c1dc..8820e4b6506 100644 this.id = Entity.entityCount.incrementAndGet(); this.passengers = Lists.newArrayList(); diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index 3a88c9a6706..6d3b34ead9c 100644 +index 3a88c9a67062eb73ad8257ea786efca7e7e99f65..6d3b34ead9cc95dcc1152dffa8c6c4a8c7f1d58b 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -70,6 +70,7 @@ public class EntityTrackerEntry { @@ -44,7 +44,7 @@ index 3a88c9a6706..6d3b34ead9c 100644 List list = this.tracker.getPassengers(); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index bdf835397aa..d460bc62b8d 100644 +index bdf835397aa691c41280f65a7785e777791b2891..d460bc62b8d89582457c1b6ab530b0ddc9971526 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -120,21 +120,51 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -328,7 +328,7 @@ index bdf835397aa..d460bc62b8d 100644 } } diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java -index 765bdaf9b52..43b5ed8e396 100644 +index 765bdaf9b525a989ec8d37a2fe856dcfcbd06782..43b5ed8e396e5312f7de1f160f596f58baead28a 100644 --- a/src/main/java/org/spigotmc/TrackingRange.java +++ b/src/main/java/org/spigotmc/TrackingRange.java @@ -49,4 +49,43 @@ public class TrackingRange @@ -375,6 +375,3 @@ index 765bdaf9b52..43b5ed8e396 100644 + } + // Paper end - optimise entity tracking } --- -2.26.2 - diff --git a/Spigot-Server-Patches/0505-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0505-Optimize-isOutsideRange-to-use-distance-maps.patch index 241681efef..069e7d1ef6 100644 --- a/Spigot-Server-Patches/0505-Optimize-isOutsideRange-to-use-distance-maps.patch +++ b/Spigot-Server-Patches/0505-Optimize-isOutsideRange-to-use-distance-maps.patch @@ -1,4 +1,4 @@ -From 54b10482abd4ba1b16555717aebc33275a22d962 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 5 May 2020 20:40:53 -0700 Subject: [PATCH] Optimize isOutsideRange to use distance maps @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize isOutsideRange to use distance maps Use a distance map to find the players in range quickly diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index 279c7a85fb5..7cd4e291235 100644 +index 279c7a85fb5b4bff91fba1c9797c902bd68d8539..7cd4e2912351eae35b46dba1c8a471af781dc98b 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -31,7 +31,7 @@ public abstract class ChunkMapDistance { @@ -77,7 +77,7 @@ index 279c7a85fb5..7cd4e291235 100644 public String c() { diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 78a8a3cc68f..e2abda1bc37 100644 +index 78a8a3cc68f21ec3ade95c13ccacafd3a3a6c4e6..e2abda1bc37b9be0bae2506f0f26360693f3d30a 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -733,6 +733,36 @@ public class ChunkProviderServer extends IChunkProvider { @@ -148,7 +148,7 @@ index 78a8a3cc68f..e2abda1bc37 100644 this.world.timings.mobSpawn.startTiming(); // Spigot EnumCreatureType[] aenumcreaturetype1 = aenumcreaturetype; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 48bbaec4b64..6e8179b4651 100644 +index 48bbaec4b64bede8d280bd866436f5528578013e..6e8179b4651fca214b8957992ec6c9438c0da799 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -109,6 +109,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -161,7 +161,7 @@ index 48bbaec4b64..6e8179b4651 100644 super((World) worldserver, gameprofile); playerinteractmanager.player = this; diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 4b341c81fc9..bae9371a1e2 100644 +index 4b341c81fc97076a69aede729008c54674fa7adf..bae9371a1e220f4fc78a3905cad24a2e7f88771c 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -148,6 +148,18 @@ public class PlayerChunk { @@ -192,7 +192,7 @@ index 4b341c81fc9..bae9371a1e2 100644 // Paper start diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index d460bc62b8d..4317d9b98e4 100644 +index d460bc62b8d89582457c1b6ab530b0ddc9971526..4317d9b98e4a8a994bc7d215aa71489c0de3a14e 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -130,6 +130,17 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -382,6 +382,3 @@ index d460bc62b8d..4317d9b98e4 100644 private boolean b(EntityPlayer entityplayer) { return entityplayer.isSpectator() && !this.world.getGameRules().getBoolean(GameRules.SPECTATORS_GENERATE_CHUNKS); --- -2.26.2 - diff --git a/Spigot-Server-Patches/0506-Stop-copy-on-write-operations-for-updating-light-dat.patch b/Spigot-Server-Patches/0506-Stop-copy-on-write-operations-for-updating-light-dat.patch index 7c95f2df9b..2e3ac97929 100644 --- a/Spigot-Server-Patches/0506-Stop-copy-on-write-operations-for-updating-light-dat.patch +++ b/Spigot-Server-Patches/0506-Stop-copy-on-write-operations-for-updating-light-dat.patch @@ -1,4 +1,4 @@ -From 0972401dfb337f0846bb7f6a9f88213be61be85a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 27 Apr 2020 04:05:38 -0700 Subject: [PATCH] Stop copy-on-write operations for updating light data @@ -6,7 +6,7 @@ Subject: [PATCH] Stop copy-on-write operations for updating light data Causes huge memory allocations + gc issues diff --git a/src/main/java/net/minecraft/server/LightEngineStorage.java b/src/main/java/net/minecraft/server/LightEngineStorage.java -index a3f919816eb..88277d23c36 100644 +index a3f919816eb2a742ed09b553995e6508684e5ea5..88277d23c36696fdd5363e41a130c9a443fac2c0 100644 --- a/src/main/java/net/minecraft/server/LightEngineStorage.java +++ b/src/main/java/net/minecraft/server/LightEngineStorage.java @@ -19,8 +19,8 @@ public abstract class LightEngineStorage> e @@ -63,7 +63,7 @@ index a3f919816eb..88277d23c36 100644 } diff --git a/src/main/java/net/minecraft/server/LightEngineStorageArray.java b/src/main/java/net/minecraft/server/LightEngineStorageArray.java -index b978723a66d..278aec8846d 100644 +index b978723a66d001f70325df0c7521025e079d7cfa..278aec8846d3bd448e359095063a711e78213ee5 100644 --- a/src/main/java/net/minecraft/server/LightEngineStorageArray.java +++ b/src/main/java/net/minecraft/server/LightEngineStorageArray.java @@ -8,10 +8,17 @@ public abstract class LightEngineStorageArray Date: Tue, 5 May 2020 21:23:34 -0700 Subject: [PATCH] No-Tick view distance implementation @@ -9,7 +9,7 @@ Per-Player is absent due to difficulty of maintaining the diff required to make it happen. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 4612697569f..5c8a946d5c8 100644 +index 4612697569fd6e3683b0e58453b61a9a8d077229..5c8a946d5c895fc2622c7df656cc462c58104cf7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -679,4 +679,9 @@ public class PaperWorldConfig { @@ -23,7 +23,7 @@ index 4612697569f..5c8a946d5c8 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 69bfece7d43..2332f126f73 100644 +index 69bfece7d43bc9e0c4cf7f71bffec9a44c2b9a67..2332f126f73d9914ade140fa78f18921787e90b3 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -245,7 +245,51 @@ public class Chunk implements IChunkAccess { @@ -79,7 +79,7 @@ index 69bfece7d43..2332f126f73 100644 public final boolean areNeighboursLoaded(final int radius) { diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index 7cd4e291235..942efe62fe5 100644 +index 7cd4e2912351eae35b46dba1c8a471af781dc98b..942efe62fe5cefd6373ea568c7a62c524d536771 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -252,7 +252,7 @@ public abstract class ChunkMapDistance { @@ -101,7 +101,7 @@ index 7cd4e291235..942efe62fe5 100644 if (flag1) { ChunkMapDistance.this.j.a(ChunkTaskQueueSorter.a(() -> { // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 6e8179b4651..e32c458dfe5 100644 +index 6e8179b4651fca214b8957992ec6c9438c0da799..e32c458dfe5f22572a365cbcdf45140b61f31d56 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -111,6 +111,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -114,7 +114,7 @@ index 6e8179b4651..e32c458dfe5 100644 super((World) worldserver, gameprofile); playerinteractmanager.player = this; diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index bae9371a1e2..9d71c4c455d 100644 +index bae9371a1e220f4fc78a3905cad24a2e7f88771c..9d71c4c455d68bcc82dc56b0706c7305e4897e46 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -160,6 +160,18 @@ public class PlayerChunk { @@ -207,7 +207,7 @@ index bae9371a1e2..9d71c4c455d 100644 public CompletableFuture> a(ChunkStatus chunkstatus, PlayerChunkMap playerchunkmap) { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 4317d9b98e4..a3abad95a11 100644 +index 4317d9b98e4a8a994bc7d215aa71489c0de3a14e..a3abad95a11be9ff802063e88a5cc7daadb627bb 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -71,7 +71,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -550,7 +550,7 @@ index 4317d9b98e4..a3abad95a11 100644 } } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 61c7f5f9528..9786f110c5e 100644 +index 61c7f5f9528ceea34af8dbf4503b9c320b7f67a1..9786f110c5e0d02cc015dc5d9d2549734bda501d 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -151,7 +151,7 @@ public abstract class PlayerList { @@ -581,7 +581,7 @@ index 61c7f5f9528..9786f110c5e 100644 while (iterator.hasNext()) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 899c535c405..0e6368d0fb3 100644 +index 899c535c4056cd2375ab8f834f03267d405f4bda..0e6368d0fb3beccb492ae3867fb4e22825f928a2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -443,8 +443,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -600,7 +600,7 @@ index 899c535c405..0e6368d0fb3 100644 if (!this.isClientSide && (i & 1) != 0) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 995f706678f..ee7ae463898 100644 +index 995f706678fa0f4e88078d5a15c62dcac25f5fca..ee7ae4638981ab372f65734fb560157cc06c18e9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2483,10 +2483,39 @@ public class CraftWorld implements World { @@ -645,7 +645,7 @@ index 995f706678f..ee7ae463898 100644 private final Spigot spigot = new Spigot() { diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index d873b8cf3ae..f735217e7a9 100644 +index d873b8cf3aec01b791565c33b252889f99f181f9..f735217e7a99bf8286ea60158f9fe137e84ad75c 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -201,7 +201,7 @@ public class ActivationRange @@ -657,6 +657,3 @@ index d873b8cf3ae..f735217e7a9 100644 for ( EntityHuman player : world.getPlayers() ) { --- -2.26.2 -