diff --git a/Paper b/Paper index 2e44dc1ae..ad708dd3f 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 2e44dc1ae37a11946203bf04185865c924acf1b9 +Subproject commit ad708dd3f3f506e93dd6652361029e41f2b7e41c diff --git a/current-paper b/current-paper index 7423b9d38..e663127a2 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.2--c1c24ab812da60ac48409d1ac20a3b8ff9cb41e3 +1.15.2--de9e5516780d55a4b19bb73272429822dbb86abd diff --git a/patches/api/0002-Tuinity-API-Patches.patch b/patches/api/0002-Tuinity-API-Patches.patch index 9f2ba9579..486e990dd 100644 --- a/patches/api/0002-Tuinity-API-Patches.patch +++ b/patches/api/0002-Tuinity-API-Patches.patch @@ -1,4 +1,4 @@ -From ac2da46e3db5951ece720838726cf5b0d8ceb7f2 Mon Sep 17 00:00:00 2001 +From 9c22c9759cf1460418eecb1224cc0bec509de0fa Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 14 Dec 2018 21:52:29 -0800 Subject: [PATCH] Tuinity API Patches @@ -10,7 +10,7 @@ Subject: [PATCH] Tuinity API Patches 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml -index 58a1f7d07..19d003fa8 100644 +index 58a1f7d0..19d003fa 100644 --- a/pom.xml +++ b/pom.xml @@ -18,8 +18,8 @@ @@ -36,10 +36,10 @@ index 58a1f7d07..19d003fa8 100644 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 5047be15f..d9df7509a 100644 +index af0637f7..a3ed3154 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -3067,6 +3067,34 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -3165,6 +3165,34 @@ public interface World extends PluginMessageRecipient, Metadatable { int getViewDistance(); // Spigot end @@ -75,7 +75,7 @@ index 5047be15f..d9df7509a 100644 public class Spigot { diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 877ea4f32..5367975ac 100644 +index 877ea4f3..5367975a 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1969,6 +1969,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0003-Purpur-config-files.patch b/patches/api/0003-Purpur-config-files.patch index 1df3afbfa..5e6438279 100644 --- a/patches/api/0003-Purpur-config-files.patch +++ b/patches/api/0003-Purpur-config-files.patch @@ -1,4 +1,4 @@ -From 3c223fc899501579d3656f7e73da79b195c59f39 Mon Sep 17 00:00:00 2001 +From 713489b865ff4aa3f8597b6415fe0b345156c504 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 18 Feb 2020 20:30:03 -0600 Subject: [PATCH] Purpur config files @@ -9,7 +9,7 @@ Subject: [PATCH] Purpur config files 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java -index 93d5a3f97..b5111928d 100644 +index 93d5a3f9..b5111928 100644 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -204,9 +204,14 @@ class TimingsExport extends Thread { @@ -51,10 +51,10 @@ index 93d5a3f97..b5111928d 100644 JSONObject object = new JSONObject(); diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 98e7ba900..bea600c65 100644 +index 80f9abdc..739182ef 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1331,6 +1331,23 @@ public interface Server extends PluginMessageRecipient { +@@ -1371,6 +1371,23 @@ public interface Server extends PluginMessageRecipient { } // Paper end diff --git a/patches/api/0006-Remove-pointless-annotations-and-deprecations.patch b/patches/api/0006-Remove-pointless-annotations-and-deprecations.patch index 8e0f25405..90d48e809 100644 --- a/patches/api/0006-Remove-pointless-annotations-and-deprecations.patch +++ b/patches/api/0006-Remove-pointless-annotations-and-deprecations.patch @@ -1,4 +1,4 @@ -From 88169f864dd54bc7ee722705785554377e745594 Mon Sep 17 00:00:00 2001 +From 05c1703c9edc678587fbb6a84e91edca73ec9747 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 31 Dec 2019 23:00:07 -0600 Subject: [PATCH] Remove pointless annotations and deprecations @@ -14,10 +14,10 @@ Subject: [PATCH] Remove pointless annotations and deprecations 7 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 355bd2e22..50415189c 100644 +index b9973406..3a60094a 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -807,13 +807,10 @@ public final class Bukkit { +@@ -851,13 +851,10 @@ public final class Bukkit { * This will return an object even if the player does not exist. To this * method, all players will exist. * @@ -32,10 +32,10 @@ index 355bd2e22..50415189c 100644 public static OfflinePlayer getOfflinePlayer(@NotNull String name) { return server.getOfflinePlayer(name); diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 765f8059a..e0d207d73 100644 +index 739182ef..0f7e84fb 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -672,13 +672,10 @@ public interface Server extends PluginMessageRecipient { +@@ -712,13 +712,10 @@ public interface Server extends PluginMessageRecipient { * This will return an object even if the player does not exist. To this * method, all players will exist. * @@ -50,7 +50,7 @@ index 765f8059a..e0d207d73 100644 public OfflinePlayer getOfflinePlayer(@NotNull String name); diff --git a/src/main/java/org/bukkit/command/CommandExecutor.java b/src/main/java/org/bukkit/command/CommandExecutor.java -index 45cb8da12..383b43e1b 100644 +index 45cb8da1..383b43e1 100644 --- a/src/main/java/org/bukkit/command/CommandExecutor.java +++ b/src/main/java/org/bukkit/command/CommandExecutor.java @@ -19,5 +19,5 @@ public interface CommandExecutor { @@ -61,7 +61,7 @@ index 45cb8da12..383b43e1b 100644 + public boolean onCommand(CommandSender sender, Command command, String label, String[] args); // Purpur - remove pointless annotations } diff --git a/src/main/java/org/bukkit/command/TabCompleter.java b/src/main/java/org/bukkit/command/TabCompleter.java -index e9cf71f5c..34d3462c7 100644 +index e9cf71f5..34d3462c 100644 --- a/src/main/java/org/bukkit/command/TabCompleter.java +++ b/src/main/java/org/bukkit/command/TabCompleter.java @@ -23,5 +23,5 @@ public interface TabCompleter { @@ -72,7 +72,7 @@ index e9cf71f5c..34d3462c7 100644 + public List onTabComplete(CommandSender sender, Command command, String alias, String[] args); // Purpur - remove pointless annotations } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index d7d6a3e83..cf8d77491 100644 +index d7d6a3e8..cf8d7749 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -204,13 +204,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -100,7 +100,7 @@ index d7d6a3e83..cf8d77491 100644 ItemMeta meta = getItemMeta(); return (meta == null) ? 0 : (short) ((Damageable) meta).getDamage(); diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java -index 04fa3991f..24d65491c 100644 +index 04fa3991..24d65491 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java @@ -287,7 +287,7 @@ public abstract class JavaPlugin extends PluginBase { @@ -122,7 +122,7 @@ index 04fa3991f..24d65491c 100644 } diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index a48be38b1..951b81e79 100644 +index a48be38b..951b81e7 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -41,6 +41,11 @@ public class AnnotationTest { diff --git a/patches/api/0010-Add-tick-times-API.patch b/patches/api/0010-Add-tick-times-API.patch index d5b87c7bd..d7a59807f 100644 --- a/patches/api/0010-Add-tick-times-API.patch +++ b/patches/api/0010-Add-tick-times-API.patch @@ -1,4 +1,4 @@ -From 7237c98d2466a3bbbf909eced8c728aa5242fdcf Mon Sep 17 00:00:00 2001 +From 56c9dfec5e48c93e44bf73e8d841c851202320c2 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 30 Jan 2020 00:41:08 -0600 Subject: [PATCH] Add tick times API @@ -9,10 +9,10 @@ Subject: [PATCH] Add tick times API 2 files changed, 38 insertions(+) diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 50415189c..8fbda2aee 100644 +index 3a60094a..6935cf27 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1620,4 +1620,25 @@ public final class Bukkit { +@@ -1664,4 +1664,25 @@ public final class Bukkit { public static Server.Spigot spigot() { return server.spigot(); } @@ -39,10 +39,10 @@ index 50415189c..8fbda2aee 100644 + // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 0c45c9af3..75bf097ed 100644 +index 0f7e84fb..df1765b5 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1430,4 +1430,21 @@ public interface Server extends PluginMessageRecipient { +@@ -1470,4 +1470,21 @@ public interface Server extends PluginMessageRecipient { */ int getCurrentTick(); // Paper end diff --git a/patches/api/0011-Bring-back-server-name.patch b/patches/api/0011-Bring-back-server-name.patch index e0c4c4c9d..3ced3220d 100644 --- a/patches/api/0011-Bring-back-server-name.patch +++ b/patches/api/0011-Bring-back-server-name.patch @@ -1,4 +1,4 @@ -From ab2f131fdd232bd09bedb76172d48ca5f6458435 Mon Sep 17 00:00:00 2001 +From 33ce16852b951902d8a9685c5a65837796e94ebf Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 26 May 2019 15:18:40 -0500 Subject: [PATCH] Bring back server name @@ -9,10 +9,10 @@ Subject: [PATCH] Bring back server name 2 files changed, 16 insertions(+) diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 8fbda2aee..a2cf8e29b 100644 +index 6935cf27..abf7caf0 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1622,6 +1622,15 @@ public final class Bukkit { +@@ -1666,6 +1666,15 @@ public final class Bukkit { } // Purpur start @@ -29,10 +29,10 @@ index 8fbda2aee..a2cf8e29b 100644 * Get a sample of the servers last tick times (in nanos) * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 75bf097ed..89100f3f5 100644 +index df1765b5..39d933aa 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1432,6 +1432,13 @@ public interface Server extends PluginMessageRecipient { +@@ -1472,6 +1472,13 @@ public interface Server extends PluginMessageRecipient { // Paper end // Purpur start diff --git a/patches/api/0015-Implement-lagging-threshold.patch b/patches/api/0015-Implement-lagging-threshold.patch index 867f4d202..b46382b52 100644 --- a/patches/api/0015-Implement-lagging-threshold.patch +++ b/patches/api/0015-Implement-lagging-threshold.patch @@ -1,4 +1,4 @@ -From e87e36de2b313502386d54bcae4f7c531f1c183b Mon Sep 17 00:00:00 2001 +From 2ca955541330acf8eef7244843b91694407e881b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 23 Jul 2019 10:07:24 -0500 Subject: [PATCH] Implement lagging threshold @@ -9,10 +9,10 @@ Subject: [PATCH] Implement lagging threshold 2 files changed, 16 insertions(+) diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index a2cf8e29b..220cc96c0 100644 +index abf7caf0..c9fc59a2 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1631,6 +1631,15 @@ public final class Bukkit { +@@ -1675,6 +1675,15 @@ public final class Bukkit { return server.getServerName(); } @@ -29,10 +29,10 @@ index a2cf8e29b..220cc96c0 100644 * Get a sample of the servers last tick times (in nanos) * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 89100f3f5..ee0f2d6b2 100644 +index 39d933aa..eba6a7a7 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1439,6 +1439,13 @@ public interface Server extends PluginMessageRecipient { +@@ -1479,6 +1479,13 @@ public interface Server extends PluginMessageRecipient { @NotNull String getServerName(); diff --git a/patches/api/0021-Add-moon-phase-API.patch b/patches/api/0021-Add-moon-phase-API.patch index ce955b270..e9b9f936c 100644 --- a/patches/api/0021-Add-moon-phase-API.patch +++ b/patches/api/0021-Add-moon-phase-API.patch @@ -1,4 +1,4 @@ -From 21773eb994120e80f72be1ed9d0a51523149b022 Mon Sep 17 00:00:00 2001 +From 0a5979ad09792249e6c4b56860bbcf45cb5b9634 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 1 Feb 2020 22:22:07 -0600 Subject: [PATCH] Add moon phase API @@ -11,7 +11,7 @@ Subject: [PATCH] Add moon phase API diff --git a/src/main/java/net/pl3x/purpur/MoonPhase.java b/src/main/java/net/pl3x/purpur/MoonPhase.java new file mode 100644 -index 000000000..f5ad98c62 +index 00000000..f5ad98c6 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/MoonPhase.java @@ -0,0 +1,36 @@ @@ -52,10 +52,10 @@ index 000000000..f5ad98c62 + } +} diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index d9df7509a..d8178abfc 100644 +index a3ed3154..01d7204b 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -3145,6 +3145,16 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -3243,6 +3243,16 @@ public interface World extends PluginMessageRecipient, Metadatable { @NotNull public List getRaids(); diff --git a/patches/api/0026-Add-getPlacementBlockData-to-World.patch b/patches/api/0026-Add-getPlacementBlockData-to-World.patch index 16cf9426e..9c695ff34 100644 --- a/patches/api/0026-Add-getPlacementBlockData-to-World.patch +++ b/patches/api/0026-Add-getPlacementBlockData-to-World.patch @@ -1,4 +1,4 @@ -From c5c975aca49194cc02c4af567d9b73a8edcc6f22 Mon Sep 17 00:00:00 2001 +From 0080a35f149be736b9d274e7272d24842da4e985 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 00:34:36 -0500 Subject: [PATCH] Add getPlacementBlockData to World @@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World 1 file changed, 10 insertions(+) diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index d8178abfc..b17a03334 100644 +index 01d7204b..be430fb0 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -3153,6 +3153,16 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -3251,6 +3251,16 @@ public interface World extends PluginMessageRecipient, Metadatable { */ @NotNull net.pl3x.purpur.MoonPhase getMoonPhase(); diff --git a/patches/server/0002-Tuinity-Server-Patches.patch b/patches/server/0002-Tuinity-Server-Patches.patch index 1249a0bc8..31097d7b1 100644 --- a/patches/server/0002-Tuinity-Server-Patches.patch +++ b/patches/server/0002-Tuinity-Server-Patches.patch @@ -1,4 +1,4 @@ -From 9795b9171b86f82f9091f6c2325f312d980bd696 Mon Sep 17 00:00:00 2001 +From 4ad6d822049616c83833585f1a24cbe87500128a Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 14 Dec 2018 21:53:58 -0800 Subject: [PATCH] Tuinity Server Patches @@ -128,7 +128,7 @@ Subject: [PATCH] Tuinity Server Patches create mode 100644 src/main/java/com/tuinity/tuinity/util/set/LinkedSortedSet.java diff --git a/pom.xml b/pom.xml -index e6fc4d014..ffac75de2 100644 +index e6fc4d014e..ffac75de25 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ @@ -173,7 +173,7 @@ index e6fc4d014..ffac75de2 100644 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 132397b3f..4e12f416f 100644 +index 132397b3f3..4e12f416f9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -215,7 +215,7 @@ public class PaperCommand extends Command { @@ -186,7 +186,7 @@ index 132397b3f..4e12f416f 100644 continue; } diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 7d408542e..a61d936fc 100644 +index c7cde1d0a0..e60af9ceba 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -108,7 +108,7 @@ public class PaperWorldConfig { @@ -207,7 +207,7 @@ index 7d408542e..a61d936fc 100644 softDespawnDistance = softDespawnDistance*softDespawnDistance; hardDespawnDistance = hardDespawnDistance*hardDespawnDistance; diff --git a/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java b/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java -index 78bd238f4..8a7893268 100644 +index 78bd238f4c..8a78932688 100644 --- a/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java +++ b/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java @@ -1,5 +1,6 @@ @@ -277,7 +277,7 @@ index 78bd238f4..8a7893268 100644 } diff --git a/src/main/java/com/mojang/datafixers/util/Either.java b/src/main/java/com/mojang/datafixers/util/Either.java -index a90adac7b..2e7cbf8bf 100644 +index a90adac7bd..2e7cbf8bf5 100644 --- a/src/main/java/com/mojang/datafixers/util/Either.java +++ b/src/main/java/com/mojang/datafixers/util/Either.java @@ -23,6 +23,7 @@ public abstract class Either implements App, L> { @@ -316,7 +316,7 @@ index a90adac7b..2e7cbf8bf 100644 @Override diff --git a/src/main/java/com/tuinity/tuinity/chunk/ChunkRegionManager.java b/src/main/java/com/tuinity/tuinity/chunk/ChunkRegionManager.java new file mode 100644 -index 000000000..ff17a100b +index 0000000000..ff17a100ba --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/ChunkRegionManager.java @@ -0,0 +1,165 @@ @@ -488,7 +488,7 @@ index 000000000..ff17a100b \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Int.java b/src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Int.java new file mode 100644 -index 000000000..d528d08ea +index 0000000000..d528d08ea5 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Int.java @@ -0,0 +1,155 @@ @@ -649,7 +649,7 @@ index 000000000..d528d08ea +} diff --git a/src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Object.java b/src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Object.java new file mode 100644 -index 000000000..e5bb56cca +index 0000000000..e5bb56cca9 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Object.java @@ -0,0 +1,170 @@ @@ -826,7 +826,7 @@ index 000000000..e5bb56cca \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java new file mode 100644 -index 000000000..feec44f57 +index 0000000000..feec44f572 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java @@ -0,0 +1,225 @@ @@ -1058,7 +1058,7 @@ index 000000000..feec44f57 \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/server/TickListServerInterval.java b/src/main/java/com/tuinity/tuinity/server/TickListServerInterval.java new file mode 100644 -index 000000000..bef788ccf +index 0000000000..bef788ccfa --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/server/TickListServerInterval.java @@ -0,0 +1,42 @@ @@ -1106,7 +1106,7 @@ index 000000000..bef788ccf +} diff --git a/src/main/java/com/tuinity/tuinity/server/TuinityTickList.java b/src/main/java/com/tuinity/tuinity/server/TuinityTickList.java new file mode 100644 -index 000000000..4118dd7e1 +index 0000000000..4118dd7e1d --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/server/TuinityTickList.java @@ -0,0 +1,614 @@ @@ -1726,7 +1726,7 @@ index 000000000..4118dd7e1 +} diff --git a/src/main/java/com/tuinity/tuinity/util/ChunkList.java b/src/main/java/com/tuinity/tuinity/util/ChunkList.java new file mode 100644 -index 000000000..66c64be8f +index 0000000000..66c64be8f3 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/ChunkList.java @@ -0,0 +1,119 @@ @@ -1851,7 +1851,7 @@ index 000000000..66c64be8f +} diff --git a/src/main/java/com/tuinity/tuinity/util/EntityList.java b/src/main/java/com/tuinity/tuinity/util/EntityList.java new file mode 100644 -index 000000000..570c44e26 +index 0000000000..570c44e26a --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/EntityList.java @@ -0,0 +1,124 @@ @@ -1981,7 +1981,7 @@ index 000000000..570c44e26 +} diff --git a/src/main/java/com/tuinity/tuinity/util/IBlockDataList.java b/src/main/java/com/tuinity/tuinity/util/IBlockDataList.java new file mode 100644 -index 000000000..ce15ce532 +index 0000000000..ce15ce532b --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/IBlockDataList.java @@ -0,0 +1,123 @@ @@ -2111,7 +2111,7 @@ index 000000000..ce15ce532 \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/util/OptimizedSmallEnumSet.java b/src/main/java/com/tuinity/tuinity/util/OptimizedSmallEnumSet.java new file mode 100644 -index 000000000..934792ad3 +index 0000000000..934792ad39 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/OptimizedSmallEnumSet.java @@ -0,0 +1,65 @@ @@ -2183,7 +2183,7 @@ index 000000000..934792ad3 \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/util/PrimaryThreadList.java b/src/main/java/com/tuinity/tuinity/util/PrimaryThreadList.java new file mode 100644 -index 000000000..de930aef9 +index 0000000000..de930aef9b --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/PrimaryThreadList.java @@ -0,0 +1,241 @@ @@ -2431,7 +2431,7 @@ index 000000000..de930aef9 \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/util/PrimaryThreadSet.java b/src/main/java/com/tuinity/tuinity/util/PrimaryThreadSet.java new file mode 100644 -index 000000000..0249c78c1 +index 0000000000..0249c78c1a --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/PrimaryThreadSet.java @@ -0,0 +1,282 @@ @@ -2719,7 +2719,7 @@ index 000000000..0249c78c1 +} diff --git a/src/main/java/com/tuinity/tuinity/util/TickSynchronizationPoint.java b/src/main/java/com/tuinity/tuinity/util/TickSynchronizationPoint.java new file mode 100644 -index 000000000..37adae900 +index 0000000000..37adae9007 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/TickSynchronizationPoint.java @@ -0,0 +1,40 @@ @@ -2766,7 +2766,7 @@ index 000000000..37adae900 \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/util/TickThread.java b/src/main/java/com/tuinity/tuinity/util/TickThread.java new file mode 100644 -index 000000000..d5688a734 +index 0000000000..d5688a734e --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/TickThread.java @@ -0,0 +1,40 @@ @@ -2813,7 +2813,7 @@ index 000000000..d5688a734 \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/util/Util.java b/src/main/java/com/tuinity/tuinity/util/Util.java new file mode 100644 -index 000000000..a69fc1488 +index 0000000000..a69fc14880 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/Util.java @@ -0,0 +1,103 @@ @@ -2922,7 +2922,7 @@ index 000000000..a69fc1488 +} diff --git a/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedAbstractDoubleList.java b/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedAbstractDoubleList.java new file mode 100644 -index 000000000..88b198fd7 +index 0000000000..88b198fd7b --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedAbstractDoubleList.java @@ -0,0 +1,39 @@ @@ -2968,7 +2968,7 @@ index 000000000..88b198fd7 \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedDoubleArrayList.java b/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedDoubleArrayList.java new file mode 100644 -index 000000000..36457981e +index 0000000000..36457981ee --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedDoubleArrayList.java @@ -0,0 +1,65 @@ @@ -3039,7 +3039,7 @@ index 000000000..36457981e +} diff --git a/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedObjectAVLTreeSet.java b/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedObjectAVLTreeSet.java new file mode 100644 -index 000000000..1a3f59633 +index 0000000000..1a3f596330 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedObjectAVLTreeSet.java @@ -0,0 +1,90 @@ @@ -3135,7 +3135,7 @@ index 000000000..1a3f59633 +} diff --git a/src/main/java/com/tuinity/tuinity/util/map/AreaMap.java b/src/main/java/com/tuinity/tuinity/util/map/AreaMap.java new file mode 100644 -index 000000000..dfb7a417e +index 0000000000..dfb7a417ea --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/map/AreaMap.java @@ -0,0 +1,388 @@ @@ -3530,7 +3530,7 @@ index 000000000..dfb7a417e \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/util/map/PlayerAreaMap.java b/src/main/java/com/tuinity/tuinity/util/map/PlayerAreaMap.java new file mode 100644 -index 000000000..a29fdcbbc +index 0000000000..a29fdcbbcb --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/map/PlayerAreaMap.java @@ -0,0 +1,25 @@ @@ -3562,7 +3562,7 @@ index 000000000..a29fdcbbc \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/util/map/PooledLinkedHashSets.java b/src/main/java/com/tuinity/tuinity/util/map/PooledLinkedHashSets.java new file mode 100644 -index 000000000..cf888454c +index 0000000000..cf888454c1 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/map/PooledLinkedHashSets.java @@ -0,0 +1,287 @@ @@ -3856,7 +3856,7 @@ index 000000000..cf888454c \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/util/pool/PooledBlockPositions.java b/src/main/java/com/tuinity/tuinity/util/pool/PooledBlockPositions.java new file mode 100644 -index 000000000..815974682 +index 0000000000..815974682a --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/pool/PooledBlockPositions.java @@ -0,0 +1,40 @@ @@ -3902,7 +3902,7 @@ index 000000000..815974682 +} diff --git a/src/main/java/com/tuinity/tuinity/util/set/LinkedSortedSet.java b/src/main/java/com/tuinity/tuinity/util/set/LinkedSortedSet.java new file mode 100644 -index 000000000..c726ef3c2 +index 0000000000..c726ef3c2b --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/set/LinkedSortedSet.java @@ -0,0 +1,142 @@ @@ -4049,7 +4049,7 @@ index 000000000..c726ef3c2 + } +} diff --git a/src/main/java/net/minecraft/server/ArraySetSorted.java b/src/main/java/net/minecraft/server/ArraySetSorted.java -index 85f799a71..5fa6f75e2 100644 +index 85f799a713..5fa6f75e2e 100644 --- a/src/main/java/net/minecraft/server/ArraySetSorted.java +++ b/src/main/java/net/minecraft/server/ArraySetSorted.java @@ -6,12 +6,13 @@ import java.util.Arrays; @@ -4112,7 +4112,7 @@ index 85f799a71..5fa6f75e2 100644 return new ArraySetSorted<>(i, (Comparator)Comparator.naturalOrder()); // Paper - decompile fix } diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java -index c950139c0..1a3234bb4 100644 +index c950139c0f..1a3234bb47 100644 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java @@ -193,6 +193,7 @@ public class AxisAlignedBB { @@ -4132,7 +4132,7 @@ index c950139c0..1a3234bb4 100644 return d0 >= this.minX && d0 < this.maxX && d1 >= this.minY && d1 < this.maxY && d2 >= this.minZ && d2 < this.maxZ; } diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index e650a2e48..83c5c8329 100644 +index e650a2e48d..83c5c83292 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 @@ -4144,7 +4144,7 @@ index e650a2e48..83c5c8329 100644 return this.b(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 92065fe02..cd7ada615 100644 +index 92065fe029..cd7ada6159 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -162,6 +162,94 @@ public class Chunk implements IChunkAccess { @@ -4345,7 +4345,7 @@ index 92065fe02..cd7ada615 100644 int j = MathHelper.floor((axisalignedbb.maxY + 2.0D) / 16.0D); diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java -index 55f9f4e6e..d3c616e72 100644 +index 55f9f4e6e7..d3c616e72d 100644 --- a/src/main/java/net/minecraft/server/ChunkMap.java +++ b/src/main/java/net/minecraft/server/ChunkMap.java @@ -13,9 +13,10 @@ public abstract class ChunkMap extends LightEngineGraph { @@ -4385,7 +4385,7 @@ index 55f9f4e6e..d3c616e72 100644 this.a(ChunkCoordIntPair.a, i, j, flag); } diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index 73d157076..cb2e67d15 100644 +index 73d1570765..cb2e67d159 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -1,5 +1,6 @@ @@ -4916,7 +4916,7 @@ index 73d157076..cb2e67d15 100644 protected b(int i) { diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 76c7f4a50..516f27fd2 100644 +index cf9021d605..239e646e9b 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -119,6 +119,12 @@ public class ChunkProviderServer extends IChunkProvider { @@ -5105,7 +5105,7 @@ index 76c7f4a50..516f27fd2 100644 this.world.getMethodProfiler().enter("pollingChunks"); int k = this.world.getGameRules().getInt(GameRules.RANDOM_TICK_SPEED); BlockPosition blockposition = this.world.getSpawn(); -@@ -630,11 +719,10 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -636,11 +725,10 @@ public class ChunkProviderServer extends IChunkProvider { EnumCreatureType[] aenumcreaturetype = EnumCreatureType.values(); // Paper start - per player mob spawning int[] worldMobCount; @@ -5120,7 +5120,7 @@ index 76c7f4a50..516f27fd2 100644 // re-set mob counts for (EntityPlayer player : this.world.players) { Arrays.fill(player.mobCounts, 0); -@@ -647,20 +735,13 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -653,20 +741,13 @@ public class ChunkProviderServer extends IChunkProvider { this.world.timings.countNaturalMobs.stopTiming(); // Paper - timings this.world.getMethodProfiler().exit(); @@ -5148,7 +5148,7 @@ index 76c7f4a50..516f27fd2 100644 this.world.getMethodProfiler().enter("broadcast"); this.world.timings.broadcastChunkUpdates.startTiming(); // Paper - timings -@@ -670,10 +751,10 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -676,10 +757,10 @@ public class ChunkProviderServer extends IChunkProvider { ChunkCoordIntPair chunkcoordintpair = playerchunk.i(); this.world.timings.chunkInhibitedRangeCheck.startTiming(); @@ -5161,7 +5161,7 @@ index 76c7f4a50..516f27fd2 100644 this.world.getMethodProfiler().enter("spawner"); this.world.timings.mobSpawn.startTiming(); // Spigot EnumCreatureType[] aenumcreaturetype1 = aenumcreaturetype; -@@ -713,9 +794,23 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -724,9 +805,23 @@ public class ChunkProviderServer extends IChunkProvider { if (this.world.paperConfig.perPlayerMobSpawns) { int minDiff = Integer.MAX_VALUE; @@ -5186,7 +5186,7 @@ index 76c7f4a50..516f27fd2 100644 difference = (minDiff == Integer.MAX_VALUE) ? 0 : minDiff; } -@@ -738,7 +833,22 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -749,7 +844,22 @@ public class ChunkProviderServer extends IChunkProvider { } this.world.timings.chunkInhibitedRangeCheck.stopTiming(); // Paper } @@ -5211,7 +5211,7 @@ index 76c7f4a50..516f27fd2 100644 if (flag1) { try (co.aikar.timings.Timing ignored = this.world.timings.miscMobSpawning.startTiming()) { // Paper - timings diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 4349d22cc..d529b795c 100644 +index 4349d22cc8..d529b795c5 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -23,6 +23,14 @@ public class ChunkRegionLoader { @@ -5243,7 +5243,7 @@ index 4349d22cc..d529b795c 100644 nbttagcompound1.setString("Status", ichunkaccess.getChunkStatus().d()); ChunkConverter chunkconverter = ichunkaccess.p(); diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java -index 88f167461..fd7b10429 100644 +index 88f1674616..fd7b10429d 100644 --- a/src/main/java/net/minecraft/server/ChunkStatus.java +++ b/src/main/java/net/minecraft/server/ChunkStatus.java @@ -103,7 +103,7 @@ public class ChunkStatus { @@ -5273,7 +5273,7 @@ index 88f167461..fd7b10429 100644 return this.c() >= chunkstatus.c(); } diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 349a0ea21..ede436939 100644 +index 349a0ea213..ede4369399 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 @@ -5294,7 +5294,7 @@ index 349a0ea21..ede436939 100644 this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals); this.setSpawnNPCs(dedicatedserverproperties.spawnNpcs); diff --git a/src/main/java/net/minecraft/server/DoubleListOffset.java b/src/main/java/net/minecraft/server/DoubleListOffset.java -index 73657f740..9ff09b02d 100644 +index 73657f7407..9ff09b02d6 100644 --- a/src/main/java/net/minecraft/server/DoubleListOffset.java +++ b/src/main/java/net/minecraft/server/DoubleListOffset.java @@ -3,7 +3,7 @@ package net.minecraft.server; @@ -5307,7 +5307,7 @@ index 73657f740..9ff09b02d 100644 private final DoubleList a; private final double b; diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java -index cf00f35a5..e54730f09 100644 +index cf00f35a5b..e54730f097 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 { @@ -5320,7 +5320,7 @@ index cf00f35a5..e54730f09 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 8974c16bf..23e91183e 100644 +index 8974c16bf9..23e91183ef 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -208,6 +208,58 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -5391,7 +5391,7 @@ index 8974c16bf..23e91183e 100644 double d3 = this.locX() - d0; double d4 = this.locY() - d1; diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index af10fc36e..bf14d33c0 100644 +index af10fc36e0..bf14d33c0d 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 { @@ -5407,7 +5407,7 @@ index af10fc36e..bf14d33c0 100644 double deltaX = this.locX() - player.locX(); double deltaZ = this.locZ() - player.locZ(); diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 1991cee43..27ef47600 100644 +index 1991cee43d..27ef476001 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -641,20 +641,27 @@ public abstract class EntityInsentient extends EntityLiving { @@ -5445,7 +5445,7 @@ index 1991cee43..27ef47600 100644 } else { diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index e7bfbc330..937e513d8 100644 +index e7bfbc3307..937e513d81 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -104,6 +104,37 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -5512,7 +5512,7 @@ index e7bfbc330..937e513d8 100644 } diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index 3a88c9a67..b4d3c4a4f 100644 +index 3a88c9a670..b4d3c4a4f9 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -18,7 +18,7 @@ import org.bukkit.event.player.PlayerVelocityEvent; @@ -5619,7 +5619,7 @@ index 3a88c9a67..b4d3c4a4f 100644 this.xLoc = PacketPlayOutEntity.a(this.tracker.locX()); this.yLoc = PacketPlayOutEntity.a(this.tracker.locY()); diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index 8977c3516..bace6cf36 100644 +index 8977c3516b..bace6cf36a 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 { @@ -5635,7 +5635,7 @@ index 8977c3516..bace6cf36 100644 double deltaX = this.locX() - player.locX(); double deltaZ = this.locZ() - player.locZ(); diff --git a/src/main/java/net/minecraft/server/HeightMap.java b/src/main/java/net/minecraft/server/HeightMap.java -index 29cb545a8..aa7339610 100644 +index 29cb545a86..aa73396100 100644 --- a/src/main/java/net/minecraft/server/HeightMap.java +++ b/src/main/java/net/minecraft/server/HeightMap.java @@ -119,6 +119,7 @@ public class HeightMap { @@ -5665,7 +5665,7 @@ index 29cb545a8..aa7339610 100644 this.h = heightmap_use; this.i = predicate; diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java -index cfe43e882..e7a58989d 100644 +index cfe43e882e..e7a58989dd 100644 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java @@ -13,7 +13,7 @@ public abstract class IAsyncTaskHandler implements Mailbox= 15) { diff --git a/src/main/java/net/minecraft/server/LightEngineLayer.java b/src/main/java/net/minecraft/server/LightEngineLayer.java -index f72ff8495..f27a14873 100644 +index f72ff8495b..f27a148731 100644 --- a/src/main/java/net/minecraft/server/LightEngineLayer.java +++ b/src/main/java/net/minecraft/server/LightEngineLayer.java @@ -11,7 +11,7 @@ public abstract class LightEngineLayer, S e @@ -5793,7 +5793,7 @@ index f72ff8495..f27a14873 100644 private final IBlockAccess[] h = new IBlockAccess[2]; diff --git a/src/main/java/net/minecraft/server/LightEngineSky.java b/src/main/java/net/minecraft/server/LightEngineSky.java -index 2301a982e..488d4f289 100644 +index 2301a982e1..488d4f289f 100644 --- a/src/main/java/net/minecraft/server/LightEngineSky.java +++ b/src/main/java/net/minecraft/server/LightEngineSky.java @@ -27,7 +27,7 @@ public final class LightEngineSky extends LightEngineLayer= 15) { diff --git a/src/main/java/net/minecraft/server/LightEngineStorage.java b/src/main/java/net/minecraft/server/LightEngineStorage.java -index a3f919816..dacc96414 100644 +index a3f919816e..dacc96414f 100644 --- a/src/main/java/net/minecraft/server/LightEngineStorage.java +++ b/src/main/java/net/minecraft/server/LightEngineStorage.java @@ -19,11 +19,12 @@ public abstract class LightEngineStorage> e @@ -5869,7 +5869,7 @@ index a3f919816..dacc96414 100644 while (objectiterator.hasNext()) { entry = (Entry) objectiterator.next(); diff --git a/src/main/java/net/minecraft/server/LightEngineStorageArray.java b/src/main/java/net/minecraft/server/LightEngineStorageArray.java -index b978723a6..5e2051ee1 100644 +index b978723a66..5e2051ee1a 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> { @@ -6241,7 +6241,7 @@ index 96a785af2..211a6d720 100644 public SocketAddress socketAddress; public void setSpoofedRemoteAddress(SocketAddress address) { this.socketAddress = address; } // Paper - OBFHELPER // Spigot Start diff --git a/src/main/java/net/minecraft/server/NextTickListEntry.java b/src/main/java/net/minecraft/server/NextTickListEntry.java -index 33cfeabde..11a4bb882 100644 +index 33cfeabdee..11a4bb882e 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; @@ -6312,7 +6312,7 @@ index 33cfeabde..11a4bb882 100644 public String toString() { return this.e + ": " + this.a + ", " + this.b + ", " + this.c + ", " + this.f; diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index ef7ade797..185ed1db3 100644 +index ef7ade797b..185ed1db3b 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -29,7 +29,7 @@ public class PacketPlayOutMapChunk implements Packet { @@ -6354,7 +6354,7 @@ index ef7ade797..185ed1db3 100644 NBTTagCompound nbttagcompound = tileentity.b(); if (tileentity instanceof TileEntitySkull) { TileEntitySkull.sanitizeTileEntityUUID(nbttagcompound); } // Paper diff --git a/src/main/java/net/minecraft/server/PairedQueue.java b/src/main/java/net/minecraft/server/PairedQueue.java -index 85bb22e4b..1e618446a 100644 +index 85bb22e4b7..1e618446a4 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 { @@ -6424,7 +6424,7 @@ index 85bb22e4b..1e618446a 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java -index bdb90a346..738c51070 100644 +index bdb90a3466..738c510706 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java @@ -1,10 +1,11 @@ @@ -6466,7 +6466,7 @@ index bdb90a346..738c51070 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 935136771..782edcb63 100644 +index 935136771e..782edcb63b 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java @@ -1,8 +1,10 @@ @@ -6644,7 +6644,7 @@ index 935136771..782edcb63 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 29657fed7..71919adc0 100644 +index 29657fed75..71919adc0d 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java @@ -60,8 +60,10 @@ public class PathfinderGoalWrapped extends PathfinderGoal { @@ -6661,7 +6661,7 @@ index 29657fed7..71919adc0 100644 public boolean isRunning() { return this.g(); } // Paper - OBFHELPER diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java -index 4240ca81c..69fd3cc8e 100644 +index 4240ca81cb..69fd3cc8ec 100644 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java @@ -443,8 +443,10 @@ public class PathfinderNormal extends PathfinderAbstract { @@ -6677,7 +6677,7 @@ index 4240ca81c..69fd3cc8e 100644 if (iblockdata == null) return PathType.BLOCKED; // Paper Block block = iblockdata.getBlock(); diff --git a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java -index e35ec2db0..e7dfe22ac 100644 +index e35ec2db07..e7dfe22acd 100644 --- a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java +++ b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java @@ -51,6 +51,7 @@ public class PathfinderTargetCondition { @@ -6689,7 +6689,7 @@ index e35ec2db0..e7dfe22ac 100644 if (entityliving == entityliving1) { return false; diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index b38bc6775..729795238 100644 +index b38bc67758..7297952386 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -43,6 +43,18 @@ public class PlayerChunk { @@ -6871,7 +6871,7 @@ index b38bc6775..729795238 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 57bea926a..aa625ce2a 100644 +index 57bea926a6..aa625ce2a4 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -55,8 +55,9 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -8057,7 +8057,7 @@ index 57bea926a..aa625ce2a 100644 Iterator iterator = list.iterator(); diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index ce4340a47..1b60310bb 100644 +index ce4340a476..1b60310bb0 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -20,14 +20,29 @@ public class PlayerInteractManager { @@ -8182,7 +8182,7 @@ index ce4340a47..1b60310bb 100644 this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition)); // CraftBukkit - SPIGOT-5196 } diff --git a/src/main/java/net/minecraft/server/PlayerInventory.java b/src/main/java/net/minecraft/server/PlayerInventory.java -index d103cfaac..1b8cb3fc6 100644 +index d103cfaace..1b8cb3fc61 100644 --- a/src/main/java/net/minecraft/server/PlayerInventory.java +++ b/src/main/java/net/minecraft/server/PlayerInventory.java @@ -559,8 +559,10 @@ public class PlayerInventory implements IInventory, INamableTileEntity { @@ -8199,7 +8199,7 @@ index d103cfaac..1b8cb3fc6 100644 list = nonnulllist; break; diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 7b79ee4fe..253ee52eb 100644 +index 7b79ee4fe5..253ee52eb5 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -156,7 +156,7 @@ public abstract class PlayerList { @@ -8230,7 +8230,7 @@ index 7b79ee4fe..253ee52eb 100644 while (iterator.hasNext()) { diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java -index f376e2106..5a883aac1 100644 +index f376e21068..5a883aac14 100644 --- a/src/main/java/net/minecraft/server/ProtoChunk.java +++ b/src/main/java/net/minecraft/server/ProtoChunk.java @@ -180,14 +180,11 @@ public class ProtoChunk implements IChunkAccess { @@ -8266,7 +8266,7 @@ index f376e2106..5a883aac1 100644 } diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index df728e2c0..5bd7b8f55 100644 +index df728e2c0a..5bd7b8f553 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -28,14 +28,342 @@ public class RegionFile implements AutoCloseable { @@ -8778,7 +8778,7 @@ index df728e2c0..5bd7b8f55 100644 ((java.nio.Buffer) this.f).position(0); this.dataFile.write(this.f, 0L); diff --git a/src/main/java/net/minecraft/server/RegionFileBitSet.java b/src/main/java/net/minecraft/server/RegionFileBitSet.java -index 1ebdf73cc..cfa3ecb03 100644 +index 1ebdf73cc9..cfa3ecb031 100644 --- a/src/main/java/net/minecraft/server/RegionFileBitSet.java +++ b/src/main/java/net/minecraft/server/RegionFileBitSet.java @@ -4,18 +4,42 @@ import java.util.BitSet; @@ -8826,7 +8826,7 @@ index 1ebdf73cc..cfa3ecb03 100644 int j = 0; diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 0f201000f..c88ad8de0 100644 +index 0f201000f6..c88ad8de0a 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -18,6 +18,30 @@ public class RegionFileCache implements AutoCloseable { // Paper - no final @@ -8904,7 +8904,7 @@ index 0f201000f..c88ad8de0 100644 } diff --git a/src/main/java/net/minecraft/server/RegionFileCompression.java b/src/main/java/net/minecraft/server/RegionFileCompression.java -index 3382d678e..29137f495 100644 +index 3382d678e6..29137f4959 100644 --- a/src/main/java/net/minecraft/server/RegionFileCompression.java +++ b/src/main/java/net/minecraft/server/RegionFileCompression.java @@ -13,7 +13,7 @@ import javax.annotation.Nullable; @@ -8936,7 +8936,7 @@ index 3382d678e..29137f495 100644 return (InputStream) this.f.wrap(inputstream); } diff --git a/src/main/java/net/minecraft/server/StructureBoundingBox.java b/src/main/java/net/minecraft/server/StructureBoundingBox.java -index dbb565e74..118762778 100644 +index dbb565e74d..118762778c 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; @@ -8975,7 +8975,7 @@ index dbb565e74..118762778 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/ThreadedMailbox.java b/src/main/java/net/minecraft/server/ThreadedMailbox.java -index 808256902..8b1a3f3f9 100644 +index 8082569022..8b1a3f3f98 100644 --- a/src/main/java/net/minecraft/server/ThreadedMailbox.java +++ b/src/main/java/net/minecraft/server/ThreadedMailbox.java @@ -17,7 +17,7 @@ public class ThreadedMailbox implements Mailbox, AutoCloseable, Runnable { @@ -8988,7 +8988,7 @@ index 808256902..8b1a3f3f9 100644 public ThreadedMailbox(PairedQueue pairedqueue, Executor executor, String s) { diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java -index f533860bb..a54d36d90 100644 +index f533860bbe..a54d36d90b 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 { @@ -9111,7 +9111,7 @@ index f533860bb..a54d36d90 100644 } } diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java -index 7a8397815..0d5b1a0b7 100644 +index 7a8397815a..0d5b1a0b7b 100644 --- a/src/main/java/net/minecraft/server/Ticket.java +++ b/src/main/java/net/minecraft/server/Ticket.java @@ -5,9 +5,10 @@ import java.util.Objects; @@ -9136,7 +9136,7 @@ index 7a8397815..0d5b1a0b7 100644 long j = this.a.b(); diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java -index 4b87ca2ec..141664b55 100644 +index 4b87ca2ecb..141664b554 100644 --- a/src/main/java/net/minecraft/server/TicketType.java +++ b/src/main/java/net/minecraft/server/TicketType.java @@ -23,6 +23,7 @@ public class TicketType { @@ -9148,7 +9148,7 @@ index 4b87ca2ec..141664b55 100644 public static TicketType a(String s, Comparator comparator) { return new TicketType<>(s, comparator, 0L); diff --git a/src/main/java/net/minecraft/server/VoxelShapeArray.java b/src/main/java/net/minecraft/server/VoxelShapeArray.java -index caf297fe9..3161e3b97 100644 +index caf297fe97..3161e3b977 100644 --- a/src/main/java/net/minecraft/server/VoxelShapeArray.java +++ b/src/main/java/net/minecraft/server/VoxelShapeArray.java @@ -11,7 +11,7 @@ public final class VoxelShapeArray extends VoxelShape { @@ -9161,7 +9161,7 @@ index caf297fe9..3161e3b97 100644 VoxelShapeArray(VoxelShapeDiscrete voxelshapediscrete, DoubleList doublelist, DoubleList doublelist1, DoubleList doublelist2) { diff --git a/src/main/java/net/minecraft/server/VoxelShapeCubePoint.java b/src/main/java/net/minecraft/server/VoxelShapeCubePoint.java -index 9e09671dc..b69a1ed46 100644 +index 9e09671dc2..b69a1ed46a 100644 --- a/src/main/java/net/minecraft/server/VoxelShapeCubePoint.java +++ b/src/main/java/net/minecraft/server/VoxelShapeCubePoint.java @@ -2,7 +2,7 @@ package net.minecraft.server; @@ -9174,7 +9174,7 @@ index 9e09671dc..b69a1ed46 100644 private final int a; diff --git a/src/main/java/net/minecraft/server/VoxelShapeMergerList.java b/src/main/java/net/minecraft/server/VoxelShapeMergerList.java -index 71d2ae2a9..9129eaa64 100644 +index 71d2ae2a9c..9129eaa642 100644 --- a/src/main/java/net/minecraft/server/VoxelShapeMergerList.java +++ b/src/main/java/net/minecraft/server/VoxelShapeMergerList.java @@ -18,7 +18,7 @@ public final class VoxelShapeMergerList implements VoxelShapeMerger { @@ -9187,7 +9187,7 @@ index 71d2ae2a9..9129eaa64 100644 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 08c83c62d..d5da9f582 100644 +index 08c83c62df..d5da9f5825 100644 --- a/src/main/java/net/minecraft/server/VoxelShapes.java +++ b/src/main/java/net/minecraft/server/VoxelShapes.java @@ -19,7 +19,7 @@ public final class VoxelShapes { @@ -9200,10 +9200,10 @@ index 08c83c62d..d5da9f582 100644 public static VoxelShape a() { return VoxelShapes.c; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index baad98517..c0c83d433 100644 +index 5117dafbcf..5f69a018d9 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -80,6 +80,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -82,6 +82,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray @@ -9212,7 +9212,7 @@ index baad98517..c0c83d433 100644 public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPosition lastPhysicsProblem; // Spigot private org.spigotmc.TickLimiter entityLimiter; -@@ -129,6 +131,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -131,6 +133,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray @@ -9220,7 +9220,7 @@ index baad98517..c0c83d433 100644 this.generator = gen; this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit -@@ -329,6 +332,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -333,6 +336,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @Override public boolean setTypeAndData(BlockPosition blockposition, IBlockData iblockdata, int i) { @@ -9228,7 +9228,7 @@ index baad98517..c0c83d433 100644 // CraftBukkit start - tree generation if (this.captureTreeGeneration) { CraftBlockState blockstate = capturedBlockStates.get(blockposition); -@@ -425,6 +429,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -429,6 +433,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { // CraftBukkit start - Split off from above in order to directly send client and physic updates public void notifyAndUpdatePhysics(BlockPosition blockposition, Chunk chunk, IBlockData oldBlock, IBlockData newBlock, IBlockData actualBlock, int i) { @@ -9236,7 +9236,7 @@ index baad98517..c0c83d433 100644 IBlockData iblockdata = newBlock; IBlockData iblockdata1 = oldBlock; IBlockData iblockdata2 = actualBlock; -@@ -433,8 +438,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -437,8 +442,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { this.b(blockposition, iblockdata1, iblockdata2); } @@ -9251,7 +9251,7 @@ index baad98517..c0c83d433 100644 } if (!this.isClientSide && (i & 1) != 0) { -@@ -1175,9 +1185,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1179,9 +1189,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { int k = MathHelper.floor((axisalignedbb.minZ - 2.0D) / 16.0D); int l = MathHelper.floor((axisalignedbb.maxZ + 2.0D) / 16.0D); @@ -9264,7 +9264,7 @@ index baad98517..c0c83d433 100644 if (chunk != null) { chunk.a(entity, axisalignedbb, list, predicate); -@@ -1196,9 +1208,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1200,9 +1212,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { int l = MathHelper.f((axisalignedbb.maxZ + 2.0D) / 16.0D); List list = Lists.newArrayList(); @@ -9277,7 +9277,7 @@ index baad98517..c0c83d433 100644 if (chunk != null) { chunk.a(entitytypes, axisalignedbb, list, predicate); -@@ -1218,10 +1232,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1222,10 +1236,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { int l = MathHelper.f((axisalignedbb.maxZ + 2.0D) / 16.0D); List list = Lists.newArrayList(); IChunkProvider ichunkprovider = this.getChunkProvider(); @@ -9291,7 +9291,7 @@ index baad98517..c0c83d433 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 c74b85917..214b555e7 100644 +index c74b85917a..214b555e73 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -55,7 +55,7 @@ public class WorldServer extends World { @@ -9864,7 +9864,7 @@ index c74b85917..214b555e7 100644 } diff --git a/src/main/java/net/minecraft/server/WorldUpgrader.java b/src/main/java/net/minecraft/server/WorldUpgrader.java -index 3030c347e..76f0f258e 100644 +index 3030c347ef..76f0f258e1 100644 --- a/src/main/java/net/minecraft/server/WorldUpgrader.java +++ b/src/main/java/net/minecraft/server/WorldUpgrader.java @@ -220,7 +220,7 @@ public class WorldUpgrader { @@ -9877,10 +9877,10 @@ index 3030c347e..76f0f258e 100644 try { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index fc074a66c..23c3a69fa 100644 +index f70468adab..3a0e027e67 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -796,6 +796,7 @@ public final class CraftServer implements Server { +@@ -806,6 +806,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper @@ -9888,7 +9888,7 @@ index fc074a66c..23c3a69fa 100644 for (WorldServer world : console.getWorlds()) { world.worldData.setDifficulty(config.difficulty); world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals); -@@ -812,6 +813,7 @@ public final class CraftServer implements Server { +@@ -834,6 +835,7 @@ public final class CraftServer implements Server { } world.spigotConfig.init(); // Spigot world.paperConfig.init(); // Paper @@ -9896,7 +9896,7 @@ index fc074a66c..23c3a69fa 100644 } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -1683,7 +1685,10 @@ public final class CraftServer implements Server { +@@ -1705,7 +1707,10 @@ public final class CraftServer implements Server { @Override public boolean isPrimaryThread() { @@ -9909,7 +9909,7 @@ index fc074a66c..23c3a69fa 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a14b8cb98..7aed24c8f 100644 +index 1a5ee34103..339ec053c7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -3,6 +3,7 @@ package org.bukkit.craftbukkit; @@ -10036,7 +10036,7 @@ index a14b8cb98..7aed24c8f 100644 list.add(bukkitEntity); } break; -@@ -2434,10 +2436,43 @@ public class CraftWorld implements World { +@@ -2454,10 +2456,43 @@ public class CraftWorld implements World { // Spigot start @Override public int getViewDistance() { @@ -10082,7 +10082,7 @@ index a14b8cb98..7aed24c8f 100644 private final Spigot spigot = new Spigot() { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index cb60310e6..2666940e8 100644 +index cb60310e63..2666940e86 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -137,6 +137,13 @@ public class Main { @@ -10100,7 +10100,7 @@ index cb60310e6..2666940e8 100644 // Paper start acceptsAll(asList("server-name"), "Name of the server") diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index dfa15372b..949acb1d3 100644 +index dfa15372b8..949acb1d32 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 { @@ -10123,7 +10123,7 @@ index dfa15372b..949acb1d3 100644 public Chunk getChunk() { net.minecraft.server.Chunk currentChunk = entity.getCurrentChunk(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 60f62f19c..516a01648 100644 +index 60f62f19cb..516a016480 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 @@ @@ -10190,7 +10190,7 @@ index 60f62f19c..516a01648 100644 // Spigot start diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 6e165a164..e160f03c1 100644 +index 6e165a1649..e160f03c1e 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -4,6 +4,7 @@ import java.util.Collection; @@ -10277,7 +10277,7 @@ index 6e165a164..e160f03c1 100644 /** diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java -index 9f7d2ef93..c3ac1a46c 100644 +index 9f7d2ef932..c3ac1a46c3 100644 --- a/src/main/java/org/spigotmc/AsyncCatcher.java +++ b/src/main/java/org/spigotmc/AsyncCatcher.java @@ -10,7 +10,7 @@ public class AsyncCatcher diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch index 38943026a..4fd6a1240 100644 --- a/patches/server/0003-Purpur-config-files.patch +++ b/patches/server/0003-Purpur-config-files.patch @@ -1,4 +1,4 @@ -From 33b955d71a7fe318ade45591dad05f8f7f100069 Mon Sep 17 00:00:00 2001 +From d20b11c80a0669443b803890a1549903e33010b4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 9 May 2019 18:09:43 -0500 Subject: [PATCH] Purpur config files @@ -21,7 +21,7 @@ Subject: [PATCH] Purpur config files create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 1d7d1ffbf..d886f1d14 100644 +index 1d7d1ffbf7..d886f1d145 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -96,10 +96,12 @@ public class PaperConfig { @@ -38,7 +38,7 @@ index 1d7d1ffbf..d886f1d14 100644 static void readConfig(Class clazz, Object instance) { diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java -index 5edae85e7..76d8e55ca 100644 +index feec44f572..8867338652 100644 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java @@ -19,7 +19,7 @@ public final class TuinityConfig { @@ -51,7 +51,7 @@ index 5edae85e7..76d8e55ca 100644 public static void init(final File file) { diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index ede436939..8c7156bb5 100644 +index ede4369399..8c7156bb52 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -192,6 +192,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -71,10 +71,10 @@ index ede436939..8c7156bb5 100644 // Paper end com.tuinity.tuinity.config.TuinityConfig.init((File) options.valueOf("tuinity-settings")); // Tuinity - Server Config diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c0c83d433..ba1dab794 100644 +index 5f69a018d9..5afd548aa0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -81,6 +81,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -83,6 +83,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray public final com.tuinity.tuinity.config.TuinityConfig.WorldConnfig tuinityConfig; // Tuinity - Server Config @@ -82,7 +82,7 @@ index c0c83d433..ba1dab794 100644 public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPosition lastPhysicsProblem; // Spigot -@@ -132,6 +133,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -134,6 +135,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConnfig(worlddata.getName()); // Tuinity - Server Config @@ -92,7 +92,7 @@ index c0c83d433..ba1dab794 100644 this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/net/pl3x/purpur/Metrics.java b/src/main/java/net/pl3x/purpur/Metrics.java new file mode 100644 -index 000000000..246eb8140 +index 0000000000..246eb8140f --- /dev/null +++ b/src/main/java/net/pl3x/purpur/Metrics.java @@ -0,0 +1,598 @@ @@ -696,7 +696,7 @@ index 000000000..246eb8140 +} diff --git a/src/main/java/net/pl3x/purpur/PurpurCommand.java b/src/main/java/net/pl3x/purpur/PurpurCommand.java new file mode 100644 -index 000000000..f8cf4ad23 +index 0000000000..f8cf4ad234 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/PurpurCommand.java @@ -0,0 +1,66 @@ @@ -768,7 +768,7 @@ index 000000000..f8cf4ad23 +} diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java new file mode 100644 -index 000000000..706d78757 +index 0000000000..706d787579 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -0,0 +1,135 @@ @@ -909,7 +909,7 @@ index 000000000..706d78757 +} diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java new file mode 100644 -index 000000000..eda37fa43 +index 0000000000..eda37fa43f --- /dev/null +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -0,0 +1,67 @@ @@ -981,10 +981,10 @@ index 000000000..eda37fa43 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 23c3a69fa..0e4cea4db 100644 +index 3a0e027e67..d293bf27ac 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -797,6 +797,7 @@ public final class CraftServer implements Server { +@@ -807,6 +807,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config @@ -992,7 +992,7 @@ index 23c3a69fa..0e4cea4db 100644 for (WorldServer world : console.getWorlds()) { world.worldData.setDifficulty(config.difficulty); world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals); -@@ -814,6 +815,7 @@ public final class CraftServer implements Server { +@@ -836,6 +837,7 @@ public final class CraftServer implements Server { world.spigotConfig.init(); // Spigot world.paperConfig.init(); // Paper world.tuinityConfig.init(); // Tuinity - Server Config @@ -1000,7 +1000,7 @@ index 23c3a69fa..0e4cea4db 100644 } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -832,6 +834,7 @@ public final class CraftServer implements Server { +@@ -854,6 +856,7 @@ public final class CraftServer implements Server { reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper @@ -1008,7 +1008,7 @@ index 23c3a69fa..0e4cea4db 100644 overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*"); ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2065,6 +2068,23 @@ public final class CraftServer implements Server { +@@ -2087,6 +2090,23 @@ public final class CraftServer implements Server { return com.destroystokyo.paper.PaperConfig.config; } @@ -1033,7 +1033,7 @@ index 23c3a69fa..0e4cea4db 100644 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 2666940e8..7fc56f67f 100644 +index 2666940e86..7fc56f67fd 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -145,6 +145,14 @@ public class Main { diff --git a/patches/server/0006-Ridables.patch b/patches/server/0006-Ridables.patch index a2c16e49e..613fb4404 100644 --- a/patches/server/0006-Ridables.patch +++ b/patches/server/0006-Ridables.patch @@ -1,4 +1,4 @@ -From 8db2c188c7732d45bad5b3613d00e978cb08a634 Mon Sep 17 00:00:00 2001 +From ae0dd156cdf32c8f2221f31c81d8c5afa9389050 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Feb 2020 19:53:59 -0600 Subject: [PATCH] Ridables @@ -105,7 +105,7 @@ Subject: [PATCH] Ridables create mode 100644 src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java diff --git a/src/main/java/net/minecraft/server/ControllerLookDolphin.java b/src/main/java/net/minecraft/server/ControllerLookDolphin.java -index 1d9ba04da..2bade947e 100644 +index 1d9ba04daa..2bade947ee 100644 --- a/src/main/java/net/minecraft/server/ControllerLookDolphin.java +++ b/src/main/java/net/minecraft/server/ControllerLookDolphin.java @@ -1,6 +1,6 @@ @@ -126,7 +126,7 @@ index 1d9ba04da..2bade947e 100644 this.d = false; this.a.aK = this.a(this.a.aK, this.h() + 20.0F, this.b); diff --git a/src/main/java/net/minecraft/server/ControllerMove.java b/src/main/java/net/minecraft/server/ControllerMove.java -index a5c4cbb67..efe6afde9 100644 +index a5c4cbb67f..efe6afde9b 100644 --- a/src/main/java/net/minecraft/server/ControllerMove.java +++ b/src/main/java/net/minecraft/server/ControllerMove.java @@ -6,9 +6,9 @@ public class ControllerMove { @@ -143,7 +143,7 @@ index a5c4cbb67..efe6afde9 100644 public ControllerMove(EntityInsentient entityinsentient) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 23e91183e..d87bfc98e 100644 +index 23e91183ef..d87bfc98e7 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -78,7 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -271,7 +271,7 @@ index 23e91183e..d87bfc98e 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java -index 3d27f0964..822316a65 100644 +index 3d27f0964a..822316a65f 100644 --- a/src/main/java/net/minecraft/server/EntityAgeable.java +++ b/src/main/java/net/minecraft/server/EntityAgeable.java @@ -86,7 +86,7 @@ public abstract class EntityAgeable extends EntityCreature { @@ -284,7 +284,7 @@ index 3d27f0964..822316a65 100644 } diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java -index 34239160b..dfc2ce972 100644 +index 34239160be..dfc2ce9729 100644 --- a/src/main/java/net/minecraft/server/EntityBat.java +++ b/src/main/java/net/minecraft/server/EntityBat.java @@ -14,9 +14,44 @@ public class EntityBat extends EntityAmbient { @@ -371,7 +371,7 @@ index 34239160b..dfc2ce972 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java -index c7d79efdf..7e4aad771 100644 +index c7d79efdf6..7e4aad7716 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -36,9 +36,7 @@ public class EntityBee extends EntityAnimal implements EntityBird { @@ -552,7 +552,7 @@ index c7d79efdf..7e4aad771 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java -index da6a3fa2c..1e220131c 100644 +index da6a3fa2c8..1e220131ca 100644 --- a/src/main/java/net/minecraft/server/EntityBlaze.java +++ b/src/main/java/net/minecraft/server/EntityBlaze.java @@ -10,6 +10,7 @@ public class EntityBlaze extends EntityMonster { @@ -638,7 +638,7 @@ index da6a3fa2c..1e220131c 100644 if (this.c <= 0) { this.c = 100; diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java -index b3bdc194a..8b9222d77 100644 +index b3bdc194ab..8b9222d778 100644 --- a/src/main/java/net/minecraft/server/EntityCat.java +++ b/src/main/java/net/minecraft/server/EntityCat.java @@ -42,6 +42,23 @@ public class EntityCat extends EntityTameableAnimal { @@ -732,7 +732,7 @@ index b3bdc194a..8b9222d77 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityCaveSpider.java b/src/main/java/net/minecraft/server/EntityCaveSpider.java -index 23ced2c7b..5b86b36f6 100644 +index 23ced2c7bb..5b86b36f6a 100644 --- a/src/main/java/net/minecraft/server/EntityCaveSpider.java +++ b/src/main/java/net/minecraft/server/EntityCaveSpider.java @@ -8,6 +8,23 @@ public class EntityCaveSpider extends EntitySpider { @@ -760,7 +760,7 @@ index 23ced2c7b..5b86b36f6 100644 protected void initAttributes() { super.initAttributes(); diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java -index 65795fc89..5505b7ee9 100644 +index 65795fc896..5505b7ee94 100644 --- a/src/main/java/net/minecraft/server/EntityChicken.java +++ b/src/main/java/net/minecraft/server/EntityChicken.java @@ -17,9 +17,27 @@ public class EntityChicken extends EntityAnimal { @@ -800,7 +800,7 @@ index 65795fc89..5505b7ee9 100644 this.forceDrops = true; // CraftBukkit this.a((IMaterial) Items.EGG); diff --git a/src/main/java/net/minecraft/server/EntityCod.java b/src/main/java/net/minecraft/server/EntityCod.java -index 1e3782122..0153a821e 100644 +index 1e3782122a..0153a821ee 100644 --- a/src/main/java/net/minecraft/server/EntityCod.java +++ b/src/main/java/net/minecraft/server/EntityCod.java @@ -6,6 +6,23 @@ public class EntityCod extends EntityFishSchool { @@ -828,7 +828,7 @@ index 1e3782122..0153a821e 100644 protected ItemStack l() { return new ItemStack(Items.COD_BUCKET); diff --git a/src/main/java/net/minecraft/server/EntityComplexPart.java b/src/main/java/net/minecraft/server/EntityComplexPart.java -index a0b35c869..144e89f22 100644 +index a0b35c8699..144e89f224 100644 --- a/src/main/java/net/minecraft/server/EntityComplexPart.java +++ b/src/main/java/net/minecraft/server/EntityComplexPart.java @@ -47,4 +47,11 @@ public class EntityComplexPart extends Entity { @@ -844,7 +844,7 @@ index a0b35c869..144e89f22 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index 2c8bbf20a..723a9fa1e 100644 +index 2c8bbf20ae..723a9fa1ee 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -11,9 +11,27 @@ public class EntityCow extends EntityAnimal { @@ -876,7 +876,7 @@ index 2c8bbf20a..723a9fa1e 100644 this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D)); this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.25D, RecipeItemStack.a(Items.WHEAT), false)); diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 45dfc8104..48fd8e716 100644 +index 45dfc8104a..48fd8e716b 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -23,16 +23,35 @@ public class EntityCreeper extends EntityMonster { @@ -992,7 +992,7 @@ index 45dfc8104..48fd8e716 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java -index ce78586ea..e5c914eb1 100644 +index ce78586ea0..e5c914eb14 100644 --- a/src/main/java/net/minecraft/server/EntityDolphin.java +++ b/src/main/java/net/minecraft/server/EntityDolphin.java @@ -23,6 +23,23 @@ public class EntityDolphin extends EntityWaterAnimal { @@ -1085,7 +1085,7 @@ index ce78586ea..e5c914eb1 100644 this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D)); } diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 77885f67f..63f5969b1 100644 +index 77885f67ff..63f5969b10 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -19,6 +19,23 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { @@ -1148,7 +1148,7 @@ index 77885f67f..63f5969b1 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index bf14d33c0..1b523b0da 100644 +index bf14d33c0d..1b523b0dae 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -46,6 +46,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -1305,7 +1305,7 @@ index bf14d33c0..1b523b0da 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 212636dcb..de30ce483 100644 +index 212636dcb2..de30ce483f 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -27,9 +27,27 @@ public class EntityEnderman extends EntityMonster { @@ -1404,7 +1404,7 @@ index 212636dcb..de30ce483 100644 if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1, blockposition1)) { // CraftBukkit start - Place event diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java -index e4bd2796a..5eaf1920b 100644 +index e4bd2796a4..5eaf1920b2 100644 --- a/src/main/java/net/minecraft/server/EntityEndermite.java +++ b/src/main/java/net/minecraft/server/EntityEndermite.java @@ -12,13 +12,32 @@ public class EntityEndermite extends EntityMonster { @@ -1441,7 +1441,7 @@ index e4bd2796a..5eaf1920b 100644 this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); } diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java -index b030fe957..179a26129 100644 +index b030fe9577..179a261296 100644 --- a/src/main/java/net/minecraft/server/EntityEvoker.java +++ b/src/main/java/net/minecraft/server/EntityEvoker.java @@ -12,10 +12,28 @@ public class EntityEvoker extends EntityIllagerWizard { @@ -1506,7 +1506,7 @@ index b030fe957..179a26129 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java -index b853fd0d9..b8d786fad 100644 +index b853fd0d9b..b8d786fad5 100644 --- a/src/main/java/net/minecraft/server/EntityFish.java +++ b/src/main/java/net/minecraft/server/EntityFish.java @@ -72,9 +72,10 @@ public abstract class EntityFish extends EntityWaterAnimal { @@ -1560,7 +1560,7 @@ index b853fd0d9..b8d786fad 100644 this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D)); } diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index 82a32d5db..4f53090d3 100644 +index 82a32d5dbf..4f53090d3d 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -55,6 +55,23 @@ public class EntityFox extends EntityAnimal { @@ -1698,7 +1698,7 @@ index 82a32d5db..4f53090d3 100644 } diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java -index e1c2540d1..85e6c195f 100644 +index e1c2540d14..85e6c195f3 100644 --- a/src/main/java/net/minecraft/server/EntityGhast.java +++ b/src/main/java/net/minecraft/server/EntityGhast.java @@ -14,11 +14,47 @@ public class EntityGhast extends EntityFlying implements IMonster { @@ -1777,7 +1777,7 @@ index e1c2540d1..85e6c195f 100644 if (this.j-- <= 0) { this.j += this.i.getRandom().nextInt(5) + 2; diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java -index d9e5eaad1..ff8a41a53 100644 +index d9e5eaad12..ff8a41a539 100644 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java @@ -4,8 +4,33 @@ public class EntityGiantZombie extends EntityMonster { @@ -1815,7 +1815,7 @@ index d9e5eaad1..ff8a41a53 100644 protected float b(EntityPose entitypose, EntitySize entitysize) { return 10.440001F; diff --git a/src/main/java/net/minecraft/server/EntityGuardian.java b/src/main/java/net/minecraft/server/EntityGuardian.java -index e69cb334f..97040872b 100644 +index e69cb334fb..97040872bc 100644 --- a/src/main/java/net/minecraft/server/EntityGuardian.java +++ b/src/main/java/net/minecraft/server/EntityGuardian.java @@ -24,15 +24,39 @@ public class EntityGuardian extends EntityMonster { @@ -1916,7 +1916,7 @@ index e69cb334f..97040872b 100644 Vec3D vec3d = new Vec3D(this.b - this.i.locX(), this.c - this.i.locY(), this.d - this.i.locZ()); double d0 = vec3d.f(); diff --git a/src/main/java/net/minecraft/server/EntityGuardianElder.java b/src/main/java/net/minecraft/server/EntityGuardianElder.java -index 7484bfeea..f231340d9 100644 +index 7484bfeea0..f231340d90 100644 --- a/src/main/java/net/minecraft/server/EntityGuardianElder.java +++ b/src/main/java/net/minecraft/server/EntityGuardianElder.java @@ -16,6 +16,23 @@ public class EntityGuardianElder extends EntityGuardian { @@ -1944,7 +1944,7 @@ index 7484bfeea..f231340d9 100644 public void initAttributes() { super.initAttributes(); diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java -index a6fb4ba5b..98b1e9375 100644 +index a6fb4ba5b9..98b1e93759 100644 --- a/src/main/java/net/minecraft/server/EntityHorse.java +++ b/src/main/java/net/minecraft/server/EntityHorse.java @@ -19,6 +19,13 @@ public class EntityHorse extends EntityHorseAbstract { @@ -1962,7 +1962,7 @@ index a6fb4ba5b..98b1e9375 100644 protected void initDatawatcher() { super.initDatawatcher(); diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java -index c56efe035..e7ba83f32 100644 +index c56efe035a..e7ba83f32a 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -38,12 +38,39 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven @@ -2015,7 +2015,7 @@ index c56efe035..e7ba83f32 100644 } diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java -index 9a52decdc..64d80081f 100644 +index 9a52decdca..64d80081f7 100644 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java @@ -6,6 +6,13 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract { @@ -2033,7 +2033,7 @@ index 9a52decdc..64d80081f 100644 protected SoundEffect getSoundAmbient() { super.getSoundAmbient(); diff --git a/src/main/java/net/minecraft/server/EntityHorseMule.java b/src/main/java/net/minecraft/server/EntityHorseMule.java -index 4dd4d91eb..a9f26efe6 100644 +index 4dd4d91eba..a9f26efe66 100644 --- a/src/main/java/net/minecraft/server/EntityHorseMule.java +++ b/src/main/java/net/minecraft/server/EntityHorseMule.java @@ -6,6 +6,13 @@ public class EntityHorseMule extends EntityHorseChestedAbstract { @@ -2051,7 +2051,7 @@ index 4dd4d91eb..a9f26efe6 100644 protected SoundEffect getSoundAmbient() { super.getSoundAmbient(); diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java -index 290cb9337..7bf76e5a0 100644 +index 290cb9337c..7bf76e5a0b 100644 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java @@ -12,6 +12,18 @@ public class EntityHorseSkeleton extends EntityHorseAbstract { @@ -2092,7 +2092,7 @@ index 290cb9337..7bf76e5a0 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java -index 5782a25ec..c87fc523f 100644 +index 5782a25ecd..c87fc523f1 100644 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java @@ -8,6 +8,18 @@ public class EntityHorseZombie extends EntityHorseAbstract { @@ -2122,7 +2122,7 @@ index 5782a25ec..c87fc523f 100644 + protected void ez() { if (world.purpurConfig.zombieHorseCanSwim) goalSelector.a(0, new PathfinderGoalFloat(this)); } // Purpur } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 584166f22..de22cad76 100644 +index 584166f225..de22cad764 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -374,9 +374,21 @@ public abstract class EntityHuman extends EntityLiving { @@ -2149,7 +2149,7 @@ index 584166f22..de22cad76 100644 this.setSneaking(false); } else { diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java -index 81b7cd06f..3e6722cfc 100644 +index 81b7cd06f2..3e6722cfce 100644 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java @@ -19,10 +19,28 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan @@ -2190,7 +2190,7 @@ index 81b7cd06f..3e6722cfc 100644 this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300)); this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300)); diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 27ef47600..240bbee36 100644 +index 27ef476001..240bbee360 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -28,7 +28,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -2282,7 +2282,7 @@ index 27ef47600..240bbee36 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java -index 2f764776b..46e4574e5 100644 +index 7f6a567760..288a043fbd 100644 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java @@ -17,8 +17,26 @@ public class EntityIronGolem extends EntityGolem { @@ -2337,7 +2337,7 @@ index 2f764776b..46e4574e5 100644 float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index ad474500e..17ff8a9fc 100644 +index ad474500e2..17ff8a9fc3 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -92,9 +92,9 @@ public abstract class EntityLiving extends Entity { @@ -2401,7 +2401,7 @@ index ad474500e..17ff8a9fc 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java -index 193dbfc5f..5b87b245f 100644 +index 193dbfc5f6..5b87b245f7 100644 --- a/src/main/java/net/minecraft/server/EntityLlama.java +++ b/src/main/java/net/minecraft/server/EntityLlama.java @@ -16,7 +16,36 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn @@ -2495,7 +2495,7 @@ index 193dbfc5f..5b87b245f 100644 return i == -1 ? null : EnumColor.fromColorIndex(i); diff --git a/src/main/java/net/minecraft/server/EntityLlamaTrader.java b/src/main/java/net/minecraft/server/EntityLlamaTrader.java -index 4cebd67e8..283c1ac94 100644 +index 4cebd67e85..283c1ac946 100644 --- a/src/main/java/net/minecraft/server/EntityLlamaTrader.java +++ b/src/main/java/net/minecraft/server/EntityLlamaTrader.java @@ -11,6 +11,13 @@ public class EntityLlamaTrader extends EntityLlama { @@ -2526,7 +2526,7 @@ index 4cebd67e8..283c1ac94 100644 @Override public GroupDataEntity prepare(GeneratorAccess generatoraccess, DifficultyDamageScaler difficultydamagescaler, EnumMobSpawn enummobspawn, @Nullable GroupDataEntity groupdataentity, @Nullable NBTTagCompound nbttagcompound) { diff --git a/src/main/java/net/minecraft/server/EntityMagmaCube.java b/src/main/java/net/minecraft/server/EntityMagmaCube.java -index 1fdc248ba..a5a36af21 100644 +index 1fdc248ba8..a5a36af217 100644 --- a/src/main/java/net/minecraft/server/EntityMagmaCube.java +++ b/src/main/java/net/minecraft/server/EntityMagmaCube.java @@ -8,6 +8,23 @@ public class EntityMagmaCube extends EntitySlime { @@ -2554,7 +2554,7 @@ index 1fdc248ba..a5a36af21 100644 protected void initAttributes() { super.initAttributes(); diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java -index 3706c31aa..b20f4afd3 100644 +index 3706c31aad..b20f4afd3f 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -20,6 +20,23 @@ public class EntityMushroomCow extends EntityCow { @@ -2582,7 +2582,7 @@ index 3706c31aa..b20f4afd3 100644 public float a(BlockPosition blockposition, IWorldReader iworldreader) { return iworldreader.getType(blockposition.down()).getBlock() == Blocks.MYCELIUM ? 10.0F : iworldreader.w(blockposition) - 0.5F; diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java -index d9a7b8ac1..8fdf34857 100644 +index d9a7b8ac1e..8fdf348573 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -16,6 +16,23 @@ public class EntityOcelot extends EntityAnimal { @@ -2625,7 +2625,7 @@ index d9a7b8ac1..8fdf34857 100644 this.targetSelector.a(1, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, false, false, EntityTurtle.bw)); } diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java -index f50ed1908..87ed9a8ca 100644 +index f50ed19080..87ed9a8ca0 100644 --- a/src/main/java/net/minecraft/server/EntityPanda.java +++ b/src/main/java/net/minecraft/server/EntityPanda.java @@ -46,6 +46,23 @@ public class EntityPanda extends EntityAnimal { @@ -2771,7 +2771,7 @@ index f50ed1908..87ed9a8ca 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java -index 94e57a2d8..7ba2f3a35 100644 +index 94e57a2d85..7ba2f3a351 100644 --- a/src/main/java/net/minecraft/server/EntityParrot.java +++ b/src/main/java/net/minecraft/server/EntityParrot.java @@ -62,12 +62,83 @@ public class EntityParrot extends EntityPerchable implements EntityBird { @@ -2872,7 +2872,7 @@ index 94e57a2d8..7ba2f3a35 100644 this.goalSelector.a(2, this.goalSit); this.goalSelector.a(2, new PathfinderGoalFollowOwner(this, 1.0D, 5.0F, 1.0F, true)); diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index 90eeddb1a..c3a5e2461 100644 +index 90eeddb1af..c3a5e24617 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -22,6 +22,40 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -3028,7 +3028,7 @@ index 90eeddb1a..c3a5e2461 100644 EntityPhantom.this.yaw += 180.0F; this.j = 0.1F; diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java -index 8d277566e..e6a7f8ef3 100644 +index 8d277566e9..e6a7f8ef37 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -19,9 +19,27 @@ public class EntityPig extends EntityAnimal { @@ -3099,7 +3099,7 @@ index 8d277566e..e6a7f8ef3 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java -index 9dd028b55..fb9ef88ea 100644 +index 9dd028b558..fb9ef88ea3 100644 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java @@ -17,6 +17,23 @@ public class EntityPigZombie extends EntityZombie { @@ -3127,7 +3127,7 @@ index 9dd028b55..fb9ef88ea 100644 public void setLastDamager(@Nullable EntityLiving entityliving) { super.setLastDamager(entityliving); diff --git a/src/main/java/net/minecraft/server/EntityPillager.java b/src/main/java/net/minecraft/server/EntityPillager.java -index 0357c9da9..98a657cec 100644 +index 0357c9da93..98a657cece 100644 --- a/src/main/java/net/minecraft/server/EntityPillager.java +++ b/src/main/java/net/minecraft/server/EntityPillager.java @@ -13,15 +13,34 @@ public class EntityPillager extends EntityIllagerAbstract implements ICrossbow, @@ -3166,7 +3166,7 @@ index 0357c9da9..98a657cec 100644 this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)); diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java -index f8e29a02d..0a3906bde 100644 +index f8e29a02d3..0a3906bde0 100644 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java @@ -17,6 +17,23 @@ public class EntityPolarBear extends EntityAnimal { @@ -3258,7 +3258,7 @@ index f8e29a02d..0a3906bde 100644 public d() { diff --git a/src/main/java/net/minecraft/server/EntityPufferFish.java b/src/main/java/net/minecraft/server/EntityPufferFish.java -index 98af9a223..d0e3e251e 100644 +index 98af9a2235..d0e3e251e1 100644 --- a/src/main/java/net/minecraft/server/EntityPufferFish.java +++ b/src/main/java/net/minecraft/server/EntityPufferFish.java @@ -17,6 +17,23 @@ public class EntityPufferFish extends EntityFish { @@ -3295,7 +3295,7 @@ index 98af9a223..d0e3e251e 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java -index 2ed2d0b6b..9040ab1c5 100644 +index 2ed2d0b6bb..9040ab1c54 100644 --- a/src/main/java/net/minecraft/server/EntityRabbit.java +++ b/src/main/java/net/minecraft/server/EntityRabbit.java @@ -26,9 +26,27 @@ public class EntityRabbit extends EntityAnimal { @@ -3450,7 +3450,7 @@ index 2ed2d0b6b..9040ab1c5 100644 this.d = flag; } diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java -index fd25ce102..98d182a4c 100644 +index fd25ce1026..98d182a4ce 100644 --- a/src/main/java/net/minecraft/server/EntityRavager.java +++ b/src/main/java/net/minecraft/server/EntityRavager.java @@ -20,14 +20,33 @@ public class EntityRavager extends EntityRaider { @@ -3488,7 +3488,7 @@ index fd25ce102..98d182a4c 100644 this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); this.targetSelector.a(4, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true)); diff --git a/src/main/java/net/minecraft/server/EntitySalmon.java b/src/main/java/net/minecraft/server/EntitySalmon.java -index 6be29f307..189515b0f 100644 +index 6be29f3078..189515b0ff 100644 --- a/src/main/java/net/minecraft/server/EntitySalmon.java +++ b/src/main/java/net/minecraft/server/EntitySalmon.java @@ -6,6 +6,23 @@ public class EntitySalmon extends EntityFishSchool { @@ -3516,7 +3516,7 @@ index 6be29f307..189515b0f 100644 public int es() { return 5; diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java -index d5ffdc110..d4f2642d3 100644 +index d5ffdc110d..d4f2642d3d 100644 --- a/src/main/java/net/minecraft/server/EntitySheep.java +++ b/src/main/java/net/minecraft/server/EntitySheep.java @@ -55,10 +55,28 @@ public class EntitySheep extends EntityAnimal { @@ -3549,7 +3549,7 @@ index d5ffdc110..d4f2642d3 100644 this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D)); this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.1D, RecipeItemStack.a(Items.WHEAT), false)); diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java -index 0d2ceff6f..46379588c 100644 +index 0d2ceff6f2..46379588c1 100644 --- a/src/main/java/net/minecraft/server/EntityShulker.java +++ b/src/main/java/net/minecraft/server/EntityShulker.java @@ -32,6 +32,23 @@ public class EntityShulker extends EntityGolem implements IMonster { @@ -3599,7 +3599,7 @@ index 0d2ceff6f..46379588c 100644 @Override public boolean a() { diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java -index 08c2a22f7..dff20567b 100644 +index 08c2a22f7a..dff20567b3 100644 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java @@ -11,13 +11,32 @@ public class EntitySilverfish extends EntityMonster { @@ -3644,7 +3644,7 @@ index 08c2a22f7..dff20567b 100644 public void g() { diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java -index 0e78d5c62..8e6efeb7b 100644 +index 0e78d5c62c..8e6efeb7b7 100644 --- a/src/main/java/net/minecraft/server/EntitySkeleton.java +++ b/src/main/java/net/minecraft/server/EntitySkeleton.java @@ -6,6 +6,23 @@ public class EntitySkeleton extends EntitySkeletonAbstract { @@ -3672,7 +3672,7 @@ index 0e78d5c62..8e6efeb7b 100644 protected SoundEffect getSoundAmbient() { return SoundEffects.ENTITY_SKELETON_AMBIENT; diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java -index 3c95c0428..8bc4e8515 100644 +index 3c95c0428b..8bc4e85156 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java @@ -28,12 +28,14 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR @@ -3691,7 +3691,7 @@ index 3c95c0428..8bc4e8515 100644 this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true)); diff --git a/src/main/java/net/minecraft/server/EntitySkeletonStray.java b/src/main/java/net/minecraft/server/EntitySkeletonStray.java -index 2eb53864f..a930fb840 100644 +index 2eb53864f2..a930fb8401 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonStray.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonStray.java @@ -8,6 +8,23 @@ public class EntitySkeletonStray extends EntitySkeletonAbstract { @@ -3719,7 +3719,7 @@ index 2eb53864f..a930fb840 100644 return c(entitytypes, generatoraccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || generatoraccess.f(blockposition)); } diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java -index 98e042424..8aa0a6699 100644 +index 98e042424c..8aa0a6699f 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java @@ -9,6 +9,23 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract { @@ -3747,7 +3747,7 @@ index 98e042424..8aa0a6699 100644 protected SoundEffect getSoundAmbient() { return SoundEffects.ENTITY_WITHER_SKELETON_AMBIENT; diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index 2efc18df9..c15f7d9b2 100644 +index 2efc18df94..c15f7d9b24 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -32,12 +32,31 @@ public class EntitySlime extends EntityInsentient implements IMonster { @@ -3783,7 +3783,7 @@ index 2efc18df9..c15f7d9b2 100644 return Math.abs(entityliving.locY() - this.locY()) <= 4.0D; })); diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java -index 07ca1a498..941873513 100644 +index 07ca1a4987..941873513f 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java @@ -14,12 +14,31 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity { @@ -3845,7 +3845,7 @@ index 07ca1a498..941873513 100644 } diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java -index d02db5659..d3708a7b0 100644 +index d02db56595..d3708a7b0e 100644 --- a/src/main/java/net/minecraft/server/EntitySpider.java +++ b/src/main/java/net/minecraft/server/EntitySpider.java @@ -11,14 +11,33 @@ public class EntitySpider extends EntityMonster { @@ -3883,7 +3883,7 @@ index d02db5659..d3708a7b0 100644 this.targetSelector.a(2, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityHuman.class)); this.targetSelector.a(3, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityIronGolem.class)); diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 92efe4e7f..b967135ac 100644 +index 92efe4e7f5..b967135ac3 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -25,10 +25,28 @@ public class EntitySquid extends EntityWaterAnimal { @@ -3992,7 +3992,7 @@ index 92efe4e7f..b967135ac 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityTameableAnimal.java b/src/main/java/net/minecraft/server/EntityTameableAnimal.java -index 9b2eea71c..d55c6cb33 100644 +index 9b2eea71cc..d55c6cb339 100644 --- a/src/main/java/net/minecraft/server/EntityTameableAnimal.java +++ b/src/main/java/net/minecraft/server/EntityTameableAnimal.java @@ -135,6 +135,7 @@ public abstract class EntityTameableAnimal extends EntityAnimal { @@ -4004,7 +4004,7 @@ index 9b2eea71c..d55c6cb33 100644 return entityliving == this.getOwner(); } diff --git a/src/main/java/net/minecraft/server/EntityTropicalFish.java b/src/main/java/net/minecraft/server/EntityTropicalFish.java -index ef8f373be..992978463 100644 +index ef8f373bea..992978463d 100644 --- a/src/main/java/net/minecraft/server/EntityTropicalFish.java +++ b/src/main/java/net/minecraft/server/EntityTropicalFish.java @@ -19,6 +19,23 @@ public class EntityTropicalFish extends EntityFishSchool { @@ -4032,7 +4032,7 @@ index ef8f373be..992978463 100644 protected void initDatawatcher() { super.initDatawatcher(); diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index b24a5100b..469549206 100644 +index b24a5100b4..4695492068 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -27,6 +27,23 @@ public class EntityTurtle extends EntityAnimal { @@ -4180,7 +4180,7 @@ index b24a5100b..469549206 100644 if (this.h == ControllerMove.Operation.MOVE_TO && !this.i.getNavigation().m()) { double d0 = this.b - this.i.locX(); diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 4100e367a..a0d932c40 100644 +index 4100e367a4..a0d932c403 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -259,6 +259,12 @@ public class EntityTypes { @@ -4197,7 +4197,7 @@ index 4100e367a..a0d932c40 100644 if (this.bg == null) { this.bg = SystemUtils.a("entity", IRegistry.ENTITY_TYPE.getKey(this)); diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index cf274666c..d890f7bdf 100644 +index cf274666c7..d890f7bdfa 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -19,6 +19,50 @@ public class EntityVex extends EntityMonster { @@ -4307,7 +4307,7 @@ index cf274666c..d890f7bdf 100644 Vec3D vec3d = new Vec3D(this.b - EntityVex.this.locX(), this.c - EntityVex.this.locY(), this.d - EntityVex.this.locZ()); double d0 = vec3d.f(); diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 6e0020ae0..3eaac031f 100644 +index 6e0020ae0b..3eaac031fb 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -68,6 +68,28 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -4340,7 +4340,7 @@ index 6e0020ae0..3eaac031f 100644 public BehaviorController getBehaviorController() { return (BehaviorController) super.getBehaviorController(); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java -index 2ad8dba5c..4e9c5e84a 100644 +index 2ad8dba5c0..4e9c5e84a9 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java @@ -20,6 +20,23 @@ public class EntityVillagerTrader extends EntityVillagerAbstract { @@ -4376,7 +4376,7 @@ index 2ad8dba5c..4e9c5e84a 100644 this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityZombie.class, 8.0F, 0.5D, 0.5D)); this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityEvoker.class, 12.0F, 0.5D, 0.5D)); diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java -index c974c02e9..6ba920134 100644 +index c974c02e92..6ba920134a 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java +++ b/src/main/java/net/minecraft/server/EntityVindicator.java @@ -17,14 +17,33 @@ public class EntityVindicator extends EntityIllagerAbstract { @@ -4414,7 +4414,7 @@ index c974c02e9..6ba920134 100644 this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true)); diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 1432d3f6b..447387bd7 100644 +index 1432d3f6bf..447387bd78 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -24,6 +24,23 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -4457,7 +4457,7 @@ index 1432d3f6b..447387bd7 100644 this.targetSelector.a(2, this.bz); this.targetSelector.a(3, this.bA); diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index bace6cf36..cb83130bf 100644 +index bace6cf36a..cb83130bf9 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -18,7 +18,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity { @@ -4586,7 +4586,7 @@ index bace6cf36..cb83130bf 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java -index eec1e26b6..47f0b2df6 100644 +index eec1e26b6e..47f0b2df6c 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -30,10 +30,28 @@ public class EntityWolf extends EntityTameableAnimal { @@ -4760,7 +4760,7 @@ index eec1e26b6..47f0b2df6 100644 private final EntityWolf j; diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 8635d4f40..e9e2be88e 100644 +index 8635d4f40c..e9e2be88e3 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -44,11 +44,30 @@ public class EntityZombie extends EntityMonster { @@ -4795,7 +4795,7 @@ index 8635d4f40..e9e2be88e 100644 } diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java -index da8446d05..db252ba4e 100644 +index da8446d05d..db252ba4e0 100644 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java @@ -8,6 +8,23 @@ public class EntityZombieHusk extends EntityZombie { @@ -4823,7 +4823,7 @@ index da8446d05..db252ba4e 100644 return c(entitytypes, generatoraccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || generatoraccess.f(blockposition)); } diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java -index 8082fa617..ebbfcb75a 100644 +index 8082fa617a..ebbfcb75a4 100644 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java @@ -25,6 +25,23 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo @@ -4851,7 +4851,7 @@ index 8082fa617..ebbfcb75a 100644 protected void initDatawatcher() { super.initDatawatcher(); diff --git a/src/main/java/net/minecraft/server/FoodInfo.java b/src/main/java/net/minecraft/server/FoodInfo.java -index b35fe21a6..5b0f35c73 100644 +index b35fe21a6d..5b0f35c730 100644 --- a/src/main/java/net/minecraft/server/FoodInfo.java +++ b/src/main/java/net/minecraft/server/FoodInfo.java @@ -30,6 +30,7 @@ public class FoodInfo { @@ -4863,7 +4863,7 @@ index b35fe21a6..5b0f35c73 100644 return this.c; } diff --git a/src/main/java/net/minecraft/server/ItemDye.java b/src/main/java/net/minecraft/server/ItemDye.java -index da49f6e5a..7b5d60264 100644 +index da49f6e5ae..7b5d602649 100644 --- a/src/main/java/net/minecraft/server/ItemDye.java +++ b/src/main/java/net/minecraft/server/ItemDye.java @@ -42,6 +42,7 @@ public class ItemDye extends Item { @@ -4875,7 +4875,7 @@ index da49f6e5a..7b5d60264 100644 return this.b; } diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java -index 738c51070..2fddbb3ef 100644 +index 738c510706..2fddbb3ef1 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java @@ -28,6 +28,7 @@ public abstract class PathfinderGoal { @@ -4887,7 +4887,7 @@ index 738c51070..2fddbb3ef 100644 // Tuinity start - reduce garbage on heap this.goalTypes.clear(); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java b/src/main/java/net/minecraft/server/PathfinderGoalSwell.java -index e07c7674a..3c077b687 100644 +index e07c7674a5..3c077b6870 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalSwell.java @@ -4,8 +4,8 @@ import java.util.EnumSet; @@ -4910,7 +4910,7 @@ index e07c7674a..3c077b687 100644 this.a.a(-1); } else if (this.a.h((Entity) this.b) > 49.0D) { diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java -index 0c7f094e5..212af252b 100644 +index 0c7f094e54..212af252be 100644 --- a/src/main/java/net/minecraft/server/Vec3D.java +++ b/src/main/java/net/minecraft/server/Vec3D.java @@ -89,6 +89,7 @@ public class Vec3D implements IPosition { @@ -4922,10 +4922,10 @@ index 0c7f094e5..212af252b 100644 return new Vec3D(this.x * d0, this.y * d1, this.z * d2); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ba1dab794..47a8e1ed7 100644 +index 5afd548aa0..afd5940e77 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1597,4 +1597,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1601,4 +1601,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @Override public BiomeManager d() { return this.biomeManager; } @@ -4937,7 +4937,7 @@ index ba1dab794..47a8e1ed7 100644 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index eda37fa43..ad96353af 100644 +index eda37fa43f..ad96353afd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -64,4 +64,589 @@ public class PurpurWorldConfig { @@ -5532,7 +5532,7 @@ index eda37fa43..ad96353af 100644 } diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java new file mode 100644 -index 000000000..828e1b873 +index 0000000000..828e1b8730 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java @@ -0,0 +1,75 @@ @@ -5613,7 +5613,7 @@ index 000000000..828e1b873 +} diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java new file mode 100644 -index 000000000..0a5d6d46c +index 0000000000..0a5d6d46c2 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java @@ -0,0 +1,86 @@ @@ -5705,7 +5705,7 @@ index 000000000..0a5d6d46c +} diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java new file mode 100644 -index 000000000..349125070 +index 0000000000..3491250704 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java @@ -0,0 +1,53 @@ @@ -5764,7 +5764,7 @@ index 000000000..349125070 +} diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java new file mode 100644 -index 000000000..f75375936 +index 0000000000..f753759361 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java @@ -0,0 +1,61 @@ @@ -5831,7 +5831,7 @@ index 000000000..f75375936 +} diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java new file mode 100644 -index 000000000..e75e58067 +index 0000000000..e75e580670 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java @@ -0,0 +1,43 @@ @@ -5880,7 +5880,7 @@ index 000000000..e75e58067 +} diff --git a/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java new file mode 100644 -index 000000000..6e50344c0 +index 0000000000..6e50344c07 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java @@ -0,0 +1,21 @@ @@ -5906,7 +5906,7 @@ index 000000000..6e50344c0 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 949acb1d3..a85ad3c51 100644 +index 949acb1d32..a85ad3c512 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1069,4 +1069,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0051-Add-tick-times-API.patch b/patches/server/0051-Add-tick-times-API.patch index 052d3b6a7..1827e1ce9 100644 --- a/patches/server/0051-Add-tick-times-API.patch +++ b/patches/server/0051-Add-tick-times-API.patch @@ -1,4 +1,4 @@ -From 42536b66da5e998b17a32575fa4a188ee81902bf Mon Sep 17 00:00:00 2001 +From 21ca478f39f276054b80bcdccb4ca5d3a893f2c4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 30 Jan 2020 00:41:24 -0600 Subject: [PATCH] Add tick times API @@ -9,10 +9,10 @@ Subject: [PATCH] Add tick times API 2 files changed, 28 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0e4cea4db..26e76df12 100644 +index d293bf27ac..ca31bb7ee8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2211,4 +2211,21 @@ public final class CraftServer implements Server { +@@ -2233,4 +2233,21 @@ public final class CraftServer implements Server { return net.minecraft.server.MinecraftServer.currentTick; } // Paper end @@ -35,7 +35,7 @@ index 0e4cea4db..26e76df12 100644 + // Purpur end } diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java -index 6d21c3269..b889c32a1 100644 +index 6d21c32692..b889c32a1a 100644 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java @@ -6,6 +6,7 @@ import org.bukkit.command.CommandSender; diff --git a/patches/server/0053-Implement-lagging-threshold.patch b/patches/server/0053-Implement-lagging-threshold.patch index b3b2a37bc..ff5795140 100644 --- a/patches/server/0053-Implement-lagging-threshold.patch +++ b/patches/server/0053-Implement-lagging-threshold.patch @@ -1,4 +1,4 @@ -From 172f860ac4786be57a1d686a6e40e0c25810263f Mon Sep 17 00:00:00 2001 +From 10ce56cc3d93e77525baca1cca9803817f105a98 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 23 Jul 2019 10:07:16 -0500 Subject: [PATCH] Implement lagging threshold @@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold 3 files changed, 12 insertions(+) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f2a8af48d..625227f07 100644 +index f2a8af48df..625227f078 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -178,6 +178,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sun, 26 May 2019 15:19:14 -0500 Subject: [PATCH] Bring back server name @@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name 2 files changed, 6 insertions(+) diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java -index 0c3ec8357..309f5562b 100644 +index 0c3ec83570..309f5562b8 100644 --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java +++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java @@ -10,6 +10,7 @@ public class DedicatedServerProperties extends PropertyManager Date: Sat, 1 Feb 2020 22:22:16 -0600 Subject: [PATCH] Add moon phase API @@ -8,10 +8,10 @@ Subject: [PATCH] Add moon phase API 1 file changed, 7 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 7aed24c8f..a1df723f5 100644 +index 339ec053c7..e873d77db2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2414,6 +2414,13 @@ public class CraftWorld implements World { +@@ -2434,6 +2434,13 @@ public class CraftWorld implements World { return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList()); } diff --git a/patches/server/0070-Add-getPlacementBlockData-to-World.patch b/patches/server/0070-Add-getPlacementBlockData-to-World.patch index eab766502..ecd18f421 100644 --- a/patches/server/0070-Add-getPlacementBlockData-to-World.patch +++ b/patches/server/0070-Add-getPlacementBlockData-to-World.patch @@ -1,4 +1,4 @@ -From c9babcc04ee6caa1219d17d434dbf7a50fed5047 Mon Sep 17 00:00:00 2001 +From 53db874caac91ef3a2ccd51af5d1c0e10097aa6a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 8 Feb 2020 23:30:17 -0600 Subject: [PATCH] Add getPlacementBlockData to World @@ -12,7 +12,7 @@ Subject: [PATCH] Add getPlacementBlockData to World create mode 100644 src/main/java/net/minecraft/server/ItemSpawner.java diff --git a/src/main/java/net/minecraft/server/BlockMobSpawner.java b/src/main/java/net/minecraft/server/BlockMobSpawner.java -index 69d04f6cb..901d45f28 100644 +index 69d04f6cbf..901d45f284 100644 --- a/src/main/java/net/minecraft/server/BlockMobSpawner.java +++ b/src/main/java/net/minecraft/server/BlockMobSpawner.java @@ -57,6 +57,7 @@ public class BlockMobSpawner extends BlockTileEntity { @@ -25,7 +25,7 @@ index 69d04f6cb..901d45f28 100644 return i; diff --git a/src/main/java/net/minecraft/server/ItemSpawner.java b/src/main/java/net/minecraft/server/ItemSpawner.java new file mode 100644 -index 000000000..7dc68ffe9 +index 0000000000..7dc68ffe92 --- /dev/null +++ b/src/main/java/net/minecraft/server/ItemSpawner.java @@ -0,0 +1,23 @@ @@ -53,7 +53,7 @@ index 000000000..7dc68ffe9 + } +} diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java -index 9c9b93f28..74a722cce 100644 +index 9c9b93f280..74a722cce5 100644 --- a/src/main/java/net/minecraft/server/Items.java +++ b/src/main/java/net/minecraft/server/Items.java @@ -155,7 +155,7 @@ public class Items { @@ -66,10 +66,10 @@ index 9c9b93f28..74a722cce 100644 public static final Item bZ = a(Blocks.CHEST, CreativeModeTab.c); public static final Item ca = a(Blocks.DIAMOND_ORE, CreativeModeTab.b); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a1df723f5..5eb805837 100644 +index e873d77db2..0659bc1df0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2419,6 +2419,11 @@ public class CraftWorld implements World { +@@ -2439,6 +2439,11 @@ public class CraftWorld implements World { public net.pl3x.purpur.MoonPhase getMoonPhase() { return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L); } diff --git a/patches/server/0073-Add-5-second-tps-average-in-tps.patch b/patches/server/0073-Add-5-second-tps-average-in-tps.patch index 554532f22..ad606dd8a 100644 --- a/patches/server/0073-Add-5-second-tps-average-in-tps.patch +++ b/patches/server/0073-Add-5-second-tps-average-in-tps.patch @@ -1,4 +1,4 @@ -From b6a6c54f490db24f7f9119a72758f86b2ef44b5e Mon Sep 17 00:00:00 2001 +From b0197dd760ea6e8a241c459b0806962de265026b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 28 Jul 2019 01:27:37 -0500 Subject: [PATCH] Add 5 second tps average in /tps @@ -10,7 +10,7 @@ Subject: [PATCH] Add 5 second tps average in /tps 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 625227f07..b98efe326 100644 +index 625227f078..b98efe3268 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -177,7 +177,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant -Date: Sat, 19 Oct 2019 02:20:45 -0500 -Subject: [PATCH] Add option to allow iron golems to spawn in air - ---- - src/main/java/net/minecraft/server/EntityIronGolem.java | 2 +- - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java -index 5414d6975..91011dd0a 100644 ---- a/src/main/java/net/minecraft/server/EntityIronGolem.java -+++ b/src/main/java/net/minecraft/server/EntityIronGolem.java -@@ -241,7 +241,7 @@ public class EntityIronGolem extends EntityGolem { - BlockPosition blockposition1 = blockposition.down(); - IBlockData iblockdata = iworldreader.getType(blockposition1); - -- if (!iblockdata.a((IBlockAccess) iworldreader, blockposition1, (Entity) this)) { -+ if (!iblockdata.a((IBlockAccess) iworldreader, blockposition1, (Entity) this) && !iworldreader.getWorldProvider().getWorld().purpurConfig.ironGolemCanSpawnInAir) { // Purpur - return false; - } else { - for (int i = 1; i < 3; ++i) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9c21d196e..c594cf1f5 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -468,11 +468,13 @@ public class PurpurWorldConfig { - public boolean ironGolemRidable = false; - public boolean ironGolemRidableInWater = false; - public boolean ironGolemRequireShiftToMount = true; -+ public boolean ironGolemCanSpawnInAir = false; - public boolean ironGolemCanSwim = false; - private void ironGolemSettings() { - ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable); - ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater); - ironGolemRequireShiftToMount = getBoolean("mobs.iron_golem.require-shift-to-mount", ironGolemRequireShiftToMount); -+ ironGolemCanSpawnInAir = getBoolean("mobs.iron_golem.can-spawn-in-air", ironGolemCanSpawnInAir); - ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim); - } - --- -2.24.0 - diff --git a/patches/server/0075-Don-t-recalculate-permissions-for-players-on-world-c.patch b/patches/server/0074-Don-t-recalculate-permissions-for-players-on-world-c.patch similarity index 96% rename from patches/server/0075-Don-t-recalculate-permissions-for-players-on-world-c.patch rename to patches/server/0074-Don-t-recalculate-permissions-for-players-on-world-c.patch index b8ae307ad..4254ebea6 100644 --- a/patches/server/0075-Don-t-recalculate-permissions-for-players-on-world-c.patch +++ b/patches/server/0074-Don-t-recalculate-permissions-for-players-on-world-c.patch @@ -1,4 +1,4 @@ -From 35b2b24188eaa1bf0e5a113373275761cc95e9c9 Mon Sep 17 00:00:00 2001 +From 857037c24f8711c5c4ccfc6024b6a2326463e0b8 Mon Sep 17 00:00:00 2001 From: Tom Date: Fri, 12 Jul 2019 07:59:35 -0500 Subject: [PATCH] Don't recalculate permissions for players on world change @@ -9,7 +9,7 @@ Subject: [PATCH] Don't recalculate permissions for players on world change 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 253ee52eb..cf8f24b31 100644 +index 253ee52eb5..cf8f24b31c 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -32,13 +32,10 @@ import org.bukkit.Location; @@ -51,7 +51,7 @@ index 253ee52eb..cf8f24b31 100644 public boolean isWhitelisted(GameProfile gameprofile) { return isWhitelisted(gameprofile, null); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index b40dcbe94..17694bb5f 100644 +index b40dcbe94f..17694bb5fd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -191,6 +191,11 @@ public class PurpurConfig { diff --git a/patches/server/0076-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0075-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 90% rename from patches/server/0076-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0075-Add-playPickupItemAnimation-to-LivingEntity.patch index 75f1f72c7..1da6e66e3 100644 --- a/patches/server/0076-Add-playPickupItemAnimation-to-LivingEntity.patch +++ b/patches/server/0075-Add-playPickupItemAnimation-to-LivingEntity.patch @@ -1,4 +1,4 @@ -From 9adc0638a8e93f8f9466d2465c208d57d9c7cf97 Mon Sep 17 00:00:00 2001 +From 3be3f6986099c8072b516cc265b6b2c214435e79 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:25:16 -0500 Subject: [PATCH] Add playPickupItemAnimation to LivingEntity @@ -8,7 +8,7 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 3dd0faea7..48f66b0c1 100644 +index 3dd0faea79..48f66b0c1b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -750,5 +750,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0077-Add-more-evoker-API.patch b/patches/server/0076-Add-more-evoker-API.patch similarity index 94% rename from patches/server/0077-Add-more-evoker-API.patch rename to patches/server/0076-Add-more-evoker-API.patch index 8fc346e65..c8433efa4 100644 --- a/patches/server/0077-Add-more-evoker-API.patch +++ b/patches/server/0076-Add-more-evoker-API.patch @@ -1,4 +1,4 @@ -From 37ebc369f99093b8afb6fce38d6d4e7d635ae674 Mon Sep 17 00:00:00 2001 +From 7e4d57b8d6a58f6bd1b60e06798513b4d57d6454 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 00:29:02 -0500 Subject: [PATCH] Add more evoker API @@ -9,7 +9,7 @@ Subject: [PATCH] Add more evoker API 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java -index 179a26129..e7d0d0f5e 100644 +index 179a261296..e7d0d0f5e3 100644 --- a/src/main/java/net/minecraft/server/EntityEvoker.java +++ b/src/main/java/net/minecraft/server/EntityEvoker.java @@ -102,12 +102,14 @@ public class EntityEvoker extends EntityIllagerWizard { @@ -30,7 +30,7 @@ index 179a26129..e7d0d0f5e 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java -index 0636d2647..4ccb93890 100644 +index 0636d26473..4ccb938909 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java @@ -36,4 +36,17 @@ public class CraftEvoker extends CraftSpellcaster implements Evoker { diff --git a/patches/server/0078-Add-API-for-Villager-resetOffers.patch b/patches/server/0077-Add-API-for-Villager-resetOffers.patch similarity index 93% rename from patches/server/0078-Add-API-for-Villager-resetOffers.patch rename to patches/server/0077-Add-API-for-Villager-resetOffers.patch index fa80389b7..cb1e331a3 100644 --- a/patches/server/0078-Add-API-for-Villager-resetOffers.patch +++ b/patches/server/0077-Add-API-for-Villager-resetOffers.patch @@ -1,4 +1,4 @@ -From c721996d7f9aa700f2779533e88973a8949669a3 Mon Sep 17 00:00:00 2001 +From 2719494ad9bcfac1e42c54b2a91c7e77a4b951b3 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 7 Oct 2019 00:15:37 -0500 Subject: [PATCH] Add API for Villager#resetOffers() @@ -9,7 +9,7 @@ Subject: [PATCH] Add API for Villager#resetOffers() 2 files changed, 15 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java -index 9b75c67c7..ddd19aa2f 100644 +index 9b75c67c72..ddd19aa2f9 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java +++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java @@ -82,6 +82,13 @@ public abstract class EntityVillagerAbstract extends EntityAgeable implements NP @@ -35,7 +35,7 @@ index 9b75c67c7..ddd19aa2f 100644 protected void a(MerchantRecipeList merchantrecipelist, VillagerTrades.IMerchantRecipeOption[] avillagertrades_imerchantrecipeoption, int i) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java -index a73ebaa75..ac89ed937 100644 +index a73ebaa75f..ac89ed9377 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java @@ -112,4 +112,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager { diff --git a/patches/server/0079-Add-more-llama-API.patch b/patches/server/0078-Add-more-llama-API.patch similarity index 97% rename from patches/server/0079-Add-more-llama-API.patch rename to patches/server/0078-Add-more-llama-API.patch index 6fc8ff4f9..e7f701c52 100644 --- a/patches/server/0079-Add-more-llama-API.patch +++ b/patches/server/0078-Add-more-llama-API.patch @@ -1,4 +1,4 @@ -From 60827d47afdc407c4e63cea155a0ea0924caf9d2 Mon Sep 17 00:00:00 2001 +From f4ae60e66d19e73e00a547ad9be607f52b53e249 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 18 Oct 2019 22:50:12 -0500 Subject: [PATCH] Add more llama API @@ -10,7 +10,7 @@ Subject: [PATCH] Add more llama API 3 files changed, 61 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java -index 5b87b245f..00334993f 100644 +index 5b87b245f7..00334993fe 100644 --- a/src/main/java/net/minecraft/server/EntityLlama.java +++ b/src/main/java/net/minecraft/server/EntityLlama.java @@ -12,7 +12,8 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn @@ -80,7 +80,7 @@ index 5b87b245f..00334993f 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java -index e181d8350..8376f1dc4 100644 +index e181d83505..8376f1dc4e 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java @@ -6,7 +6,7 @@ import java.util.List; @@ -109,7 +109,7 @@ index e181d8350..8376f1dc4 100644 double d0 = this.a.h((Entity) this.a.fe()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java -index 3f94c5a92..a02763480 100644 +index 3f94c5a920..a027634801 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java @@ -65,4 +65,48 @@ public class CraftLlama extends CraftChestedHorse implements Llama, CraftRangedE diff --git a/patches/server/0080-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch b/patches/server/0079-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch similarity index 93% rename from patches/server/0080-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch rename to patches/server/0079-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch index 1ebfbe3a9..efe14c037 100644 --- a/patches/server/0080-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch +++ b/patches/server/0079-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch @@ -1,4 +1,4 @@ -From 7c6d9c39c30bf2c05dc2070ee5472a7f288e8a89 Mon Sep 17 00:00:00 2001 +From 08416d8457acfd21b745a18548f1b25f9aeb122e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 03:36:52 -0500 Subject: [PATCH] Fix furnace cook speed multiplier using values between 0 and @@ -9,7 +9,7 @@ Subject: [PATCH] Fix furnace cook speed multiplier using values between 0 and 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index d5432bfeb..91ef7ac60 100644 +index d5432bfeb7..91ef7ac60f 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -291,8 +291,10 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I diff --git a/patches/server/0081-Implement-infinite-lava.patch b/patches/server/0080-Implement-infinite-lava.patch similarity index 94% rename from patches/server/0081-Implement-infinite-lava.patch rename to patches/server/0080-Implement-infinite-lava.patch index 48057ab6a..b98f59f0d 100644 --- a/patches/server/0081-Implement-infinite-lava.patch +++ b/patches/server/0080-Implement-infinite-lava.patch @@ -1,4 +1,4 @@ -From 90016743c9af9cdabf561a1f47fb533d6b889bd0 Mon Sep 17 00:00:00 2001 +From e796bf0126ceb5a4e27a7602e091f35e65fdd248 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 23 Nov 2019 17:55:42 -0600 Subject: [PATCH] Implement infinite lava @@ -11,7 +11,7 @@ Subject: [PATCH] Implement infinite lava 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java -index 376dca188..1a14fe4a2 100644 +index 376dca1889..1a14fe4a24 100644 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java @@ -219,7 +219,7 @@ public abstract class FluidTypeFlowing extends FluidType { @@ -39,7 +39,7 @@ index 376dca188..1a14fe4a2 100644 protected void a(GeneratorAccess generatoraccess, BlockPosition blockposition, IBlockData iblockdata, EnumDirection enumdirection, Fluid fluid) { diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java -index d25368d03..09f82c2d9 100644 +index d25368d032..09f82c2d92 100644 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java @@ -147,6 +147,13 @@ public abstract class FluidTypeLava extends FluidTypeFlowing { @@ -57,7 +57,7 @@ index d25368d03..09f82c2d9 100644 protected boolean f() { return false; diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java -index 9eba9a12c..39252e687 100644 +index 9eba9a12c0..39252e6873 100644 --- a/src/main/java/net/minecraft/server/WorldProvider.java +++ b/src/main/java/net/minecraft/server/WorldProvider.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; @@ -70,7 +70,7 @@ index 9eba9a12c..39252e687 100644 protected boolean c; protected boolean d; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c594cf1f5..7f8905faf 100644 +index 9c21d196ea..d9600f365c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -127,6 +127,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0082-Expose-getItemStack-for-Trident.patch b/patches/server/0081-Expose-getItemStack-for-Trident.patch similarity index 91% rename from patches/server/0082-Expose-getItemStack-for-Trident.patch rename to patches/server/0081-Expose-getItemStack-for-Trident.patch index 16500eb37..862029894 100644 --- a/patches/server/0082-Expose-getItemStack-for-Trident.patch +++ b/patches/server/0081-Expose-getItemStack-for-Trident.patch @@ -1,4 +1,4 @@ -From 12117c208b9ec2c41ac6d51f00e5d74bd2ad94a8 Mon Sep 17 00:00:00 2001 +From 780c4da4eae4e50128e257113a390d96ab988b8c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 18 Oct 2019 22:19:40 -0500 Subject: [PATCH] Expose getItemStack for Trident @@ -9,7 +9,7 @@ Subject: [PATCH] Expose getItemStack for Trident 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java -index 59bb039ad..ed8e26aa4 100644 +index 59bb039ad7..ed8e26aa45 100644 --- a/src/main/java/net/minecraft/server/EntityThrownTrident.java +++ b/src/main/java/net/minecraft/server/EntityThrownTrident.java @@ -77,7 +77,7 @@ public class EntityThrownTrident extends EntityArrow { @@ -22,7 +22,7 @@ index 59bb039ad..ed8e26aa4 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java -index 0518e6c68..63287a9b6 100644 +index 0518e6c683..63287a9b65 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java @@ -25,4 +25,11 @@ public class CraftTrident extends CraftArrow implements Trident { diff --git a/patches/server/0083-Despawn-egg-hatches-chicken.patch b/patches/server/0082-Despawn-egg-hatches-chicken.patch similarity index 95% rename from patches/server/0083-Despawn-egg-hatches-chicken.patch rename to patches/server/0082-Despawn-egg-hatches-chicken.patch index ff33284b1..18c2a23d4 100644 --- a/patches/server/0083-Despawn-egg-hatches-chicken.patch +++ b/patches/server/0082-Despawn-egg-hatches-chicken.patch @@ -1,4 +1,4 @@ -From 11441313eb4f959a518c7988f3a88f7daba2ad2a Mon Sep 17 00:00:00 2001 +From d695af8c37a8a2c5f1cd321896b15ba7b780c5e2 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 29 Nov 2019 23:47:42 -0600 Subject: [PATCH] Despawn egg hatches chicken @@ -9,7 +9,7 @@ Subject: [PATCH] Despawn egg hatches chicken 2 files changed, 25 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 2926fbb95..bbb9ca1ef 100644 +index 2926fbb957..bbb9ca1efc 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -165,6 +165,27 @@ public class EntityItem extends Entity { @@ -41,7 +41,7 @@ index 2926fbb95..bbb9ca1ef 100644 Vec3D vec3d = this.getMot(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7f8905faf..0b8b2a4e9 100644 +index d9600f365c..87ee78d69d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -275,11 +275,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0084-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0083-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 92% rename from patches/server/0084-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0083-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index 80cf2f930..25f53ca27 100644 --- a/patches/server/0084-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0083-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -1,4 +1,4 @@ -From 5bac7b4414881bb1c46b820ca3d0c339de8bc185 Mon Sep 17 00:00:00 2001 +From 5255ed612a83158e5ded0a1ae8e247ee368c41be Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 01:42:50 -0500 Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases @@ -9,10 +9,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 47a8e1ed7..cda91df40 100644 +index afd5940e77..61a96669e9 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1403,8 +1403,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1407,8 +1407,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return blockposition; } @@ -25,7 +25,7 @@ index 47a8e1ed7..cda91df40 100644 public boolean a(EntityHuman entityhuman, BlockPosition blockposition) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 5eb805837..836324a37 100644 +index 0659bc1df0..561931f639 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -376,12 +376,16 @@ public class CraftWorld implements World { diff --git a/patches/server/0085-Add-sleep-options.patch b/patches/server/0084-Add-sleep-options.patch similarity index 96% rename from patches/server/0085-Add-sleep-options.patch rename to patches/server/0084-Add-sleep-options.patch index 2ad7a237c..974fe75b7 100644 --- a/patches/server/0085-Add-sleep-options.patch +++ b/patches/server/0084-Add-sleep-options.patch @@ -1,4 +1,4 @@ -From 1ce8e618932c3becd040859c128a23d86eb73124 Mon Sep 17 00:00:00 2001 +From dc730f7690c0c7ebe5d0fdb97a95a0a23dd04efe Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 30 Nov 2019 03:30:17 -0600 Subject: [PATCH] Add sleep options @@ -9,7 +9,7 @@ Subject: [PATCH] Add sleep options 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 9d26bd1e4..36582a80a 100644 +index 9d26bd1e4c..36582a80af 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -143,6 +143,21 @@ public abstract class EntityHuman extends EntityLiving { @@ -53,7 +53,7 @@ index 9d26bd1e4..36582a80a 100644 return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_NOW); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0b8b2a4e9..ae402ff52 100644 +index 87ee78d69d..c023133201 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -159,6 +159,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0086-Option-for-hay-block-fall-damage.patch b/patches/server/0085-Option-for-hay-block-fall-damage.patch similarity index 91% rename from patches/server/0086-Option-for-hay-block-fall-damage.patch rename to patches/server/0085-Option-for-hay-block-fall-damage.patch index 6fe70e963..a35c92601 100644 --- a/patches/server/0086-Option-for-hay-block-fall-damage.patch +++ b/patches/server/0085-Option-for-hay-block-fall-damage.patch @@ -1,4 +1,4 @@ -From d4f7108c9a78737c07805a4e89b949e4aaf3b21e Mon Sep 17 00:00:00 2001 +From 25de0e003f7b44527cbe13241ac8cf854f4890a0 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 30 Nov 2019 01:31:09 -0600 Subject: [PATCH] Option for hay block fall damage @@ -9,7 +9,7 @@ Subject: [PATCH] Option for hay block fall damage 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/BlockHay.java b/src/main/java/net/minecraft/server/BlockHay.java -index ca81c49f0..1f8f60542 100644 +index ca81c49f0a..1f8f60542f 100644 --- a/src/main/java/net/minecraft/server/BlockHay.java +++ b/src/main/java/net/minecraft/server/BlockHay.java @@ -9,6 +9,6 @@ public class BlockHay extends BlockRotatable { @@ -21,7 +21,7 @@ index ca81c49f0..1f8f60542 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ae402ff52..98dc35fc8 100644 +index c023133201..95e8ac934a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -127,6 +127,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0087-Add-getPlayer-to-SkeletonHorseTrapEvent.patch b/patches/server/0086-Add-getPlayer-to-SkeletonHorseTrapEvent.patch similarity index 95% rename from patches/server/0087-Add-getPlayer-to-SkeletonHorseTrapEvent.patch rename to patches/server/0086-Add-getPlayer-to-SkeletonHorseTrapEvent.patch index 54a7551e8..d27480cd9 100644 --- a/patches/server/0087-Add-getPlayer-to-SkeletonHorseTrapEvent.patch +++ b/patches/server/0086-Add-getPlayer-to-SkeletonHorseTrapEvent.patch @@ -1,4 +1,4 @@ -From a680a42a47a4eadb9abef776a61d66cc946a0037 Mon Sep 17 00:00:00 2001 +From 9e7bbf1eb4685ed52d24556905c817b4c634b29b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:35:35 -0500 Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent @@ -8,7 +8,7 @@ Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java -index 37626f925..f8fd2d99c 100644 +index 37626f925f..f8fd2d99cc 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java @@ -2,7 +2,8 @@ package net.minecraft.server; diff --git a/patches/server/0088-Add-LootableInventoryFirstFillEvent.patch b/patches/server/0087-Add-LootableInventoryFirstFillEvent.patch similarity index 94% rename from patches/server/0088-Add-LootableInventoryFirstFillEvent.patch rename to patches/server/0087-Add-LootableInventoryFirstFillEvent.patch index a6f08759c..60abde0a4 100644 --- a/patches/server/0088-Add-LootableInventoryFirstFillEvent.patch +++ b/patches/server/0087-Add-LootableInventoryFirstFillEvent.patch @@ -1,4 +1,4 @@ -From f315a2722004716a90ae3e269ee1814d858d49ac Mon Sep 17 00:00:00 2001 +From 70571eb842467eb0ab7961b91229f3007fd1d34a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:43:17 -0500 Subject: [PATCH] Add LootableInventoryFirstFillEvent @@ -9,7 +9,7 @@ Subject: [PATCH] Add LootableInventoryFirstFillEvent 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java -index b5401eaf9..1decf0e89 100644 +index b5401eaf97..1decf0e895 100644 --- a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java @@ -49,6 +49,10 @@ public class PaperLootableInventoryData { @@ -24,7 +24,7 @@ index b5401eaf9..1decf0e89 100644 } diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java -index d50410532..2f24e5a70 100644 +index d50410532c..2f24e5a702 100644 --- a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java @@ -57,7 +57,10 @@ public class PaperTileEntityLootableInventory implements PaperLootableBlockInven diff --git a/patches/server/0089-Villagers-follow-emerald-blocks.patch b/patches/server/0088-Villagers-follow-emerald-blocks.patch similarity index 94% rename from patches/server/0089-Villagers-follow-emerald-blocks.patch rename to patches/server/0088-Villagers-follow-emerald-blocks.patch index 7f58d5ce3..63f59654e 100644 --- a/patches/server/0089-Villagers-follow-emerald-blocks.patch +++ b/patches/server/0088-Villagers-follow-emerald-blocks.patch @@ -1,4 +1,4 @@ -From 4cdbeb69f1ddf8a47a788e96fcc3d11a86c4bf08 Mon Sep 17 00:00:00 2001 +From 7f5f1e295203beddb183eb510c258a3285368786 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 29 Nov 2019 22:10:12 -0600 Subject: [PATCH] Villagers follow emerald blocks @@ -11,7 +11,7 @@ Subject: [PATCH] Villagers follow emerald blocks 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 65cd5f53c..b31f614e6 100644 +index 65cd5f53c1..b31f614e6b 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -89,6 +89,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -23,7 +23,7 @@ index 65cd5f53c..b31f614e6 100644 // Purpur end diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java -index ddd19aa2f..44947be83 100644 +index ddd19aa2f9..44947be833 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java +++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java @@ -13,7 +13,7 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent; @@ -36,7 +36,7 @@ index ddd19aa2f..44947be83 100644 private CraftMerchant craftMerchant; diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java -index 4e9c5e84a..14ca5fc36 100644 +index 4e9c5e84a9..14ca5fc367 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java @@ -57,6 +57,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract { @@ -48,10 +48,10 @@ index 4e9c5e84a..14ca5fc36 100644 this.goalSelector.a(8, new PathfinderGoalRandomStrollLand(this, 0.35D)); this.goalSelector.a(9, new PathfinderGoalInteract(this, EntityHuman.class, 3.0F, 1.0F)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 98dc35fc8..2dfbae959 100644 +index 95e8ac934a..02626283b3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -776,21 +776,25 @@ public class PurpurWorldConfig { +@@ -774,21 +774,25 @@ public class PurpurWorldConfig { public boolean villagerRequireShiftToMount = true; public int villagerBrainTicks = 1; public boolean villagerUseBrainTicksOnlyWhenLagging = true; diff --git a/patches/server/0090-Add-player-death-exp-control-options.patch b/patches/server/0089-Add-player-death-exp-control-options.patch similarity index 96% rename from patches/server/0090-Add-player-death-exp-control-options.patch rename to patches/server/0089-Add-player-death-exp-control-options.patch index d29d24433..5838c7b18 100644 --- a/patches/server/0090-Add-player-death-exp-control-options.patch +++ b/patches/server/0089-Add-player-death-exp-control-options.patch @@ -1,4 +1,4 @@ -From b6323fd72ac5f115e111a57e0cb5ac9344d751d3 Mon Sep 17 00:00:00 2001 +From a0a239fdc10a05d943ae1ecad8ff4fe25a2fa720 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Dec 2019 22:08:37 -0600 Subject: [PATCH] Add player death exp control options @@ -9,7 +9,7 @@ Subject: [PATCH] Add player death exp control options 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 36582a80a..d7e00b06b 100644 +index 36582a80af..d7e00b06b8 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1862,9 +1862,18 @@ public abstract class EntityHuman extends EntityLiving { @@ -35,7 +35,7 @@ index 36582a80a..d7e00b06b 100644 return 0; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2dfbae959..a229c1a2e 100644 +index 02626283b3..ff8c60000d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -164,6 +164,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0091-Add-permission-for-F3-N-debug.patch b/patches/server/0090-Add-permission-for-F3-N-debug.patch similarity index 89% rename from patches/server/0091-Add-permission-for-F3-N-debug.patch rename to patches/server/0090-Add-permission-for-F3-N-debug.patch index af701706e..0d109deef 100644 --- a/patches/server/0091-Add-permission-for-F3-N-debug.patch +++ b/patches/server/0090-Add-permission-for-F3-N-debug.patch @@ -1,4 +1,4 @@ -From 751e0f52ac4348f126a627dd8434da5c9467458a Mon Sep 17 00:00:00 2001 +From 69f480c734b5fc19bf32140a91d783fd429624a8 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 28 Dec 2019 04:21:54 -0600 Subject: [PATCH] Add permission for F3+N debug @@ -8,7 +8,7 @@ Subject: [PATCH] Add permission for F3+N debug 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index cf8f24b31..e770fd6e4 100644 +index cf8f24b31c..e770fd6e46 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -902,6 +902,7 @@ public abstract class PlayerList { diff --git a/patches/server/0092-Allow-leashing-villagers.patch b/patches/server/0091-Allow-leashing-villagers.patch similarity index 94% rename from patches/server/0092-Allow-leashing-villagers.patch rename to patches/server/0091-Allow-leashing-villagers.patch index b57c19352..ae8e63d66 100644 --- a/patches/server/0092-Allow-leashing-villagers.patch +++ b/patches/server/0091-Allow-leashing-villagers.patch @@ -1,4 +1,4 @@ -From 80e462d15868475827d4031ad2ebf3003f249633 Mon Sep 17 00:00:00 2001 +From 60d6a8ae40c740a631a4986b593dfbeced56e170 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 3 Oct 2019 18:08:03 -0500 Subject: [PATCH] Allow leashing villagers @@ -11,7 +11,7 @@ Subject: [PATCH] Allow leashing villagers 4 files changed, 19 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 742745cb4..22fa51cba 100644 +index 742745cb47..22fa51cbaa 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1069,6 +1069,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -23,7 +23,7 @@ index 742745cb4..22fa51cba 100644 if (CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman).isCancelled()) { ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(this, this.getLeashHolder())); diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index b31f614e6..315440b3f 100644 +index b31f614e6b..315440b3fb 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -1006,4 +1006,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -39,7 +39,7 @@ index b31f614e6..315440b3f 100644 + // Purpur - end } diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java -index 14ca5fc36..427c58907 100644 +index 14ca5fc367..427c589075 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java @@ -283,4 +283,11 @@ public class EntityVillagerTrader extends EntityVillagerAbstract { @@ -55,10 +55,10 @@ index 14ca5fc36..427c58907 100644 + // Purpur - end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a229c1a2e..dd281fb64 100644 +index ff8c60000d..0e57d7bd11 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -781,6 +781,7 @@ public class PurpurWorldConfig { +@@ -779,6 +779,7 @@ public class PurpurWorldConfig { public int villagerBrainTicks = 1; public boolean villagerUseBrainTicksOnlyWhenLagging = true; public boolean villagerFollowEmeraldBlock = false; @@ -66,7 +66,7 @@ index a229c1a2e..dd281fb64 100644 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -788,17 +789,20 @@ public class PurpurWorldConfig { +@@ -786,17 +787,20 @@ public class PurpurWorldConfig { villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks); villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging); villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock); diff --git a/patches/server/0093-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0092-Implement-configurable-search-radius-for-villagers-t.patch similarity index 91% rename from patches/server/0093-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0092-Implement-configurable-search-radius-for-villagers-t.patch index c2fe1a4c6..f57fc563d 100644 --- a/patches/server/0093-Implement-configurable-search-radius-for-villagers-t.patch +++ b/patches/server/0092-Implement-configurable-search-radius-for-villagers-t.patch @@ -1,4 +1,4 @@ -From bf7a6d722114c91a824c26745140476f73ffefe7 Mon Sep 17 00:00:00 2001 +From ed5b14cf74fa47636a00fbf8ffafacb768554fe3 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 22 Jul 2019 17:32:17 -0500 Subject: [PATCH] Implement configurable search radius for villagers to spawn @@ -10,7 +10,7 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn 2 files changed, 5 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 315440b3f..fe0e646ea 100644 +index 315440b3fb..fe0e646ea6 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -903,6 +903,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -22,10 +22,10 @@ index 315440b3f..fe0e646ea 100644 int i = 0; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index dd281fb64..39db32950 100644 +index 0e57d7bd11..e481e9639f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -782,6 +782,8 @@ public class PurpurWorldConfig { +@@ -780,6 +780,8 @@ public class PurpurWorldConfig { public boolean villagerUseBrainTicksOnlyWhenLagging = true; public boolean villagerFollowEmeraldBlock = false; public boolean villagerCanBeLeashed = false; @@ -34,7 +34,7 @@ index dd281fb64..39db32950 100644 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -790,6 +792,8 @@ public class PurpurWorldConfig { +@@ -788,6 +790,8 @@ public class PurpurWorldConfig { villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging); villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock); villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed); diff --git a/patches/server/0094-Add-option-for-zombie-villager-transformation-chance.patch b/patches/server/0093-Add-option-for-zombie-villager-transformation-chance.patch similarity index 93% rename from patches/server/0094-Add-option-for-zombie-villager-transformation-chance.patch rename to patches/server/0093-Add-option-for-zombie-villager-transformation-chance.patch index ab238518a..b8afa06ba 100644 --- a/patches/server/0094-Add-option-for-zombie-villager-transformation-chance.patch +++ b/patches/server/0093-Add-option-for-zombie-villager-transformation-chance.patch @@ -1,4 +1,4 @@ -From b6568489240e7e223b2bb7a44f77d014f7e0c0d2 Mon Sep 17 00:00:00 2001 +From 2673bb9948e9316b6ac9a44879ed0b0dafddc772 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 19 Dec 2019 16:59:46 -0600 Subject: [PATCH] Add option for zombie villager transformation chance @@ -9,7 +9,7 @@ Subject: [PATCH] Add option for zombie villager transformation chance 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 1e60cc399..8938dc50f 100644 +index 1e60cc399b..8938dc50fe 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -474,10 +474,17 @@ public class EntityZombie extends EntityMonster { @@ -33,10 +33,10 @@ index 1e60cc399..8938dc50f 100644 EntityVillager entityvillager = (EntityVillager) entityliving; EntityZombieVillager entityzombievillager = (EntityZombieVillager) EntityTypes.ZOMBIE_VILLAGER.a(this.world); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 39db32950..e8608a39c 100644 +index e481e9639f..a9ec9d7b53 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -860,11 +860,13 @@ public class PurpurWorldConfig { +@@ -858,11 +858,13 @@ public class PurpurWorldConfig { public boolean zombieRidableInWater = false; public boolean zombieRequireShiftToMount = true; public boolean zombieTargetTurtleEggs = true; diff --git a/patches/server/0095-Make-lava-flow-speed-configurable.patch b/patches/server/0094-Make-lava-flow-speed-configurable.patch similarity index 93% rename from patches/server/0095-Make-lava-flow-speed-configurable.patch rename to patches/server/0094-Make-lava-flow-speed-configurable.patch index 85487d50a..2c17b5644 100644 --- a/patches/server/0095-Make-lava-flow-speed-configurable.patch +++ b/patches/server/0094-Make-lava-flow-speed-configurable.patch @@ -1,4 +1,4 @@ -From 6dfcd7a525e95d9be587f5015c40e8d33eb65bc4 Mon Sep 17 00:00:00 2001 +From 6a6f1a08b487f7c5254b43d0adcefab0ed8b9384 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 11:31:36 -0600 Subject: [PATCH] Make lava flow speed configurable @@ -10,7 +10,7 @@ Subject: [PATCH] Make lava flow speed configurable 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java -index 09f82c2d9..470e9bfd0 100644 +index 09f82c2d92..470e9bfd01 100644 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java @@ -129,7 +129,7 @@ public abstract class FluidTypeLava extends FluidTypeFlowing { @@ -23,7 +23,7 @@ index 09f82c2d9..470e9bfd0 100644 @Override diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java -index 39252e687..75f8441ab 100644 +index 39252e6873..75f8441ab6 100644 --- a/src/main/java/net/minecraft/server/WorldProvider.java +++ b/src/main/java/net/minecraft/server/WorldProvider.java @@ -42,6 +42,7 @@ public abstract class WorldProvider { @@ -35,7 +35,7 @@ index 39252e687..75f8441ab 100644 return this.d; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e8608a39c..a74acfbca 100644 +index a9ec9d7b53..1ccb973d1d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -133,8 +133,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0096-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0095-Add-wither-skeleton-takes-wither-damage-option.patch similarity index 91% rename from patches/server/0096-Add-wither-skeleton-takes-wither-damage-option.patch rename to patches/server/0095-Add-wither-skeleton-takes-wither-damage-option.patch index 0249ba967..4a40addef 100644 --- a/patches/server/0096-Add-wither-skeleton-takes-wither-damage-option.patch +++ b/patches/server/0095-Add-wither-skeleton-takes-wither-damage-option.patch @@ -1,4 +1,4 @@ -From 1959e9a893248dcf0ab0c5cc0e610dffe7d5376e Mon Sep 17 00:00:00 2001 +From 83d28c0aa09a48a505dc014d0ace88e160cfc38b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 14 Jan 2020 19:43:40 -0600 Subject: [PATCH] Add wither skeleton takes wither damage option @@ -9,7 +9,7 @@ Subject: [PATCH] Add wither skeleton takes wither damage option 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java -index 8aa0a6699..0fd740e71 100644 +index 8aa0a6699f..0fd740e717 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java @@ -108,6 +108,6 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract { @@ -21,10 +21,10 @@ index 8aa0a6699..0fd740e71 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a74acfbca..dde0a9431 100644 +index 1ccb973d1d..66c2ba43b2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -845,10 +845,12 @@ public class PurpurWorldConfig { +@@ -843,10 +843,12 @@ public class PurpurWorldConfig { public boolean witherSkeletonRidable = false; public boolean witherSkeletonRidableInWater = false; public boolean witherSkeletonRequireShiftToMount = true; diff --git a/patches/server/0097-UPnP-Port-Forwarding-Service.patch b/patches/server/0096-UPnP-Port-Forwarding-Service.patch similarity index 96% rename from patches/server/0097-UPnP-Port-Forwarding-Service.patch rename to patches/server/0096-UPnP-Port-Forwarding-Service.patch index 8bd8f5433..a079062aa 100644 --- a/patches/server/0097-UPnP-Port-Forwarding-Service.patch +++ b/patches/server/0096-UPnP-Port-Forwarding-Service.patch @@ -1,4 +1,4 @@ -From 870451c27735d64f846c2a62c6c78e6735cd0f30 Mon Sep 17 00:00:00 2001 +From 68cbef2dfe772d700b94d9a60e70b38fe91b2c96 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 22 Jan 2020 20:13:40 -0600 Subject: [PATCH] UPnP Port Forwarding Service @@ -14,7 +14,7 @@ Subject: [PATCH] UPnP Port Forwarding Service create mode 100644 src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java diff --git a/pom.xml b/pom.xml -index ffac75de2..a4c2765aa 100644 +index ffac75de25..a4c2765aa6 100644 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,12 @@ @@ -42,7 +42,7 @@ index ffac75de2..a4c2765aa 100644 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 5337c0be0..757f892e8 100644 +index 5337c0be08..757f892e8f 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -239,6 +239,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -78,7 +78,7 @@ index 5337c0be0..757f892e8 100644 // this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up server.loadPlugins(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b98efe326..9af75a8ae 100644 +index b98efe3268..9af75a8ae8 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -181,6 +181,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Tue, 11 Feb 2020 21:56:48 -0600 Subject: [PATCH] Implement EntityMoveEvent @@ -8,7 +8,7 @@ Subject: [PATCH] Implement EntityMoveEvent 1 file changed, 15 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 60e2b4268..e3dc406da 100644 +index 60e2b4268c..e3dc406da5 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -17,6 +17,7 @@ import java.util.Random; diff --git a/patches/server/0099-Add-option-to-disable-saving-projectiles-to-disk.patch b/patches/server/0098-Add-option-to-disable-saving-projectiles-to-disk.patch similarity index 96% rename from patches/server/0099-Add-option-to-disable-saving-projectiles-to-disk.patch rename to patches/server/0098-Add-option-to-disable-saving-projectiles-to-disk.patch index 3da24d8f3..a6a911d43 100644 --- a/patches/server/0099-Add-option-to-disable-saving-projectiles-to-disk.patch +++ b/patches/server/0098-Add-option-to-disable-saving-projectiles-to-disk.patch @@ -1,4 +1,4 @@ -From a93589339238a1fe52ec303429291d8bfa1f92e4 Mon Sep 17 00:00:00 2001 +From 969d6a5bf207a7b4d842d7958bd65f392176d7ef Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 18 Feb 2020 20:07:08 -0600 Subject: [PATCH] Add option to disable saving projectiles to disk @@ -9,7 +9,7 @@ Subject: [PATCH] Add option to disable saving projectiles to disk 2 files changed, 17 insertions(+) diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index d529b795c..c6ea18ad7 100644 +index d529b795c5..c6ea18ad75 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -445,6 +445,7 @@ public class ChunkRegionLoader { @@ -21,7 +21,7 @@ index d529b795c..c6ea18ad7 100644 // Paper start if ((int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index dde0a9431..f856758a0 100644 +index 66c2ba43b2..f0f9780959 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -173,6 +173,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0100-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch b/patches/server/0099-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch similarity index 95% rename from patches/server/0100-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch rename to patches/server/0099-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch index b19b9c7aa..6a6e5469b 100644 --- a/patches/server/0100-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch +++ b/patches/server/0099-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch @@ -1,4 +1,4 @@ -From 14607b077ba334ef76fe9075cc6eadd30e74efdc Mon Sep 17 00:00:00 2001 +From 016b758382243e58414fd58453b2828c97e90c6a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 21 Feb 2020 17:04:51 -0600 Subject: [PATCH] Always increment arrow despawn counter (fixes MC-125757) @@ -8,7 +8,7 @@ Subject: [PATCH] Always increment arrow despawn counter (fixes MC-125757) 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 9c97edf9c..2dae2c1c8 100644 +index 9c97edf9c9..2dae2c1c89 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -147,6 +147,8 @@ public abstract class EntityArrow extends Entity implements IProjectile { diff --git a/patches/server/0101-Implement-bed-explosion-options.patch b/patches/server/0100-Implement-bed-explosion-options.patch similarity index 96% rename from patches/server/0101-Implement-bed-explosion-options.patch rename to patches/server/0100-Implement-bed-explosion-options.patch index 22fe48882..b9564265d 100644 --- a/patches/server/0101-Implement-bed-explosion-options.patch +++ b/patches/server/0100-Implement-bed-explosion-options.patch @@ -1,4 +1,4 @@ -From f63a8e8488b2fc9ce4f7e053acc7dfea01878c82 Mon Sep 17 00:00:00 2001 +From 7fcafb7204812206f4c94c5adc7b59cfba24114c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 22 Feb 2020 15:04:29 -0600 Subject: [PATCH] Implement bed explosion options @@ -9,7 +9,7 @@ Subject: [PATCH] Implement bed explosion options 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java -index 06a35629a..df41a7dfc 100644 +index 06a35629ab..df41a7dfcd 100644 --- a/src/main/java/net/minecraft/server/BlockBed.java +++ b/src/main/java/net/minecraft/server/BlockBed.java @@ -84,7 +84,7 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity { @@ -22,7 +22,7 @@ index 06a35629a..df41a7dfc 100644 // CraftBukkit end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f856758a0..4d32706fa 100644 +index f0f9780959..52c65af2c7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -3,6 +3,7 @@ package net.pl3x.purpur; diff --git a/patches/server/0102-Add-item-entity-options.patch b/patches/server/0101-Add-item-entity-options.patch similarity index 97% rename from patches/server/0102-Add-item-entity-options.patch rename to patches/server/0101-Add-item-entity-options.patch index 00182bbd7..0a68cc6fa 100644 --- a/patches/server/0102-Add-item-entity-options.patch +++ b/patches/server/0101-Add-item-entity-options.patch @@ -1,4 +1,4 @@ -From c533b0e8405aa25042e50a41b885da429de7f326 Mon Sep 17 00:00:00 2001 +From 3c371f5440e3c02a1fe4f66c9e5aa15a3ca74ea0 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 22 Feb 2020 15:54:08 -0600 Subject: [PATCH] Add item entity options @@ -10,7 +10,7 @@ Subject: [PATCH] Add item entity options 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 147e30aa2..0d509e841 100644 +index 147e30aa2f..0d509e8410 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1309,6 +1309,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -22,7 +22,7 @@ index 147e30aa2..0d509e841 100644 return this.a(tag, false); } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index bbb9ca1ef..262a7935e 100644 +index bbb9ca1efc..262a7935e7 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -71,7 +71,7 @@ public class EntityItem extends Entity { @@ -56,7 +56,7 @@ index bbb9ca1ef..262a7935e 100644 if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) { return false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4d32706fa..7aed41f0f 100644 +index 52c65af2c7..0346ad92f8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -5,6 +5,8 @@ import net.minecraft.server.Block; diff --git a/patches/server/0103-Make-natural-spawns-per-biome-configurable.patch b/patches/server/0102-Make-natural-spawns-per-biome-configurable.patch similarity index 98% rename from patches/server/0103-Make-natural-spawns-per-biome-configurable.patch rename to patches/server/0102-Make-natural-spawns-per-biome-configurable.patch index 17bbcb9df..369f45464 100644 --- a/patches/server/0103-Make-natural-spawns-per-biome-configurable.patch +++ b/patches/server/0102-Make-natural-spawns-per-biome-configurable.patch @@ -1,4 +1,4 @@ -From 8032b58cfb1c781e1a7bc68936414b99f6c56af2 Mon Sep 17 00:00:00 2001 +From 50b267418a26ece5cb3f745a7b94c188e0769b28 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 27 Feb 2020 13:39:06 -0600 Subject: [PATCH] Make natural spawns per biome configurable @@ -86,7 +86,7 @@ Subject: [PATCH] Make natural spawns per biome configurable create mode 100644 src/main/resources/biomes.yml diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungle.java b/src/main/java/net/minecraft/server/BiomeBambooJungle.java -index 9c38f8907..3980504d9 100644 +index 9c38f8907a..3980504d9c 100644 --- a/src/main/java/net/minecraft/server/BiomeBambooJungle.java +++ b/src/main/java/net/minecraft/server/BiomeBambooJungle.java @@ -22,22 +22,6 @@ public class BiomeBambooJungle extends BiomeBase { @@ -114,7 +114,7 @@ index 9c38f8907..3980504d9 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java b/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java -index 2a6dafccd..501314da9 100644 +index 2a6dafccdd..501314da9a 100644 --- a/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java +++ b/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java @@ -22,22 +22,6 @@ public final class BiomeBambooJungleHills extends BiomeBase { @@ -142,7 +142,7 @@ index 2a6dafccd..501314da9 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java -index 0102a170d..6e0627fdc 100644 +index 0102a170dc..6e0627fdca 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java @@ -17,8 +17,25 @@ import org.apache.logging.log4j.Logger; @@ -199,7 +199,7 @@ index 0102a170d..6e0627fdc 100644 ((List) this.v.get(enumcreaturetype)).add(biomebase_biomemeta); } diff --git a/src/main/java/net/minecraft/server/BiomeBeach.java b/src/main/java/net/minecraft/server/BiomeBeach.java -index f4e9345ae..d8ff2c9a2 100644 +index f4e9345aeb..d8ff2c9a21 100644 --- a/src/main/java/net/minecraft/server/BiomeBeach.java +++ b/src/main/java/net/minecraft/server/BiomeBeach.java @@ -20,15 +20,6 @@ public final class BiomeBeach extends BiomeBase { @@ -220,7 +220,7 @@ index f4e9345ae..d8ff2c9a2 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeBigHills.java b/src/main/java/net/minecraft/server/BiomeBigHills.java -index 58c30f652..710726742 100644 +index 58c30f6523..7107267421 100644 --- a/src/main/java/net/minecraft/server/BiomeBigHills.java +++ b/src/main/java/net/minecraft/server/BiomeBigHills.java @@ -22,19 +22,6 @@ public final class BiomeBigHills extends BiomeBase { @@ -245,7 +245,7 @@ index 58c30f652..710726742 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeBirchForest.java b/src/main/java/net/minecraft/server/BiomeBirchForest.java -index 9437438c8..1749c258b 100644 +index 9437438c82..1749c258b9 100644 --- a/src/main/java/net/minecraft/server/BiomeBirchForest.java +++ b/src/main/java/net/minecraft/server/BiomeBirchForest.java @@ -21,18 +21,6 @@ public final class BiomeBirchForest extends BiomeBase { @@ -269,7 +269,7 @@ index 9437438c8..1749c258b 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHills.java b/src/main/java/net/minecraft/server/BiomeBirchForestHills.java -index 3e5c23d31..5d262c971 100644 +index 3e5c23d31e..5d262c9712 100644 --- a/src/main/java/net/minecraft/server/BiomeBirchForestHills.java +++ b/src/main/java/net/minecraft/server/BiomeBirchForestHills.java @@ -21,18 +21,6 @@ public final class BiomeBirchForestHills extends BiomeBase { @@ -293,7 +293,7 @@ index 3e5c23d31..5d262c971 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java -index d5eb5c91c..de048fb48 100644 +index d5eb5c91c4..de048fb480 100644 --- a/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java +++ b/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java @@ -21,18 +21,6 @@ public final class BiomeBirchForestHillsMutated extends BiomeBase { @@ -317,7 +317,7 @@ index d5eb5c91c..de048fb48 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java -index e805f9568..2115b05ca 100644 +index e805f9568e..2115b05caa 100644 --- a/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java +++ b/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java @@ -21,18 +21,6 @@ public final class BiomeBirchForestMutated extends BiomeBase { @@ -341,7 +341,7 @@ index e805f9568..2115b05ca 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeColdBeach.java b/src/main/java/net/minecraft/server/BiomeColdBeach.java -index 1b92f4567..210226e19 100644 +index 1b92f4567d..210226e19f 100644 --- a/src/main/java/net/minecraft/server/BiomeColdBeach.java +++ b/src/main/java/net/minecraft/server/BiomeColdBeach.java @@ -20,14 +20,6 @@ public final class BiomeColdBeach extends BiomeBase { @@ -361,7 +361,7 @@ index 1b92f4567..210226e19 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java b/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java -index b9a5cb63a..3622ef669 100644 +index b9a5cb63a4..3622ef6690 100644 --- a/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java +++ b/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java @@ -25,18 +25,6 @@ public class BiomeColdDeepOcean extends BiomeBase { @@ -385,7 +385,7 @@ index b9a5cb63a..3622ef669 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeColdOcean.java b/src/main/java/net/minecraft/server/BiomeColdOcean.java -index 571c3d139..c640aa9ee 100644 +index 571c3d139d..c640aa9eeb 100644 --- a/src/main/java/net/minecraft/server/BiomeColdOcean.java +++ b/src/main/java/net/minecraft/server/BiomeColdOcean.java @@ -24,18 +24,6 @@ public class BiomeColdOcean extends BiomeBase { @@ -409,7 +409,7 @@ index 571c3d139..c640aa9ee 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeColdTaiga.java b/src/main/java/net/minecraft/server/BiomeColdTaiga.java -index 88400e77b..caaa8ec99 100644 +index 88400e77bf..caaa8ec999 100644 --- a/src/main/java/net/minecraft/server/BiomeColdTaiga.java +++ b/src/main/java/net/minecraft/server/BiomeColdTaiga.java @@ -23,21 +23,6 @@ public final class BiomeColdTaiga extends BiomeBase { @@ -436,7 +436,7 @@ index 88400e77b..caaa8ec99 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java b/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java -index 8a8fc7dbd..323f20452 100644 +index 8a8fc7dbd2..323f20452d 100644 --- a/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java +++ b/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java @@ -22,21 +22,6 @@ public final class BiomeColdTaigaHills extends BiomeBase { @@ -463,7 +463,7 @@ index 8a8fc7dbd..323f20452 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java -index 327e6847f..973eb8eeb 100644 +index 327e6847f0..973eb8eeb6 100644 --- a/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java +++ b/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java @@ -22,21 +22,6 @@ public final class BiomeColdTaigaMutated extends BiomeBase { @@ -490,7 +490,7 @@ index 327e6847f..973eb8eeb 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeDeepOcean.java b/src/main/java/net/minecraft/server/BiomeDeepOcean.java -index 651d44cb3..7088603b1 100644 +index 651d44cb37..7088603b15 100644 --- a/src/main/java/net/minecraft/server/BiomeDeepOcean.java +++ b/src/main/java/net/minecraft/server/BiomeDeepOcean.java @@ -25,18 +25,6 @@ public final class BiomeDeepOcean extends BiomeBase { @@ -514,7 +514,7 @@ index 651d44cb3..7088603b1 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeDesert.java b/src/main/java/net/minecraft/server/BiomeDesert.java -index 257732dad..168614fe5 100644 +index 257732dad7..168614fe59 100644 --- a/src/main/java/net/minecraft/server/BiomeDesert.java +++ b/src/main/java/net/minecraft/server/BiomeDesert.java @@ -24,16 +24,6 @@ public final class BiomeDesert extends BiomeBase { @@ -536,7 +536,7 @@ index 257732dad..168614fe5 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeDesertHills.java b/src/main/java/net/minecraft/server/BiomeDesertHills.java -index 3752fc450..4df443701 100644 +index 3752fc4509..4df4437013 100644 --- a/src/main/java/net/minecraft/server/BiomeDesertHills.java +++ b/src/main/java/net/minecraft/server/BiomeDesertHills.java @@ -22,16 +22,6 @@ public final class BiomeDesertHills extends BiomeBase { @@ -558,7 +558,7 @@ index 3752fc450..4df443701 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeDesertMutated.java b/src/main/java/net/minecraft/server/BiomeDesertMutated.java -index 1a0b56932..ac565c382 100644 +index 1a0b569322..ac565c3822 100644 --- a/src/main/java/net/minecraft/server/BiomeDesertMutated.java +++ b/src/main/java/net/minecraft/server/BiomeDesertMutated.java @@ -21,16 +21,6 @@ public final class BiomeDesertMutated extends BiomeBase { @@ -580,7 +580,7 @@ index 1a0b56932..ac565c382 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java -index 8e19e0688..93f9c55bb 100644 +index 8e19e06889..93f9c55bb2 100644 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java @@ -22,19 +22,6 @@ public final class BiomeExtremeHillsEdge extends BiomeBase { @@ -605,7 +605,7 @@ index 8e19e0688..93f9c55bb 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java -index 69d4880c7..5c73ee4fb 100644 +index 69d4880c74..5c73ee4fb8 100644 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java @@ -22,19 +22,6 @@ public final class BiomeExtremeHillsMutated extends BiomeBase { @@ -630,7 +630,7 @@ index 69d4880c7..5c73ee4fb 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java -index 7661d5316..7bc4631db 100644 +index 7661d53161..7bc4631db0 100644 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java @@ -22,19 +22,6 @@ public final class BiomeExtremeHillsWithTrees extends BiomeBase { @@ -655,7 +655,7 @@ index 7661d5316..7bc4631db 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java -index 05418f8fa..b618c7e33 100644 +index 05418f8fa1..b618c7e336 100644 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java @@ -22,19 +22,6 @@ public final class BiomeExtremeHillsWithTreesMutated extends BiomeBase { @@ -680,7 +680,7 @@ index 05418f8fa..b618c7e33 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeFlowerForest.java b/src/main/java/net/minecraft/server/BiomeFlowerForest.java -index 1d3f62432..1d0809c2c 100644 +index 1d3f624323..1d0809c2cc 100644 --- a/src/main/java/net/minecraft/server/BiomeFlowerForest.java +++ b/src/main/java/net/minecraft/server/BiomeFlowerForest.java @@ -23,19 +23,6 @@ public final class BiomeFlowerForest extends BiomeBase { @@ -705,7 +705,7 @@ index 1d3f62432..1d0809c2c 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeForest.java b/src/main/java/net/minecraft/server/BiomeForest.java -index e849b411c..2b69a128a 100644 +index e849b411c6..2b69a128a6 100644 --- a/src/main/java/net/minecraft/server/BiomeForest.java +++ b/src/main/java/net/minecraft/server/BiomeForest.java @@ -22,19 +22,6 @@ public final class BiomeForest extends BiomeBase { @@ -730,7 +730,7 @@ index e849b411c..2b69a128a 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeForestHills.java b/src/main/java/net/minecraft/server/BiomeForestHills.java -index f7dea38eb..57c709181 100644 +index f7dea38eb3..57c7091816 100644 --- a/src/main/java/net/minecraft/server/BiomeForestHills.java +++ b/src/main/java/net/minecraft/server/BiomeForestHills.java @@ -22,19 +22,6 @@ public final class BiomeForestHills extends BiomeBase { @@ -755,7 +755,7 @@ index f7dea38eb..57c709181 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java -index 67d120bef..f1ab35f2f 100644 +index 67d120bef2..f1ab35f2fa 100644 --- a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java +++ b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java @@ -26,19 +26,7 @@ public class BiomeFrozenDeepOcean extends BiomeBase { @@ -780,7 +780,7 @@ index 67d120bef..f1ab35f2f 100644 @Override diff --git a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java -index 2772bc6da..3941438d9 100644 +index 2772bc6dac..3941438d92 100644 --- a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java +++ b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java @@ -25,19 +25,7 @@ public final class BiomeFrozenOcean extends BiomeBase { @@ -805,7 +805,7 @@ index 2772bc6da..3941438d9 100644 @Override diff --git a/src/main/java/net/minecraft/server/BiomeFrozenRiver.java b/src/main/java/net/minecraft/server/BiomeFrozenRiver.java -index 4be53fc0f..f5d98bcac 100644 +index 4be53fc0f6..f5d98bcac9 100644 --- a/src/main/java/net/minecraft/server/BiomeFrozenRiver.java +++ b/src/main/java/net/minecraft/server/BiomeFrozenRiver.java @@ -19,17 +19,6 @@ public final class BiomeFrozenRiver extends BiomeBase { @@ -828,7 +828,7 @@ index 4be53fc0f..f5d98bcac 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeHell.java b/src/main/java/net/minecraft/server/BiomeHell.java -index 888dfcd8d..dd3375ef8 100644 +index 888dfcd8d4..dd3375ef84 100644 --- a/src/main/java/net/minecraft/server/BiomeHell.java +++ b/src/main/java/net/minecraft/server/BiomeHell.java @@ -18,9 +18,6 @@ public final class BiomeHell extends BiomeBase { @@ -843,7 +843,7 @@ index 888dfcd8d..dd3375ef8 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeIceMountains.java b/src/main/java/net/minecraft/server/BiomeIceMountains.java -index ad9b4efe0..0e98efb9e 100644 +index ad9b4efe09..0e98efb9e9 100644 --- a/src/main/java/net/minecraft/server/BiomeIceMountains.java +++ b/src/main/java/net/minecraft/server/BiomeIceMountains.java @@ -20,18 +20,7 @@ public final class BiomeIceMountains extends BiomeBase { @@ -867,7 +867,7 @@ index ad9b4efe0..0e98efb9e 100644 @Override diff --git a/src/main/java/net/minecraft/server/BiomeIcePlains.java b/src/main/java/net/minecraft/server/BiomeIcePlains.java -index 71606b0a7..ba0a16faa 100644 +index 71606b0a71..ba0a16faa6 100644 --- a/src/main/java/net/minecraft/server/BiomeIcePlains.java +++ b/src/main/java/net/minecraft/server/BiomeIcePlains.java @@ -23,18 +23,7 @@ public final class BiomeIcePlains extends BiomeBase { @@ -891,7 +891,7 @@ index 71606b0a7..ba0a16faa 100644 @Override diff --git a/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java b/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java -index 984f94bb5..375ccf9c4 100644 +index 984f94bb59..375ccf9c45 100644 --- a/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java +++ b/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java @@ -22,18 +22,7 @@ public final class BiomeIcePlainsSpikes extends BiomeBase { @@ -915,7 +915,7 @@ index 984f94bb5..375ccf9c4 100644 @Override diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java -index 95e501996..2b154a276 100644 +index 95e5019968..2b154a2761 100644 --- a/src/main/java/net/minecraft/server/BiomeJungle.java +++ b/src/main/java/net/minecraft/server/BiomeJungle.java @@ -23,22 +23,6 @@ public final class BiomeJungle extends BiomeBase { @@ -943,7 +943,7 @@ index 95e501996..2b154a276 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdge.java b/src/main/java/net/minecraft/server/BiomeJungleEdge.java -index e624f9764..e6cf5d853 100644 +index e624f9764f..e6cf5d8539 100644 --- a/src/main/java/net/minecraft/server/BiomeJungleEdge.java +++ b/src/main/java/net/minecraft/server/BiomeJungleEdge.java @@ -21,19 +21,6 @@ public final class BiomeJungleEdge extends BiomeBase { @@ -968,7 +968,7 @@ index e624f9764..e6cf5d853 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java b/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java -index 1fe9c840a..d4c9907b2 100644 +index 1fe9c840a7..d4c9907b28 100644 --- a/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java +++ b/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java @@ -21,19 +21,6 @@ public final class BiomeJungleEdgeMutated extends BiomeBase { @@ -993,7 +993,7 @@ index 1fe9c840a..d4c9907b2 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeJungleHills.java b/src/main/java/net/minecraft/server/BiomeJungleHills.java -index e2970ab00..9e7b702c8 100644 +index e2970ab00e..9e7b702c8a 100644 --- a/src/main/java/net/minecraft/server/BiomeJungleHills.java +++ b/src/main/java/net/minecraft/server/BiomeJungleHills.java @@ -23,22 +23,6 @@ public final class BiomeJungleHills extends BiomeBase { @@ -1021,7 +1021,7 @@ index e2970ab00..9e7b702c8 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeJungleMutated.java b/src/main/java/net/minecraft/server/BiomeJungleMutated.java -index ffe6b4344..f308e0dd4 100644 +index ffe6b4344e..f308e0dd45 100644 --- a/src/main/java/net/minecraft/server/BiomeJungleMutated.java +++ b/src/main/java/net/minecraft/server/BiomeJungleMutated.java @@ -21,21 +21,6 @@ public final class BiomeJungleMutated extends BiomeBase { @@ -1048,7 +1048,7 @@ index ffe6b4344..f308e0dd4 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java -index b23c43305..092233c50 100644 +index b23c43305b..092233c50c 100644 --- a/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java +++ b/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java @@ -25,20 +25,6 @@ public class BiomeLukewarmDeepOcean extends BiomeBase { @@ -1074,7 +1074,7 @@ index b23c43305..092233c50 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java -index efcb11bbe..1cebd5ce7 100644 +index efcb11bbe8..1cebd5ce74 100644 --- a/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java +++ b/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java @@ -23,20 +23,6 @@ public class BiomeLukewarmOcean extends BiomeBase { @@ -1100,7 +1100,7 @@ index efcb11bbe..1cebd5ce7 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java -index 328e939a6..d0fe6c449 100644 +index 328e939a6f..d0fe6c4493 100644 --- a/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java +++ b/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java @@ -23,21 +23,6 @@ public final class BiomeMegaSpruceTaiga extends BiomeBase { @@ -1127,7 +1127,7 @@ index 328e939a6..d0fe6c449 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaTaiga.java -index 36bea710a..e3aad431e 100644 +index 36bea710a0..e3aad431e2 100644 --- a/src/main/java/net/minecraft/server/BiomeMegaTaiga.java +++ b/src/main/java/net/minecraft/server/BiomeMegaTaiga.java @@ -23,21 +23,6 @@ public final class BiomeMegaTaiga extends BiomeBase { @@ -1154,7 +1154,7 @@ index 36bea710a..e3aad431e 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java b/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java -index 22474d682..2ef445ce6 100644 +index 22474d682a..2ef445ce64 100644 --- a/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java +++ b/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java @@ -23,21 +23,6 @@ public final class BiomeMegaTaigaHills extends BiomeBase { @@ -1181,7 +1181,7 @@ index 22474d682..2ef445ce6 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeMesa.java b/src/main/java/net/minecraft/server/BiomeMesa.java -index 65d606d51..8906115d4 100644 +index 65d606d51c..8906115d47 100644 --- a/src/main/java/net/minecraft/server/BiomeMesa.java +++ b/src/main/java/net/minecraft/server/BiomeMesa.java @@ -19,14 +19,6 @@ public final class BiomeMesa extends BiomeBase { @@ -1201,7 +1201,7 @@ index 65d606d51..8906115d4 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeMesaBryce.java b/src/main/java/net/minecraft/server/BiomeMesaBryce.java -index 5ecec62f1..401fbd2d1 100644 +index 5ecec62f18..401fbd2d16 100644 --- a/src/main/java/net/minecraft/server/BiomeMesaBryce.java +++ b/src/main/java/net/minecraft/server/BiomeMesaBryce.java @@ -19,14 +19,6 @@ public final class BiomeMesaBryce extends BiomeBase { @@ -1221,7 +1221,7 @@ index 5ecec62f1..401fbd2d1 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java -index 14d4bd312..77a5828f0 100644 +index 14d4bd312e..77a5828f07 100644 --- a/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java +++ b/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java @@ -20,14 +20,6 @@ public final class BiomeMesaPlataeu extends BiomeBase { @@ -1241,7 +1241,7 @@ index 14d4bd312..77a5828f0 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java -index b5dab9d2a..a88831255 100644 +index b5dab9d2aa..a888312556 100644 --- a/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java +++ b/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java @@ -19,14 +19,6 @@ public final class BiomeMesaPlataeuClear extends BiomeBase { @@ -1261,7 +1261,7 @@ index b5dab9d2a..a88831255 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java -index d05cc38b5..be0738713 100644 +index d05cc38b5e..be07387135 100644 --- a/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java +++ b/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java @@ -19,14 +19,6 @@ public final class BiomeMesaPlateauClearMutated extends BiomeBase { @@ -1281,7 +1281,7 @@ index d05cc38b5..be0738713 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java -index 21a77ee81..2a213025b 100644 +index 21a77ee812..2a213025b9 100644 --- a/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java +++ b/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java @@ -20,14 +20,6 @@ public final class BiomeMesaPlateauMutated extends BiomeBase { @@ -1301,7 +1301,7 @@ index 21a77ee81..2a213025b 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java b/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java -index 0302efbdc..f0be681aa 100644 +index 0302efbdc7..f0be681aaf 100644 --- a/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java +++ b/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java @@ -18,7 +18,6 @@ public final class BiomeMushroomIslandShore extends BiomeBase { @@ -1314,7 +1314,7 @@ index 0302efbdc..f0be681aa 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeMushrooms.java b/src/main/java/net/minecraft/server/BiomeMushrooms.java -index 51f92584b..0118df023 100644 +index 51f92584b8..0118df023f 100644 --- a/src/main/java/net/minecraft/server/BiomeMushrooms.java +++ b/src/main/java/net/minecraft/server/BiomeMushrooms.java @@ -18,7 +18,6 @@ public final class BiomeMushrooms extends BiomeBase { @@ -1327,7 +1327,7 @@ index 51f92584b..0118df023 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeOcean.java b/src/main/java/net/minecraft/server/BiomeOcean.java -index ad9628b2a..5f4617c0a 100644 +index ad9628b2aa..5f4617c0a6 100644 --- a/src/main/java/net/minecraft/server/BiomeOcean.java +++ b/src/main/java/net/minecraft/server/BiomeOcean.java @@ -24,18 +24,6 @@ public final class BiomeOcean extends BiomeBase { @@ -1351,7 +1351,7 @@ index ad9628b2a..5f4617c0a 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomePlains.java b/src/main/java/net/minecraft/server/BiomePlains.java -index ff6090e3c..266f4165a 100644 +index ff6090e3c1..266f4165a4 100644 --- a/src/main/java/net/minecraft/server/BiomePlains.java +++ b/src/main/java/net/minecraft/server/BiomePlains.java @@ -21,20 +21,6 @@ public final class BiomePlains extends BiomeBase { @@ -1377,7 +1377,7 @@ index ff6090e3c..266f4165a 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java b/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java -index a28222eb1..f35557dfd 100644 +index a28222eb1d..f35557dfdf 100644 --- a/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java +++ b/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java @@ -23,21 +23,6 @@ public final class BiomeRedwoodTaigaHillsMutated extends BiomeBase { @@ -1404,7 +1404,7 @@ index a28222eb1..f35557dfd 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeRiver.java b/src/main/java/net/minecraft/server/BiomeRiver.java -index b84b868b1..405cc2bff 100644 +index b84b868b1a..405cc2bff4 100644 --- a/src/main/java/net/minecraft/server/BiomeRiver.java +++ b/src/main/java/net/minecraft/server/BiomeRiver.java @@ -20,17 +20,6 @@ public final class BiomeRiver extends BiomeBase { @@ -1427,7 +1427,7 @@ index b84b868b1..405cc2bff 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForest.java b/src/main/java/net/minecraft/server/BiomeRoofedForest.java -index 16bcf9bff..f02a8a03c 100644 +index 16bcf9bff0..f02a8a03c7 100644 --- a/src/main/java/net/minecraft/server/BiomeRoofedForest.java +++ b/src/main/java/net/minecraft/server/BiomeRoofedForest.java @@ -24,18 +24,6 @@ public final class BiomeRoofedForest extends BiomeBase { @@ -1451,7 +1451,7 @@ index 16bcf9bff..f02a8a03c 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java b/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java -index 9fa84c87f..9ee0fc6a4 100644 +index 9fa84c87fa..9ee0fc6a43 100644 --- a/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java +++ b/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java @@ -24,18 +24,6 @@ public final class BiomeRoofedForestMutated extends BiomeBase { @@ -1475,7 +1475,7 @@ index 9fa84c87f..9ee0fc6a4 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeSavanna.java b/src/main/java/net/minecraft/server/BiomeSavanna.java -index c12a89016..a539fc362 100644 +index c12a890165..a539fc362d 100644 --- a/src/main/java/net/minecraft/server/BiomeSavanna.java +++ b/src/main/java/net/minecraft/server/BiomeSavanna.java @@ -23,20 +23,6 @@ public final class BiomeSavanna extends BiomeBase { @@ -1501,7 +1501,7 @@ index c12a89016..a539fc362 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeSavannaMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaMutated.java -index db8b20a6c..e041fcd41 100644 +index db8b20a6c7..e041fcd412 100644 --- a/src/main/java/net/minecraft/server/BiomeSavannaMutated.java +++ b/src/main/java/net/minecraft/server/BiomeSavannaMutated.java @@ -20,20 +20,6 @@ public final class BiomeSavannaMutated extends BiomeBase { @@ -1527,7 +1527,7 @@ index db8b20a6c..e041fcd41 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java -index 2826c510d..08407ea3e 100644 +index 2826c510d8..08407ea3e0 100644 --- a/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java +++ b/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java @@ -21,21 +21,6 @@ public final class BiomeSavannaPlateau extends BiomeBase { @@ -1554,7 +1554,7 @@ index 2826c510d..08407ea3e 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java -index e544a8f6b..337310263 100644 +index e544a8f6b9..337310263c 100644 --- a/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java +++ b/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java @@ -20,20 +20,6 @@ public final class BiomeSavannaPlateauMutated extends BiomeBase { @@ -1580,7 +1580,7 @@ index e544a8f6b..337310263 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeStoneBeach.java b/src/main/java/net/minecraft/server/BiomeStoneBeach.java -index 34660f9f8..3a96c2aeb 100644 +index 34660f9f84..3a96c2aeba 100644 --- a/src/main/java/net/minecraft/server/BiomeStoneBeach.java +++ b/src/main/java/net/minecraft/server/BiomeStoneBeach.java @@ -19,14 +19,6 @@ public final class BiomeStoneBeach extends BiomeBase { @@ -1600,7 +1600,7 @@ index 34660f9f8..3a96c2aeb 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java b/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java -index 8815c9590..f971bc4bc 100644 +index 8815c95900..f971bc4bcb 100644 --- a/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java +++ b/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java @@ -21,20 +21,6 @@ public final class BiomeSunflowerPlains extends BiomeBase { @@ -1626,7 +1626,7 @@ index 8815c9590..f971bc4bc 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeSwamp.java b/src/main/java/net/minecraft/server/BiomeSwamp.java -index 02584897e..011628fff 100644 +index 02584897e9..011628fff2 100644 --- a/src/main/java/net/minecraft/server/BiomeSwamp.java +++ b/src/main/java/net/minecraft/server/BiomeSwamp.java @@ -20,19 +20,6 @@ public final class BiomeSwamp extends BiomeBase { @@ -1651,7 +1651,7 @@ index 02584897e..011628fff 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java b/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java -index d85b01b95..10c6b4eb3 100644 +index d85b01b956..10c6b4eb39 100644 --- a/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java +++ b/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java @@ -18,19 +18,6 @@ public final class BiomeSwamplandMutated extends BiomeBase { @@ -1676,7 +1676,7 @@ index d85b01b95..10c6b4eb3 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeTaiga.java b/src/main/java/net/minecraft/server/BiomeTaiga.java -index ae6e6ca89..456b6b174 100644 +index ae6e6ca896..456b6b1747 100644 --- a/src/main/java/net/minecraft/server/BiomeTaiga.java +++ b/src/main/java/net/minecraft/server/BiomeTaiga.java @@ -24,21 +24,6 @@ public final class BiomeTaiga extends BiomeBase { @@ -1703,7 +1703,7 @@ index ae6e6ca89..456b6b174 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeTaigaHills.java b/src/main/java/net/minecraft/server/BiomeTaigaHills.java -index 4e19fe5ae..cc699e354 100644 +index 4e19fe5ae9..cc699e354d 100644 --- a/src/main/java/net/minecraft/server/BiomeTaigaHills.java +++ b/src/main/java/net/minecraft/server/BiomeTaigaHills.java @@ -22,21 +22,6 @@ public final class BiomeTaigaHills extends BiomeBase { @@ -1730,7 +1730,7 @@ index 4e19fe5ae..cc699e354 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeTaigaMutated.java -index 05e833ffe..3c722f50a 100644 +index 05e833ffed..3c722f50a9 100644 --- a/src/main/java/net/minecraft/server/BiomeTaigaMutated.java +++ b/src/main/java/net/minecraft/server/BiomeTaigaMutated.java @@ -22,21 +22,6 @@ public final class BiomeTaigaMutated extends BiomeBase { @@ -1757,7 +1757,7 @@ index 05e833ffe..3c722f50a 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeTheEnd.java b/src/main/java/net/minecraft/server/BiomeTheEnd.java -index 22e9789a3..6a5a8a991 100644 +index 22e9789a36..6a5a8a991a 100644 --- a/src/main/java/net/minecraft/server/BiomeTheEnd.java +++ b/src/main/java/net/minecraft/server/BiomeTheEnd.java @@ -8,6 +8,6 @@ public final class BiomeTheEnd extends BiomeBase { @@ -1769,7 +1769,7 @@ index 22e9789a3..6a5a8a991 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeTheEndBarrenIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndBarrenIsland.java -index 5b068299c..07d72737b 100644 +index 5b068299c8..07d72737b5 100644 --- a/src/main/java/net/minecraft/server/BiomeTheEndBarrenIsland.java +++ b/src/main/java/net/minecraft/server/BiomeTheEndBarrenIsland.java @@ -5,6 +5,6 @@ public class BiomeTheEndBarrenIsland extends BiomeBase { @@ -1781,7 +1781,7 @@ index 5b068299c..07d72737b 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java b/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java -index a26d56aa4..839d3e616 100644 +index a26d56aa45..839d3e616a 100644 --- a/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java +++ b/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java @@ -6,6 +6,6 @@ public class BiomeTheEndFloatingIslands extends BiomeBase { @@ -1793,7 +1793,7 @@ index a26d56aa4..839d3e616 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java -index e47add3e4..53aa6243d 100644 +index e47add3e43..53aa6243de 100644 --- a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java +++ b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java @@ -8,6 +8,6 @@ public class BiomeTheEndHighIsland extends BiomeBase { @@ -1805,7 +1805,7 @@ index e47add3e4..53aa6243d 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java -index ec92a8457..2452f1801 100644 +index ec92a84579..2452f18013 100644 --- a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java +++ b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java @@ -6,6 +6,6 @@ public class BiomeTheEndMediumIsland extends BiomeBase { @@ -1817,7 +1817,7 @@ index ec92a8457..2452f1801 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeVoid.java b/src/main/java/net/minecraft/server/BiomeVoid.java -index c9ba33453..5549d6142 100644 +index c9ba334535..5549d61421 100644 --- a/src/main/java/net/minecraft/server/BiomeVoid.java +++ b/src/main/java/net/minecraft/server/BiomeVoid.java @@ -5,5 +5,6 @@ public final class BiomeVoid extends BiomeBase { @@ -1828,7 +1828,7 @@ index c9ba33453..5549d6142 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java -index 11dc5f637..c3fc79fb3 100644 +index 11dc5f6374..c3fc79fb31 100644 --- a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java +++ b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java @@ -24,18 +24,6 @@ public class BiomeWarmDeepOcean extends BiomeBase { @@ -1852,7 +1852,7 @@ index 11dc5f637..c3fc79fb3 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeWarmOcean.java b/src/main/java/net/minecraft/server/BiomeWarmOcean.java -index e4dc7d198..00f94b906 100644 +index e4dc7d198c..00f94b906b 100644 --- a/src/main/java/net/minecraft/server/BiomeWarmOcean.java +++ b/src/main/java/net/minecraft/server/BiomeWarmOcean.java @@ -26,18 +26,6 @@ public class BiomeWarmOcean extends BiomeBase { @@ -1876,7 +1876,7 @@ index e4dc7d198..00f94b906 100644 } } diff --git a/src/main/java/net/minecraft/server/Biomes.java b/src/main/java/net/minecraft/server/Biomes.java -index 12742870c..a448c7726 100644 +index 12742870ca..a448c77264 100644 --- a/src/main/java/net/minecraft/server/Biomes.java +++ b/src/main/java/net/minecraft/server/Biomes.java @@ -87,6 +87,34 @@ public abstract class Biomes { @@ -1916,7 +1916,7 @@ index 12742870c..a448c7726 100644 diff --git a/src/main/resources/biomes.yml b/src/main/resources/biomes.yml new file mode 100644 -index 000000000..f0ea65299 +index 0000000000..f0ea65299f --- /dev/null +++ b/src/main/resources/biomes.yml @@ -0,0 +1,1042 @@ diff --git a/patches/server/0104-Configurable-void-damage-height.patch b/patches/server/0103-Configurable-void-damage-height.patch similarity index 94% rename from patches/server/0104-Configurable-void-damage-height.patch rename to patches/server/0103-Configurable-void-damage-height.patch index 4471a8fa7..ebf9e3c6a 100644 --- a/patches/server/0104-Configurable-void-damage-height.patch +++ b/patches/server/0103-Configurable-void-damage-height.patch @@ -1,4 +1,4 @@ -From c9d375ca07697b7855f02493e85a67e6b3522a61 Mon Sep 17 00:00:00 2001 +From 9a2eb77d5ec13921ace07f7862f8ff20102ea4cf Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 27 Feb 2020 21:42:19 -0600 Subject: [PATCH] Configurable void damage height @@ -9,7 +9,7 @@ Subject: [PATCH] Configurable void damage height 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0d509e841..c85e79494 100644 +index 0d509e8410..c85e794940 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -503,7 +503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -22,7 +22,7 @@ index 0d509e841..c85e79494 100644 && this.locY >= world.paperConfig.netherVoidTopDamageHeight)) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7aed41f0f..c7a7c8636 100644 +index 0346ad92f8..20050a58b2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -198,6 +198,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0105-Optimise-Chunk-getFluid.patch b/patches/server/0104-Optimise-Chunk-getFluid.patch similarity index 95% rename from patches/server/0105-Optimise-Chunk-getFluid.patch rename to patches/server/0104-Optimise-Chunk-getFluid.patch index ebd57c347..42f47e3bb 100644 --- a/patches/server/0105-Optimise-Chunk-getFluid.patch +++ b/patches/server/0104-Optimise-Chunk-getFluid.patch @@ -1,4 +1,4 @@ -From 41fedcda2798c6d693e4089a3f14787de92ffb4d Mon Sep 17 00:00:00 2001 +From f155dd4a2afbab9be3a982473d5fee3337a4ce65 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Jan 2020 14:59:08 -0800 Subject: [PATCH] Optimise Chunk#getFluid @@ -12,7 +12,7 @@ easier to inline due to code size 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index cd7ada615..15d66edad 100644 +index cd7ada6159..15d66edadb 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -385,17 +385,20 @@ public class Chunk implements IChunkAccess { @@ -52,7 +52,7 @@ index cd7ada615..15d66edad 100644 // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index 8b28fb5ee..426221f7c 100644 +index 8b28fb5ee1..426221f7c3 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -46,7 +46,7 @@ public class ChunkSection { diff --git a/patches/server/0106-Fix-the-dead-lagging-the-server.patch b/patches/server/0105-Fix-the-dead-lagging-the-server.patch similarity index 92% rename from patches/server/0106-Fix-the-dead-lagging-the-server.patch rename to patches/server/0105-Fix-the-dead-lagging-the-server.patch index 46aebd327..50a2773fc 100644 --- a/patches/server/0106-Fix-the-dead-lagging-the-server.patch +++ b/patches/server/0105-Fix-the-dead-lagging-the-server.patch @@ -1,4 +1,4 @@ -From f819a0338b65e24c99f756ad4ad48760a8e78bff Mon Sep 17 00:00:00 2001 +From 3fec0fc591b84c1f0185c12dada2bad4e37cf428 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 6 Mar 2020 13:37:26 -0600 Subject: [PATCH] Fix the dead lagging the server @@ -9,7 +9,7 @@ Subject: [PATCH] Fix the dead lagging the server 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index c85e79494..7cc0354d5 100644 +index c85e794940..7cc0354d57 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1395,7 +1395,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -22,7 +22,7 @@ index c85e79494..7cc0354d5 100644 public void setPositionRotation(BlockPosition blockposition, float f, float f1) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index e3dc406da..0f0b01f57 100644 +index e3dc406da5..0f0b01f57c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2385,7 +2385,7 @@ public abstract class EntityLiving extends Entity { diff --git a/patches/server/0107-Flying-mobs-should-not-be-exempt-from-activation-ran.patch b/patches/server/0106-Flying-mobs-should-not-be-exempt-from-activation-ran.patch similarity index 95% rename from patches/server/0107-Flying-mobs-should-not-be-exempt-from-activation-ran.patch rename to patches/server/0106-Flying-mobs-should-not-be-exempt-from-activation-ran.patch index 6be1ad1a4..e0a47bc93 100644 --- a/patches/server/0107-Flying-mobs-should-not-be-exempt-from-activation-ran.patch +++ b/patches/server/0106-Flying-mobs-should-not-be-exempt-from-activation-ran.patch @@ -1,4 +1,4 @@ -From 4da948be2ef7b419b46e21fb2ae3bafb0fe906db Mon Sep 17 00:00:00 2001 +From 412166deffee0869daeee37302b482022afc3898 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 8 Mar 2020 20:54:44 -0500 Subject: [PATCH] Flying mobs should not be exempt from activation range @@ -9,7 +9,7 @@ Subject: [PATCH] Flying mobs should not be exempt from activation range 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 11fb14612..b876ffaae 100644 +index 11fb146129..b876ffaae7 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -9,6 +9,8 @@ import net.minecraft.server.Entity;