Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
b75eeca0 Boost light task priority to ensure it doesnt hold up chunk loads
3d2bc848 Ensure VillagerTrades doesn't load async - fixes #3495
e470f1ef Add more information to Timing Reports
f4a47db6 Improve Thread Pool usage to allow single threads for single cpu servers
a4fe910f Fix sounds when using worldedit regen command
70ad51a8 Updated Upstream (Bukkit/CraftBukkit)
d7cfa4fa Improve legacy format serialization more
This commit is contained in:
William Blake Galbreath
2020-06-05 21:41:54 -05:00
parent c2c6a6efd9
commit c0c212bf48
161 changed files with 754 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: d6eda567ff...b75eeca0e5

2
current-paper
View File

@@ -1 +1 @@
1.15.2--625ee23d39fa324caa05ebe166b95257153f4d5b
1.15.2--9f38dcdbf4e925715798dd41d1276eb1f2c8f518

50
patches/api/0002-Purpur-config-files.patch
View File

@@ -1,56 +1,14 @@
From 23500f1f8f5d8e17be4b8e14b2ec52638b2db889 Mon Sep 17 00:00:00 2001
From 48b6e33ffaa5a320da32cf4750a932c5018e7be4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 18 Feb 2020 20:30:03 -0600
Subject: [PATCH] Purpur config files
---
.../java/co/aikar/timings/TimingsExport.java | 23 ++++++++++++++++---
src/main/java/org/bukkit/Server.java | 12 ++++++++++
2 files changed, 32 insertions(+), 3 deletions(-)
src/main/java/org/bukkit/Server.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index 93d5a3f9..5e7e10c8 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -204,9 +204,13 @@ class TimingsExport extends Thread {
// Information on the users Config
parent.put("config", createObject(
- pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
- pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
+ // Purpur start
+ pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())),
+ pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
+ pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
+ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
+ pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
+ // Purpur end
));
new TimingsExport(listeners, parent, history).start();
@@ -247,6 +251,19 @@ class TimingsExport extends Thread {
return timingsCost;
}
+ // Purpur start
+ private static JSONObject mapAsJSON(java.util.Properties properties) {
+ JSONObject object = new JSONObject();
+ for (String key : properties.stringPropertyNames()) {
+ if (TimingsManager.hiddenConfigs.contains(key)) {
+ continue;
+ }
+ object.put(key, valAsJSON(properties.get(key), key));
+ }
+ return object;
+ }
+ // Purpur end
+
private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) {
JSONObject object = new JSONObject();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c3fb1c27..79543106 100644
index cc06492f4..47548dfd1 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1396,6 +1396,18 @@ public interface Server extends PluginMessageRecipient {

25
patches/api/0003-Host-our-own-timings.patch
View File

@@ -1,25 +0,0 @@
From efced177921197f8480a7c4e9fba2484fdd41604 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 18 Feb 2020 20:38:26 -0600
Subject: [PATCH] Host our own timings
---
src/main/java/co/aikar/timings/TimingsExport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index 47be89aea..1b5767b29 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -300,7 +300,7 @@ class TimingsExport extends Thread {
String response = null;
String timingsURL = null;
try {
- HttpURLConnection con = (HttpURLConnection) new URL("http://timings.aikar.co/post").openConnection();
+ HttpURLConnection con = (HttpURLConnection) new URL(Bukkit.spigot().getPurpurConfig().getString("settings.timings.url", "https://timings.pl3x.net") + "/post").openConnection(); // Purpur
con.setDoOutput(true);
String hostName = "BrokenHost";
try {
--
2.24.0

2
patches/api/0004-Ridables.patch → patches/api/0003-Ridables.patch
View File

@@ -1,4 +1,4 @@
From 282ffe28105fdbbbaa9ca8efc1184d83f5f47dee Mon Sep 17 00:00:00 2001
From 928b868b220c11a48ed5dc688f92c3cf793078b7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 00:57:16 -0500
Subject: [PATCH] Ridables

16
patches/api/0005-Remove-pointless-annotations-and-deprecations.patch → patches/api/0004-Remove-pointless-annotations-and-deprecations.patch
View File

@@ -1,4 +1,4 @@
From b635caa251ca2fe802bfe3ff6c967971a2b88b93 Mon Sep 17 00:00:00 2001
From d943d6fd099a66d7f6934394f6a839be75104828 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 31 Dec 2019 23:00:07 -0600
Subject: [PATCH] Remove pointless annotations and deprecations
@@ -14,7 +14,7 @@ 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 95ad0122..5d42cf62 100644
index a9c10228e..780d603e4 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -863,13 +863,10 @@ public final class Bukkit {
@@ -32,7 +32,7 @@ index 95ad0122..5d42cf62 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 79543106..aabf82b5 100644
index 47548dfd1..bbb2946f6 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -722,13 +722,10 @@ public interface Server extends PluginMessageRecipient {
@@ -50,7 +50,7 @@ index 79543106..aabf82b5 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 45cb8da1..383b43e1 100644
index 45cb8da12..383b43e1b 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 45cb8da1..383b43e1 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 e9cf71f5..34d3462c 100644
index e9cf71f5c..34d3462c7 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 e9cf71f5..34d3462c 100644
+ public List<String> 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 d7d6a3e8..cf8d7749 100644
index ccd81fca2..a8ade268c 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 d7d6a3e8..cf8d7749 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 04fa3991..24d65491 100644
index 04fa3991f..24d65491c 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 04fa3991..24d65491 100644
}
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
index a48be38b..951b81e7 100644
index a48be38b1..951b81e79 100644
--- a/src/test/java/org/bukkit/AnnotationTest.java
+++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -41,6 +41,11 @@ public class AnnotationTest {

2
patches/api/0006-Allow-inventory-resizing.patch → patches/api/0005-Allow-inventory-resizing.patch
View File

@@ -1,4 +1,4 @@
From fd0bef0590aaaa10deefcda30d4e6b7a6bde21fc Mon Sep 17 00:00:00 2001
From 78aecf28f5492c23d4c60df906093ffa9120e008 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 06:50:55 -0500
Subject: [PATCH] Allow inventory resizing

6
patches/api/0007-Implement-AFK-API.patch → patches/api/0006-Implement-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From 37efa9e3cdecabc0f10d35dc501ef4cafa164080 Mon Sep 17 00:00:00 2001
From b9e40e25bdb2a99a85e88c413e6cc8949c5cd619 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 10 Aug 2019 22:19:56 -0500
Subject: [PATCH] Implement AFK API
@@ -11,7 +11,7 @@ Subject: [PATCH] Implement AFK API
diff --git a/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
new file mode 100644
index 00000000..0c8b3e5e
index 000000000..0c8b3e5e4
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
@@ -0,0 +1,70 @@
@@ -86,7 +86,7 @@ index 00000000..0c8b3e5e
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 787bb144..edc48117 100644
index 787bb144b..edc481170 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1830,4 +1830,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

2
patches/api/0008-Add-EntityPortalReadyEvent.patch → patches/api/0007-Add-EntityPortalReadyEvent.patch
View File

@@ -1,4 +1,4 @@
From 07869e37e8dc3b12e9e0fa2ce5ee0a4e23e250a6 Mon Sep 17 00:00:00 2001
From e63bb83fe25662c23e93b21da43c4f75ec616990 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 11 Jan 2020 23:12:00 -0600
Subject: [PATCH] Add EntityPortalReadyEvent

6
patches/api/0009-Bring-back-server-name.patch → patches/api/0008-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From cc89d98244645c403a461188a6fb49bc86288213 Mon Sep 17 00:00:00 2001
From 2c770cf3a11862fdec3aa1a7a9f04871a41d1e27 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 26 May 2019 15:18:40 -0500
Subject: [PATCH] Bring back server name
@@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name
2 files changed, 20 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 780d603e..33ccf297 100644
index 780d603e4..33ccf2979 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1714,4 +1714,15 @@ public final class Bukkit {
@@ -29,7 +29,7 @@ index 780d603e..33ccf297 100644
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index bbb2946f..8d3501a6 100644
index bbb2946f6..8d3501a67 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1505,4 +1505,13 @@ public interface Server extends PluginMessageRecipient {

2
patches/api/0010-Implement-LivingEntity-safeFallDistance.patch → patches/api/0009-Implement-LivingEntity-safeFallDistance.patch
View File

@@ -1,4 +1,4 @@
From 24a737b9d80b9bc724dbcff7b9487de04f8fd706 Mon Sep 17 00:00:00 2001
From 5ae5f9e9d98de60e44d57aee71eeab472d3639a5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 5 May 2019 12:58:19 -0500
Subject: [PATCH] Implement LivingEntity safeFallDistance

2
patches/api/0011-Add-ExecuteCommandEvent.patch → patches/api/0010-Add-ExecuteCommandEvent.patch
View File

@@ -1,4 +1,4 @@
From 026def607865ff42c7740b5c0ef9439c09497888 Mon Sep 17 00:00:00 2001
From db25bc04648a0ce70ac58987a994c730f3c6e1ae Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 31 May 2019 00:08:28 -0500
Subject: [PATCH] Add ExecuteCommandEvent

2
patches/api/0012-Implement-ChunkTooLargeEvent.patch → patches/api/0011-Implement-ChunkTooLargeEvent.patch
View File

@@ -1,4 +1,4 @@
From 0cf23610dddc0f16cb40bf33ccdd6495abd55fb2 Mon Sep 17 00:00:00 2001
From e4b28b6ed7d3e1f7f32f0397abb1068483715cc0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 12 Jul 2019 02:09:58 -0500
Subject: [PATCH] Implement ChunkTooLargeEvent

6
patches/api/0013-Implement-lagging-threshold.patch → patches/api/0012-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From d2beebd0b8bca2ad0eef2138675d81cd0f0f9568 Mon Sep 17 00:00:00 2001
From 25c7441fd2fe5c753d82cb728ff762125fff9983 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:24 -0500
Subject: [PATCH] Implement lagging threshold
@@ -9,7 +9,7 @@ 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 33ccf297..ee8fe48a 100644
index 33ccf2979..ee8fe48aa 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1724,5 +1724,14 @@ public final class Bukkit {
@@ -28,7 +28,7 @@ index 33ccf297..ee8fe48a 100644
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 8d3501a6..c35405e0 100644
index 8d3501a67..c35405e09 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1513,5 +1513,12 @@ public interface Server extends PluginMessageRecipient {

2
patches/api/0014-Advancement-API-Additions.patch → patches/api/0013-Advancement-API-Additions.patch
View File

@@ -1,4 +1,4 @@
From 60b43c69c3c60af8494c8a3e456528c541734e29 Mon Sep 17 00:00:00 2001
From a2b02de4ec98e2d8fee3fc9a36f3da00a839c38d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 31 May 2019 21:24:21 -0500
Subject: [PATCH] Advancement API Additions

2
patches/api/0015-Implement-ItemFactory-getMonsterEgg.patch → patches/api/0014-Implement-ItemFactory-getMonsterEgg.patch
View File

@@ -1,4 +1,4 @@
From 629ed9eab41a762189f7671220ad3b459c010243 Mon Sep 17 00:00:00 2001
From 8c6a8c2f9bc5badb5b85a0901b329eb01366c4cc Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 5 Jul 2019 16:37:04 -0500
Subject: [PATCH] Implement ItemFactory#getMonsterEgg

2
patches/api/0016-Implement-PlayerSetSpawnerTypeWithEggEvent.patch → patches/api/0015-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
View File

@@ -1,4 +1,4 @@
From 02402b5e5b5cf877fdc9c4772b3823b74c466d39 Mon Sep 17 00:00:00 2001
From 226d3bc769d579cb0463f1aa0551e02a22b68753 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 5 Jul 2019 18:21:15 -0500
Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent

2
patches/api/0017-Add-MonsterEggSpawnEvent.patch → patches/api/0016-Add-MonsterEggSpawnEvent.patch
View File

@@ -1,4 +1,4 @@
From a9072d23135ed363762d4521228cda31784f35b4 Mon Sep 17 00:00:00 2001
From c90d5a3d7fc8dc2449b778807b42e18de51f3641 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 03:20:49 -0500
Subject: [PATCH] Add MonsterEggSpawnEvent

2
patches/api/0018-Add-ThrownEggHatchEvent.patch → patches/api/0017-Add-ThrownEggHatchEvent.patch
View File

@@ -1,4 +1,4 @@
From 3e05bb777ebac12f0ac443593e417efdc4decccb Mon Sep 17 00:00:00 2001
From c7e580d108dcc2aa8c6375bc489c2a3925a5e48a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 03:27:55 -0500
Subject: [PATCH] Add ThrownEggHatchEvent

2
patches/api/0019-Add-moon-phase-API.patch → patches/api/0018-Add-moon-phase-API.patch
View File

@@ -1,4 +1,4 @@
From 707e74f8dc730b9e1f1ce8183430d5c39af67b64 Mon Sep 17 00:00:00 2001
From fd204c5ff1b25d9c570cfab851c791d546bd966d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 1 Feb 2020 22:22:07 -0600
Subject: [PATCH] Add moon phase API

4
patches/api/0020-Add-API-for-Villager-resetOffers.patch → patches/api/0019-Add-API-for-Villager-resetOffers.patch
View File

@@ -1,4 +1,4 @@
From 013e7bc6e20e097f054a3b76f9d6a3aa49d2f256 Mon Sep 17 00:00:00 2001
From 1a3ff839467609e8b95ae15984ca7fa1b76ee965 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 7 Oct 2019 00:15:28 -0500
Subject: [PATCH] Add API for Villager#resetOffers()
@@ -8,7 +8,7 @@ Subject: [PATCH] Add API for Villager#resetOffers()
1 file changed, 7 insertions(+)
diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
index e0a3285b..32b8c4f2 100644
index e0a3285b8..32b8c4f20 100644
--- a/src/main/java/org/bukkit/entity/Villager.java
+++ b/src/main/java/org/bukkit/entity/Villager.java
@@ -113,6 +113,13 @@ public interface Villager extends AbstractVillager {

2
patches/api/0021-Expose-getItemStack-for-Trident.patch → patches/api/0020-Expose-getItemStack-for-Trident.patch
View File

@@ -1,4 +1,4 @@
From 0f7cf240c9626b6026a3d677c27d2f6e6ce25f77 Mon Sep 17 00:00:00 2001
From b036bfcd8aa79e0b040aa83b0cc1983e3afe679f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 18 Oct 2019 22:19:31 -0500
Subject: [PATCH] Expose getItemStack for Trident

2
patches/api/0022-Add-more-llama-API.patch → patches/api/0021-Add-more-llama-API.patch
View File

@@ -1,4 +1,4 @@
From e063ff17a0d1999d1e2c5df0b9854c9b6d19b32f Mon Sep 17 00:00:00 2001
From 5dbf64e9ba5558297cbc7584e973926d6fbe073f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 18 Oct 2019 22:50:05 -0500
Subject: [PATCH] Add more llama API

2
patches/api/0023-Add-more-evoker-API.patch → patches/api/0022-Add-more-evoker-API.patch
View File

@@ -1,4 +1,4 @@
From d3f0f04f84e7ede322ace349254a61cc3e7cb349 Mon Sep 17 00:00:00 2001
From 5a78f176845e8317a91657d10012218362479e06 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:28:53 -0500
Subject: [PATCH] Add more evoker API

2
patches/api/0024-Add-getPlacementBlockData-to-World.patch → patches/api/0023-Add-getPlacementBlockData-to-World.patch
View File

@@ -1,4 +1,4 @@
From da805501e85eb43e4d89693f7116ecc95fb3aa2c Mon Sep 17 00:00:00 2001
From 01653647955c1bcb951cf78ffd53e96691032aad Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:34:36 -0500
Subject: [PATCH] Add getPlacementBlockData to World

2
patches/api/0025-Add-playPickupItemAnimation-to-LivingEntity.patch → patches/api/0024-Add-playPickupItemAnimation-to-LivingEntity.patch
View File

@@ -1,4 +1,4 @@
From 42cfdbc72c16463dd1425698390a833e3897a16c Mon Sep 17 00:00:00 2001
From 1e19760c6229130f4ac3251e96812a7b48f45c2f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 02:25:05 -0500
Subject: [PATCH] Add playPickupItemAnimation to LivingEntity

2
patches/api/0026-Add-getPlayer-to-SkeletonHorseTrapEvent.patch → patches/api/0025-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
View File

@@ -1,4 +1,4 @@
From 5d02f8f0e45d9b702f4b9af577ba96597e671eda Mon Sep 17 00:00:00 2001
From 2d430ee7eddeccfec313ff6b233cd21610d43268 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 02:35:24 -0500
Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent

2
patches/api/0027-Add-LootableInventoryFirstFillEvent.patch → patches/api/0026-Add-LootableInventoryFirstFillEvent.patch
View File

@@ -1,4 +1,4 @@
From 5ab2d114a2e7670385dbc009fa4003fd33128328 Mon Sep 17 00:00:00 2001
From d791d6fabb76c20a61628b1385c9fd4082e4182a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 02:43:10 -0500
Subject: [PATCH] Add LootableInventoryFirstFillEvent

2
patches/api/0028-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch → patches/api/0027-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch
View File

@@ -1,4 +1,4 @@
From 7585dec7e71ded381ac4e47354e34bf1d0899b86 Mon Sep 17 00:00:00 2001
From b1d25612377cabaa13d2283f99ecf369edb75d5e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 03:53:46 -0500
Subject: [PATCH] Add back EntityCreatePortalEvent for EnderDragon

2
patches/api/0029-Implement-EntityMoveEvent.patch → patches/api/0028-Implement-EntityMoveEvent.patch
View File

@@ -1,4 +1,4 @@
From 019520dabc7b0c2aa506fd02575b5ecaa7f90071 Mon Sep 17 00:00:00 2001
From bff9840823ea00fc90f1a46db26fb66edbc053df Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 11 Feb 2020 21:56:38 -0600
Subject: [PATCH] Implement EntityMoveEvent

2
patches/api/0030-Add-ItemStack-convenience-methods.patch → patches/api/0029-Add-ItemStack-convenience-methods.patch
View File

@@ -1,4 +1,4 @@
From da8df9256caea27c4fc9e9298878e1d1428fe6a1 Mon Sep 17 00:00:00 2001
From 5604fc9655a277f14d6796ea3dd49bc34af8ab7b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 15 Mar 2020 20:52:12 -0500
Subject: [PATCH] Add ItemStack convenience methods

2
patches/api/0031-Add-BellRingEvent.patch → patches/api/0030-Add-BellRingEvent.patch
View File

@@ -1,4 +1,4 @@
From 179348f81a08cc70fc0ba7f2e72ced6222a0ac38 Mon Sep 17 00:00:00 2001
From 1af4daf9a5234c33b5e3d53c401ffacf74179d8f Mon Sep 17 00:00:00 2001
From: Eearslya Sleiarion <eearslya@gmail.com>
Date: Mon, 24 Jun 2019 21:27:39 -0700
Subject: [PATCH] Add BellRingEvent

2
patches/api/0032-Configurable-enchantment-max-level.patch → patches/api/0031-Configurable-enchantment-max-level.patch
View File

@@ -1,4 +1,4 @@
From 05f331fbdeffe82858cc827f452ca3458108921e Mon Sep 17 00:00:00 2001
From 8746ada205f89722c0e8c2aefb2a7f812a1493e1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 1 Apr 2020 19:18:29 -0500
Subject: [PATCH] Configurable enchantment max level

8
patches/api/0033-More-anvil-controls.patch → patches/api/0032-More-anvil-controls.patch
View File

@@ -1,4 +1,4 @@
From 1f9945fb4f4524e6faf06b2b374a3c4a66aaf80b Mon Sep 17 00:00:00 2001
From 2d9b148d0e16c2ac73a972d8d6cb418d51c77dba Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 19 Apr 2020 00:25:09 -0500
Subject: [PATCH] More anvil controls
@@ -13,7 +13,7 @@ Subject: [PATCH] More anvil controls
diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
new file mode 100644
index 00000000..85663c0a
index 000000000..85663c0a4
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
@@ -0,0 +1,52 @@
@@ -71,7 +71,7 @@ index 00000000..85663c0a
+}
diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
new file mode 100644
index 00000000..2717ad82
index 000000000..2717ad82c
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
@@ -0,0 +1,35 @@
@@ -111,7 +111,7 @@ index 00000000..2717ad82
+ }
+}
diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java
index b95e563b..435026e5 100644
index b95e563b5..435026e53 100644
--- a/src/main/java/org/bukkit/inventory/AnvilInventory.java
+++ b/src/main/java/org/bukkit/inventory/AnvilInventory.java
@@ -109,4 +109,14 @@ public interface AnvilInventory extends Inventory {

6
patches/api/0034-PlayerItemCooldownEvent.patch → patches/api/0033-PlayerItemCooldownEvent.patch
View File

@@ -1,4 +1,4 @@
From f4a853766da3be371ba55bba97c3e8b2f0aaefd9 Mon Sep 17 00:00:00 2001
From 37126b7796f37bc747b9f00439100a87e31c7efb Mon Sep 17 00:00:00 2001
From: KennyTV <kennytv@t-online.de>
Date: Mon, 20 Apr 2020 13:57:13 +0200
Subject: [PATCH] PlayerItemCooldownEvent
@@ -10,7 +10,7 @@ Subject: [PATCH] PlayerItemCooldownEvent
diff --git a/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java
new file mode 100644
index 00000000..ffc2512e
index 000000000..2002909f3
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java
@@ -0,0 +1,77 @@
@@ -92,5 +92,5 @@ index 00000000..ffc2512e
+ }
+}
--
2.26.1.windows.1
2.24.0

4
patches/api/0035-Player-invulnerabilities.patch → patches/api/0034-Player-invulnerabilities.patch
View File

@@ -1,4 +1,4 @@
From 017455c2e28e6237b63a1b5d7ffb95a2a9efd334 Mon Sep 17 00:00:00 2001
From 8eadbbe8b0c05341045d3cdb76946da3112b6957 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 2 May 2020 20:55:31 -0500
Subject: [PATCH] Player invulnerabilities
@@ -8,7 +8,7 @@ Subject: [PATCH] Player invulnerabilities
1 file changed, 21 insertions(+)
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index edc48117..5d77b71d 100644
index edc481170..5d77b71d1 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1850,5 +1850,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

20
patches/server/0001-Rebrand.patch
View File

@@ -1,4 +1,4 @@
From fad7117f1f0a960e444b059b3ef72357a008826e Mon Sep 17 00:00:00 2001
From a7ce770713962d590d3f52703ad66ae10465a8a4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:02:11 -0500
Subject: [PATCH] Rebrand
@@ -15,7 +15,7 @@ Subject: [PATCH] Rebrand
create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
diff --git a/pom.xml b/pom.xml
index e4c63bb76..d5709e670 100644
index e4c63bb76c..d5709e670b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
@@ -94,7 +94,7 @@ index e4c63bb76..d5709e670 100644
</configuration>
<executions>
diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
index cd6e25923..bb227bc0f 100644
index cd6e259239..bb227bc0fb 100644
--- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
+++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
@@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
@@ -107,10 +107,10 @@ index cd6e25923..bb227bc0f 100644
);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5b24de6d6..5cd342eda 100644
index 395e5034ea..d7e29a59de 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1559,7 +1559,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1561,7 +1561,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {
@@ -121,7 +121,7 @@ index 5b24de6d6..5cd342eda 100644
public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
new file mode 100644
index 000000000..d8b408f06
index 0000000000..d8b408f061
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
@@ -0,0 +1,115 @@
@@ -241,7 +241,7 @@ index 000000000..d8b408f06
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 894917c88..648dde01a 100644
index 894917c889..648dde01a7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -205,7 +205,7 @@ import javax.annotation.Nullable; // Paper
@@ -254,10 +254,10 @@ index 894917c88..648dde01a 100644
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index b58f2ef5c..fefa718df 100644
index 004b6ce132..e1cfde4ffc 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -306,7 +306,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -312,7 +312,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
@@ -267,7 +267,7 @@ index b58f2ef5c..fefa718df 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 674096cab..e9aee2d8a 100644
index 674096cab1..e9aee2d8a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -11,7 +11,7 @@ public final class Versioning {

20
patches/server/0002-Purpur-config-files.patch
View File

@@ -1,4 +1,4 @@
From 6e736c2a7977666d82fb9e69db0d05f1608b0b7f Mon Sep 17 00:00:00 2001
From 13430809585e2fb2d3669d172f8f9efaccec5609 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 18:09:43 -0500
Subject: [PATCH] Purpur config files
@@ -18,7 +18,7 @@ Subject: [PATCH] Purpur config files
create mode 100644 src/main/java/net/pl3x/purpur/command/PurpurCommand.java
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
index 24641501a..b767dd1d0 100644
index 24641501ae..b767dd1d04 100644
--- a/src/main/java/com/destroystokyo/paper/Metrics.java
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -581,7 +581,7 @@ public class Metrics {
@@ -42,7 +42,7 @@ index 24641501a..b767dd1d0 100644
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index b07c49f1b..cf5abd393 100644
index b07c49f1b4..cf5abd393e 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
@@ -62,7 +62,7 @@ index b07c49f1b..cf5abd393 100644
// Paper end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 561b42472..6ada23918 100644
index 9de505d01f..f97b304ade 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -85,6 +85,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -80,10 +80,10 @@ index 561b42472..6ada23918 100644
+ this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig(worlddata.getName(), this.paperConfig, this.spigotConfig); // Purpur
this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
this.generator = gen;
dimensionmanager.world = (WorldServer) this; // Paper
if (dimensionmanager.world == null) dimensionmanager.world = (WorldServer) this; // Paper
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..333c880bf
index 0000000000..333c880bf2
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,130 @@
@@ -219,7 +219,7 @@ index 000000000..333c880bf
+}
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 @@
@@ -292,7 +292,7 @@ index 000000000..eda37fa43
+}
diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
new file mode 100644
index 000000000..7d983d9a5
index 0000000000..7d983d9a54
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
@@ -0,0 +1,67 @@
@@ -364,7 +364,7 @@ index 000000000..7d983d9a5
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 648dde01a..64f1190b0 100644
index 648dde01a7..64f1190b03 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -815,6 +815,7 @@ public final class CraftServer implements Server {
@@ -411,7 +411,7 @@ index 648dde01a..64f1190b0 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 ffee0c5dd..f4626daed 100644
index d6e5d014c0..17ebc84f51 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -139,6 +139,14 @@ public class Main {

62
patches/server/0003-Timings-stuff.patch Normal file
View File

@@ -0,0 +1,62 @@
From b13286b4d4b42daa6cbe690825f9e1a7ee2b5299 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 5 Jun 2020 21:30:19 -0500
Subject: [PATCH] Timings stuff
---
.../java/co/aikar/timings/TimingsExport.java | 25 ++++++++++++++++---
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index a3b41ce5fc..4a9e7fd92c 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -227,9 +227,13 @@ public class TimingsExport extends Thread {
// Information on the users Config
parent.put("config", createObject(
- pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
- pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
+ // Purpur start
+ pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())),
+ pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
+ pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
+ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
+ pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
+ // Purpur end
));
new TimingsExport(listeners, parent, history).start();
@@ -270,6 +274,19 @@ public class TimingsExport extends Thread {
return timingsCost;
}
+ // Purpur start
+ private static JSONObject mapAsJSON(java.util.Properties properties) {
+ JSONObject object = new JSONObject();
+ for (String key : properties.stringPropertyNames()) {
+ if (TimingsManager.hiddenConfigs.contains(key)) {
+ continue;
+ }
+ object.put(key, valAsJSON(properties.get(key), key));
+ }
+ return object;
+ }
+ // Purpur end
+
private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) {
JSONObject object = new JSONObject();
@@ -306,7 +323,7 @@ public class TimingsExport extends Thread {
String response = null;
String timingsURL = null;
try {
- HttpURLConnection con = (HttpURLConnection) new URL("http://timings.aikar.co/post").openConnection();
+ HttpURLConnection con = (HttpURLConnection) new URL(Bukkit.spigot().getPurpurConfig().getString("settings.timings.url", "https://timings.pl3x.net") + "/post").openConnection(); // Purpur
con.setDoOutput(true);
String hostName = "BrokenHost";
try {
--
2.24.0

178
patches/server/0003-decompile-fixes.patch → patches/server/0004-decompile-fixes.patch
View File

@@ -1,4 +1,4 @@
From 6a3e2bccab2447deb3903835280a9fd6f83d8c3c Mon Sep 17 00:00:00 2001
From 809dfebb0fe424318cf3d7efc6cf646d3edcd347 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 27 Feb 2020 13:39:06 -0600
Subject: [PATCH] decompile-fixes
@@ -95,7 +95,7 @@ Subject: [PATCH] decompile-fixes
88 files changed, 227 insertions(+), 233 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungle.java b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
index de831ed87..9c38f8907 100644
index de831ed87e..9c38f8907a 100644
--- a/src/main/java/net/minecraft/server/BiomeBambooJungle.java
+++ b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
@@ -4,9 +4,9 @@ public class BiomeBambooJungle extends BiomeBase {
@@ -112,7 +112,7 @@ index de831ed87..9c38f8907 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java b/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
index 5ae19373d..2a6dafccd 100644
index 5ae19373d6..2a6dafccdd 100644
--- a/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
+++ b/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
@@ -4,9 +4,9 @@ public final class BiomeBambooJungleHills extends BiomeBase {
@@ -129,7 +129,7 @@ index 5ae19373d..2a6dafccd 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeBeach.java b/src/main/java/net/minecraft/server/BiomeBeach.java
index 262740414..f4e9345ae 100644
index 2627404141..f4e9345aeb 100644
--- a/src/main/java/net/minecraft/server/BiomeBeach.java
+++ b/src/main/java/net/minecraft/server/BiomeBeach.java
@@ -4,9 +4,9 @@ public final class BiomeBeach extends BiomeBase {
@@ -146,7 +146,7 @@ index 262740414..f4e9345ae 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeBigHills.java b/src/main/java/net/minecraft/server/BiomeBigHills.java
index a42098da5..58c30f652 100644
index a42098da5c..58c30f6523 100644
--- a/src/main/java/net/minecraft/server/BiomeBigHills.java
+++ b/src/main/java/net/minecraft/server/BiomeBigHills.java
@@ -4,8 +4,8 @@ public final class BiomeBigHills extends BiomeBase {
@@ -161,7 +161,7 @@ index a42098da5..58c30f652 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeBirchForest.java b/src/main/java/net/minecraft/server/BiomeBirchForest.java
index 27fa23801..9437438c8 100644
index 27fa238013..9437438c82 100644
--- a/src/main/java/net/minecraft/server/BiomeBirchForest.java
+++ b/src/main/java/net/minecraft/server/BiomeBirchForest.java
@@ -4,8 +4,8 @@ public final class BiomeBirchForest extends BiomeBase {
@@ -176,7 +176,7 @@ index 27fa23801..9437438c8 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHills.java b/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
index 51b1d39f5..3e5c23d31 100644
index 51b1d39f53..3e5c23d31e 100644
--- a/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
+++ b/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
@@ -4,8 +4,8 @@ public final class BiomeBirchForestHills extends BiomeBase {
@@ -191,7 +191,7 @@ index 51b1d39f5..3e5c23d31 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
index b74f23cff..d5eb5c91c 100644
index b74f23cff6..d5eb5c91c4 100644
--- a/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
@@ -4,8 +4,8 @@ public final class BiomeBirchForestHillsMutated extends BiomeBase {
@@ -206,7 +206,7 @@ index b74f23cff..d5eb5c91c 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
index 17fe3818d..e805f9568 100644
index 17fe3818dd..e805f9568e 100644
--- a/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
@@ -4,8 +4,8 @@ public final class BiomeBirchForestMutated extends BiomeBase {
@@ -221,7 +221,7 @@ index 17fe3818d..e805f9568 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeColdBeach.java b/src/main/java/net/minecraft/server/BiomeColdBeach.java
index 2c230be98..1b92f4567 100644
index 2c230be98f..1b92f4567d 100644
--- a/src/main/java/net/minecraft/server/BiomeColdBeach.java
+++ b/src/main/java/net/minecraft/server/BiomeColdBeach.java
@@ -4,9 +4,9 @@ public final class BiomeColdBeach extends BiomeBase {
@@ -238,7 +238,7 @@ index 2c230be98..1b92f4567 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java b/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
index d96e820e0..b9a5cb63a 100644
index d96e820e07..b9a5cb63a4 100644
--- a/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
@@ -4,10 +4,10 @@ public class BiomeColdDeepOcean extends BiomeBase {
@@ -266,7 +266,7 @@ index d96e820e0..b9a5cb63a 100644
BiomeDecoratorGroups.ah(this);
BiomeDecoratorGroups.ap(this);
diff --git a/src/main/java/net/minecraft/server/BiomeColdOcean.java b/src/main/java/net/minecraft/server/BiomeColdOcean.java
index c7ed2e134..571c3d139 100644
index c7ed2e134a..571c3d139d 100644
--- a/src/main/java/net/minecraft/server/BiomeColdOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeColdOcean.java
@@ -4,9 +4,9 @@ public class BiomeColdOcean extends BiomeBase {
@@ -292,7 +292,7 @@ index c7ed2e134..571c3d139 100644
BiomeDecoratorGroups.ah(this);
BiomeDecoratorGroups.ap(this);
diff --git a/src/main/java/net/minecraft/server/BiomeColdTaiga.java b/src/main/java/net/minecraft/server/BiomeColdTaiga.java
index c766dedfa..88400e77b 100644
index c766dedfa9..88400e77bf 100644
--- a/src/main/java/net/minecraft/server/BiomeColdTaiga.java
+++ b/src/main/java/net/minecraft/server/BiomeColdTaiga.java
@@ -4,9 +4,9 @@ public final class BiomeColdTaiga extends BiomeBase {
@@ -309,7 +309,7 @@ index c766dedfa..88400e77b 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java b/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
index 187f11f58..8a8fc7dbd 100644
index 187f11f584..8a8fc7dbd2 100644
--- a/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
+++ b/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
@@ -4,8 +4,8 @@ public final class BiomeColdTaigaHills extends BiomeBase {
@@ -324,7 +324,7 @@ index 187f11f58..8a8fc7dbd 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
index 97c56fb80..327e6847f 100644
index 97c56fb803..327e6847f0 100644
--- a/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
@@ -4,8 +4,8 @@ public final class BiomeColdTaigaMutated extends BiomeBase {
@@ -339,7 +339,7 @@ index 97c56fb80..327e6847f 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeDeepOcean.java b/src/main/java/net/minecraft/server/BiomeDeepOcean.java
index bea129314..651d44cb3 100644
index bea1293144..651d44cb37 100644
--- a/src/main/java/net/minecraft/server/BiomeDeepOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeDeepOcean.java
@@ -4,10 +4,10 @@ public final class BiomeDeepOcean extends BiomeBase {
@@ -367,7 +367,7 @@ index bea129314..651d44cb3 100644
BiomeDecoratorGroups.ah(this);
BiomeDecoratorGroups.ap(this);
diff --git a/src/main/java/net/minecraft/server/BiomeDesert.java b/src/main/java/net/minecraft/server/BiomeDesert.java
index 7a8784f18..257732dad 100644
index 7a8784f18a..257732dad7 100644
--- a/src/main/java/net/minecraft/server/BiomeDesert.java
+++ b/src/main/java/net/minecraft/server/BiomeDesert.java
@@ -4,11 +4,11 @@ public final class BiomeDesert extends BiomeBase {
@@ -388,7 +388,7 @@ index 7a8784f18..257732dad 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.e(this);
diff --git a/src/main/java/net/minecraft/server/BiomeDesertHills.java b/src/main/java/net/minecraft/server/BiomeDesertHills.java
index 9f5e9abc4..3752fc450 100644
index 9f5e9abc41..3752fc4509 100644
--- a/src/main/java/net/minecraft/server/BiomeDesertHills.java
+++ b/src/main/java/net/minecraft/server/BiomeDesertHills.java
@@ -4,9 +4,9 @@ public final class BiomeDesertHills extends BiomeBase {
@@ -405,7 +405,7 @@ index 9f5e9abc4..3752fc450 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.e(this);
diff --git a/src/main/java/net/minecraft/server/BiomeDesertMutated.java b/src/main/java/net/minecraft/server/BiomeDesertMutated.java
index f79e438dc..1a0b56932 100644
index f79e438dc4..1a0b569322 100644
--- a/src/main/java/net/minecraft/server/BiomeDesertMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeDesertMutated.java
@@ -4,8 +4,8 @@ public final class BiomeDesertMutated extends BiomeBase {
@@ -420,7 +420,7 @@ index f79e438dc..1a0b56932 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.e(this);
diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
index 58a612528..8e19e0688 100644
index 58a6125289..8e19e06889 100644
--- a/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
+++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
@@ -4,8 +4,8 @@ public final class BiomeExtremeHillsEdge extends BiomeBase {
@@ -435,7 +435,7 @@ index 58a612528..8e19e0688 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
index cd18533bb..69d4880c7 100644
index cd18533bb0..69d4880c74 100644
--- a/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
@@ -4,8 +4,8 @@ public final class BiomeExtremeHillsMutated extends BiomeBase {
@@ -450,7 +450,7 @@ index cd18533bb..69d4880c7 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
index 2c7f5940a..7661d5316 100644
index 2c7f5940a4..7661d53161 100644
--- a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
+++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
@@ -4,8 +4,8 @@ public final class BiomeExtremeHillsWithTrees extends BiomeBase {
@@ -465,7 +465,7 @@ index 2c7f5940a..7661d5316 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
index 6e33c2363..05418f8fa 100644
index 6e33c23632..05418f8fa1 100644
--- a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
@@ -4,8 +4,8 @@ public final class BiomeExtremeHillsWithTreesMutated extends BiomeBase {
@@ -480,7 +480,7 @@ index 6e33c2363..05418f8fa 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeFlowerForest.java b/src/main/java/net/minecraft/server/BiomeFlowerForest.java
index c6ac9506a..1d3f62432 100644
index c6ac9506a7..1d3f624323 100644
--- a/src/main/java/net/minecraft/server/BiomeFlowerForest.java
+++ b/src/main/java/net/minecraft/server/BiomeFlowerForest.java
@@ -6,18 +6,18 @@ public final class BiomeFlowerForest extends BiomeBase {
@@ -508,7 +508,7 @@ index c6ac9506a..1d3f62432 100644
BiomeDecoratorGroups.Z(this);
BiomeDecoratorGroups.aa(this);
diff --git a/src/main/java/net/minecraft/server/BiomeForest.java b/src/main/java/net/minecraft/server/BiomeForest.java
index 570a1f66f..e849b411c 100644
index 570a1f66f3..e849b411c6 100644
--- a/src/main/java/net/minecraft/server/BiomeForest.java
+++ b/src/main/java/net/minecraft/server/BiomeForest.java
@@ -4,9 +4,9 @@ public final class BiomeForest extends BiomeBase {
@@ -525,7 +525,7 @@ index 570a1f66f..e849b411c 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeForestHills.java b/src/main/java/net/minecraft/server/BiomeForestHills.java
index 8179e1c60..f7dea38eb 100644
index 8179e1c603..f7dea38eb3 100644
--- a/src/main/java/net/minecraft/server/BiomeForestHills.java
+++ b/src/main/java/net/minecraft/server/BiomeForestHills.java
@@ -4,9 +4,9 @@ public final class BiomeForestHills extends BiomeBase {
@@ -542,7 +542,7 @@ index 8179e1c60..f7dea38eb 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
index 852c4bd9a..67d120bef 100644
index 852c4bd9ab..67d120bef2 100644
--- a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
@@ -6,10 +6,10 @@ public class BiomeFrozenDeepOcean extends BiomeBase {
@@ -561,7 +561,7 @@ index 852c4bd9a..67d120bef 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
index 3d649c600..2772bc6da 100644
index 3d649c6004..2772bc6dac 100644
--- a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
@@ -6,9 +6,9 @@ public final class BiomeFrozenOcean extends BiomeBase {
@@ -578,7 +578,7 @@ index 3d649c600..2772bc6da 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeFrozenRiver.java b/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
index 915f20042..4be53fc0f 100644
index 915f20042b..4be53fc0f6 100644
--- a/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
+++ b/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
@@ -4,7 +4,7 @@ public final class BiomeFrozenRiver extends BiomeBase {
@@ -591,7 +591,7 @@ index 915f20042..4be53fc0f 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeHell.java b/src/main/java/net/minecraft/server/BiomeHell.java
index f9ca6b889..888dfcd8d 100644
index f9ca6b889a..888dfcd8d4 100644
--- a/src/main/java/net/minecraft/server/BiomeHell.java
+++ b/src/main/java/net/minecraft/server/BiomeHell.java
@@ -4,20 +4,20 @@ public final class BiomeHell extends BiomeBase {
@@ -629,7 +629,7 @@ index f9ca6b889..888dfcd8d 100644
this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ZOMBIE_PIGMAN, 100, 4, 4));
this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.MAGMA_CUBE, 2, 4, 4));
diff --git a/src/main/java/net/minecraft/server/BiomeIceMountains.java b/src/main/java/net/minecraft/server/BiomeIceMountains.java
index d5033de8a..ad9b4efe0 100644
index d5033de8aa..ad9b4efe09 100644
--- a/src/main/java/net/minecraft/server/BiomeIceMountains.java
+++ b/src/main/java/net/minecraft/server/BiomeIceMountains.java
@@ -4,8 +4,8 @@ public final class BiomeIceMountains extends BiomeBase {
@@ -644,7 +644,7 @@ index d5033de8a..ad9b4efe0 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeIcePlains.java b/src/main/java/net/minecraft/server/BiomeIcePlains.java
index 054b0e0ab..71606b0a7 100644
index 054b0e0ab1..71606b0a71 100644
--- a/src/main/java/net/minecraft/server/BiomeIcePlains.java
+++ b/src/main/java/net/minecraft/server/BiomeIcePlains.java
@@ -4,11 +4,11 @@ public final class BiomeIcePlains extends BiomeBase {
@@ -665,7 +665,7 @@ index 054b0e0ab..71606b0a7 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java b/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
index 44c410f75..984f94bb5 100644
index 44c410f75c..984f94bb59 100644
--- a/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
+++ b/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
@@ -4,14 +4,14 @@ public final class BiomeIcePlainsSpikes extends BiomeBase {
@@ -688,7 +688,7 @@ index 44c410f75..984f94bb5 100644
BiomeDecoratorGroups.h(this);
BiomeDecoratorGroups.l(this);
diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java
index 2f893ce91..95e501996 100644
index 2f893ce918..95e5019968 100644
--- a/src/main/java/net/minecraft/server/BiomeJungle.java
+++ b/src/main/java/net/minecraft/server/BiomeJungle.java
@@ -4,9 +4,9 @@ public final class BiomeJungle extends BiomeBase {
@@ -705,7 +705,7 @@ index 2f893ce91..95e501996 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdge.java b/src/main/java/net/minecraft/server/BiomeJungleEdge.java
index 485861785..e624f9764 100644
index 4858617859..e624f9764f 100644
--- a/src/main/java/net/minecraft/server/BiomeJungleEdge.java
+++ b/src/main/java/net/minecraft/server/BiomeJungleEdge.java
@@ -4,8 +4,8 @@ public final class BiomeJungleEdge extends BiomeBase {
@@ -720,7 +720,7 @@ index 485861785..e624f9764 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java b/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
index a957f6124..1fe9c840a 100644
index a957f6124b..1fe9c840a7 100644
--- a/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
@@ -4,8 +4,8 @@ public final class BiomeJungleEdgeMutated extends BiomeBase {
@@ -735,7 +735,7 @@ index a957f6124..1fe9c840a 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeJungleHills.java b/src/main/java/net/minecraft/server/BiomeJungleHills.java
index 7b9bc967a..e2970ab00 100644
index 7b9bc967a9..e2970ab00e 100644
--- a/src/main/java/net/minecraft/server/BiomeJungleHills.java
+++ b/src/main/java/net/minecraft/server/BiomeJungleHills.java
@@ -4,9 +4,9 @@ public final class BiomeJungleHills extends BiomeBase {
@@ -752,7 +752,7 @@ index 7b9bc967a..e2970ab00 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeJungleMutated.java b/src/main/java/net/minecraft/server/BiomeJungleMutated.java
index 02246950d..ffe6b4344 100644
index 02246950d0..ffe6b4344e 100644
--- a/src/main/java/net/minecraft/server/BiomeJungleMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeJungleMutated.java
@@ -4,8 +4,8 @@ public final class BiomeJungleMutated extends BiomeBase {
@@ -767,7 +767,7 @@ index 02246950d..ffe6b4344 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
index e6d4a2c39..b23c43305 100644
index e6d4a2c397..b23c43305b 100644
--- a/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
@@ -4,10 +4,10 @@ public class BiomeLukewarmDeepOcean extends BiomeBase {
@@ -786,7 +786,7 @@ index e6d4a2c39..b23c43305 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
index f2dc5d1b5..efcb11bbe 100644
index f2dc5d1b5c..efcb11bbe8 100644
--- a/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
@@ -4,9 +4,9 @@ public class BiomeLukewarmOcean extends BiomeBase {
@@ -803,7 +803,7 @@ index f2dc5d1b5..efcb11bbe 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
index f6ec90c2d..328e939a6 100644
index f6ec90c2d0..328e939a6f 100644
--- a/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
+++ b/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
@@ -4,8 +4,8 @@ public final class BiomeMegaSpruceTaiga extends BiomeBase {
@@ -818,7 +818,7 @@ index f6ec90c2d..328e939a6 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
index e9ad930d8..36bea710a 100644
index e9ad930d88..36bea710a0 100644
--- a/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
+++ b/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
@@ -4,8 +4,8 @@ public final class BiomeMegaTaiga extends BiomeBase {
@@ -833,7 +833,7 @@ index e9ad930d8..36bea710a 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java b/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
index cdc182c22..22474d682 100644
index cdc182c229..22474d682a 100644
--- a/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
+++ b/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
@@ -4,8 +4,8 @@ public final class BiomeMegaTaigaHills extends BiomeBase {
@@ -848,7 +848,7 @@ index cdc182c22..22474d682 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMesa.java b/src/main/java/net/minecraft/server/BiomeMesa.java
index 95e602a95..65d606d51 100644
index 95e602a95f..65d606d51c 100644
--- a/src/main/java/net/minecraft/server/BiomeMesa.java
+++ b/src/main/java/net/minecraft/server/BiomeMesa.java
@@ -4,8 +4,8 @@ public final class BiomeMesa extends BiomeBase {
@@ -863,7 +863,7 @@ index 95e602a95..65d606d51 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMesaBryce.java b/src/main/java/net/minecraft/server/BiomeMesaBryce.java
index 57ef10afb..5ecec62f1 100644
index 57ef10afb0..5ecec62f18 100644
--- a/src/main/java/net/minecraft/server/BiomeMesaBryce.java
+++ b/src/main/java/net/minecraft/server/BiomeMesaBryce.java
@@ -4,8 +4,8 @@ public final class BiomeMesaBryce extends BiomeBase {
@@ -878,7 +878,7 @@ index 57ef10afb..5ecec62f1 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
index b9f81a044..14d4bd312 100644
index b9f81a044f..14d4bd312e 100644
--- a/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
+++ b/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
@@ -4,8 +4,8 @@ public final class BiomeMesaPlataeu extends BiomeBase {
@@ -893,7 +893,7 @@ index b9f81a044..14d4bd312 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
index 3ce8d3cef..b5dab9d2a 100644
index 3ce8d3cef5..b5dab9d2aa 100644
--- a/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
+++ b/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
@@ -4,8 +4,8 @@ public final class BiomeMesaPlataeuClear extends BiomeBase {
@@ -908,7 +908,7 @@ index 3ce8d3cef..b5dab9d2a 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
index 88b7b3746..d05cc38b5 100644
index 88b7b37467..d05cc38b5e 100644
--- a/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
@@ -4,8 +4,8 @@ public final class BiomeMesaPlateauClearMutated extends BiomeBase {
@@ -923,7 +923,7 @@ index 88b7b3746..d05cc38b5 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
index 7254bcf3e..21a77ee81 100644
index 7254bcf3e5..21a77ee812 100644
--- a/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
@@ -4,8 +4,8 @@ public final class BiomeMesaPlateauMutated extends BiomeBase {
@@ -938,7 +938,7 @@ index 7254bcf3e..21a77ee81 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java b/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
index 58bc1f234..0302efbdc 100644
index 58bc1f2343..0302efbdc7 100644
--- a/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
+++ b/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
@@ -4,8 +4,8 @@ public final class BiomeMushroomIslandShore extends BiomeBase {
@@ -953,7 +953,7 @@ index 58bc1f234..0302efbdc 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMushrooms.java b/src/main/java/net/minecraft/server/BiomeMushrooms.java
index cb620014b..51f92584b 100644
index cb620014b7..51f92584b8 100644
--- a/src/main/java/net/minecraft/server/BiomeMushrooms.java
+++ b/src/main/java/net/minecraft/server/BiomeMushrooms.java
@@ -4,8 +4,8 @@ public final class BiomeMushrooms extends BiomeBase {
@@ -968,7 +968,7 @@ index cb620014b..51f92584b 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeOcean.java b/src/main/java/net/minecraft/server/BiomeOcean.java
index fd7e99106..ad9628b2a 100644
index fd7e991062..ad9628b2aa 100644
--- a/src/main/java/net/minecraft/server/BiomeOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeOcean.java
@@ -4,9 +4,9 @@ public final class BiomeOcean extends BiomeBase {
@@ -994,7 +994,7 @@ index fd7e99106..ad9628b2a 100644
BiomeDecoratorGroups.ah(this);
BiomeDecoratorGroups.ap(this);
diff --git a/src/main/java/net/minecraft/server/BiomePlains.java b/src/main/java/net/minecraft/server/BiomePlains.java
index efbb36d01..ff6090e3c 100644
index efbb36d016..ff6090e3c1 100644
--- a/src/main/java/net/minecraft/server/BiomePlains.java
+++ b/src/main/java/net/minecraft/server/BiomePlains.java
@@ -4,10 +4,10 @@ public final class BiomePlains extends BiomeBase {
@@ -1013,7 +1013,7 @@ index efbb36d01..ff6090e3c 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java b/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
index 7804a4e32..a28222eb1 100644
index 7804a4e329..a28222eb1d 100644
--- a/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
@@ -4,8 +4,8 @@ public final class BiomeRedwoodTaigaHillsMutated extends BiomeBase {
@@ -1028,7 +1028,7 @@ index 7804a4e32..a28222eb1 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeRiver.java b/src/main/java/net/minecraft/server/BiomeRiver.java
index 6522c8021..b84b868b1 100644
index 6522c80214..b84b868b1a 100644
--- a/src/main/java/net/minecraft/server/BiomeRiver.java
+++ b/src/main/java/net/minecraft/server/BiomeRiver.java
@@ -4,7 +4,7 @@ public final class BiomeRiver extends BiomeBase {
@@ -1050,7 +1050,7 @@ index 6522c8021..b84b868b1 100644
this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SQUID, 2, 1, 4));
this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SALMON, 5, 1, 5));
diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForest.java b/src/main/java/net/minecraft/server/BiomeRoofedForest.java
index 30d680224..16bcf9bff 100644
index 30d6802242..16bcf9bff0 100644
--- a/src/main/java/net/minecraft/server/BiomeRoofedForest.java
+++ b/src/main/java/net/minecraft/server/BiomeRoofedForest.java
@@ -6,14 +6,14 @@ public final class BiomeRoofedForest extends BiomeBase {
@@ -1073,7 +1073,7 @@ index 30d680224..16bcf9bff 100644
BiomeDecoratorGroups.g(this);
BiomeDecoratorGroups.h(this);
diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java b/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
index 5c9ab0864..9fa84c87f 100644
index 5c9ab0864e..9fa84c87fa 100644
--- a/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
@@ -6,14 +6,14 @@ public final class BiomeRoofedForestMutated extends BiomeBase {
@@ -1096,7 +1096,7 @@ index 5c9ab0864..9fa84c87f 100644
BiomeDecoratorGroups.g(this);
BiomeDecoratorGroups.h(this);
diff --git a/src/main/java/net/minecraft/server/BiomeSavanna.java b/src/main/java/net/minecraft/server/BiomeSavanna.java
index e023898b3..c12a89016 100644
index e023898b38..c12a890165 100644
--- a/src/main/java/net/minecraft/server/BiomeSavanna.java
+++ b/src/main/java/net/minecraft/server/BiomeSavanna.java
@@ -4,10 +4,10 @@ public final class BiomeSavanna extends BiomeBase {
@@ -1115,7 +1115,7 @@ index e023898b3..c12a89016 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeSavannaMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
index 8a0da661f..db8b20a6c 100644
index 8a0da661fb..db8b20a6c7 100644
--- a/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
@@ -4,8 +4,8 @@ public final class BiomeSavannaMutated extends BiomeBase {
@@ -1130,7 +1130,7 @@ index 8a0da661f..db8b20a6c 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
index 1d2a37a41..2826c510d 100644
index 1d2a37a41e..2826c510d8 100644
--- a/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
+++ b/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
@@ -4,8 +4,8 @@ public final class BiomeSavannaPlateau extends BiomeBase {
@@ -1145,7 +1145,7 @@ index 1d2a37a41..2826c510d 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
index 91e2b5903..e544a8f6b 100644
index 91e2b59037..e544a8f6b9 100644
--- a/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
@@ -4,8 +4,8 @@ public final class BiomeSavannaPlateauMutated extends BiomeBase {
@@ -1160,7 +1160,7 @@ index 91e2b5903..e544a8f6b 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeStoneBeach.java b/src/main/java/net/minecraft/server/BiomeStoneBeach.java
index 501c36649..34660f9f8 100644
index 501c36649e..34660f9f84 100644
--- a/src/main/java/net/minecraft/server/BiomeStoneBeach.java
+++ b/src/main/java/net/minecraft/server/BiomeStoneBeach.java
@@ -4,8 +4,8 @@ public final class BiomeStoneBeach extends BiomeBase {
@@ -1175,7 +1175,7 @@ index 501c36649..34660f9f8 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java b/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
index 62c1cfaef..8815c9590 100644
index 62c1cfaef9..8815c95900 100644
--- a/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
+++ b/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
@@ -4,21 +4,21 @@ public final class BiomeSunflowerPlains extends BiomeBase {
@@ -1206,7 +1206,7 @@ index 62c1cfaef..8815c9590 100644
BiomeDecoratorGroups.ap(this);
this.a(EnumCreatureType.CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SHEEP, 12, 4, 4));
diff --git a/src/main/java/net/minecraft/server/BiomeSwamp.java b/src/main/java/net/minecraft/server/BiomeSwamp.java
index 29e448f5a..02584897e 100644
index 29e448f5ad..02584897e9 100644
--- a/src/main/java/net/minecraft/server/BiomeSwamp.java
+++ b/src/main/java/net/minecraft/server/BiomeSwamp.java
@@ -4,8 +4,8 @@ public final class BiomeSwamp extends BiomeBase {
@@ -1230,7 +1230,7 @@ index 29e448f5a..02584897e 100644
BiomeDecoratorGroups.ap(this);
this.a(EnumCreatureType.CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SHEEP, 12, 4, 4));
diff --git a/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java b/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
index 1352daa25..d85b01b95 100644
index 1352daa258..d85b01b956 100644
--- a/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
@@ -4,7 +4,7 @@ public final class BiomeSwamplandMutated extends BiomeBase {
@@ -1243,7 +1243,7 @@ index 1352daa25..d85b01b95 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeTaiga.java b/src/main/java/net/minecraft/server/BiomeTaiga.java
index 5cd569dcd..ae6e6ca89 100644
index 5cd569dcdd..ae6e6ca896 100644
--- a/src/main/java/net/minecraft/server/BiomeTaiga.java
+++ b/src/main/java/net/minecraft/server/BiomeTaiga.java
@@ -4,10 +4,10 @@ public final class BiomeTaiga extends BiomeBase {
@@ -1262,7 +1262,7 @@ index 5cd569dcd..ae6e6ca89 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeTaigaHills.java b/src/main/java/net/minecraft/server/BiomeTaigaHills.java
index e182f0400..4e19fe5ae 100644
index e182f04008..4e19fe5ae9 100644
--- a/src/main/java/net/minecraft/server/BiomeTaigaHills.java
+++ b/src/main/java/net/minecraft/server/BiomeTaigaHills.java
@@ -4,8 +4,8 @@ public final class BiomeTaigaHills extends BiomeBase {
@@ -1277,7 +1277,7 @@ index e182f0400..4e19fe5ae 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
index 75d46c61d..05e833ffe 100644
index 75d46c61dc..05e833ffed 100644
--- a/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
@@ -4,8 +4,8 @@ public final class BiomeTaigaMutated extends BiomeBase {
@@ -1292,7 +1292,7 @@ index 75d46c61d..05e833ffe 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeTheEnd.java b/src/main/java/net/minecraft/server/BiomeTheEnd.java
index 26fda2cf6..22e9789a3 100644
index 26fda2cf69..22e9789a36 100644
--- a/src/main/java/net/minecraft/server/BiomeTheEnd.java
+++ b/src/main/java/net/minecraft/server/BiomeTheEnd.java
@@ -6,7 +6,7 @@ public final class BiomeTheEnd extends BiomeBase {
@@ -1305,7 +1305,7 @@ index 26fda2cf6..22e9789a3 100644
this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ENDERMAN, 10, 4, 4));
}
diff --git a/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java b/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
index c06512864..a26d56aa4 100644
index c065128649..a26d56aa45 100644
--- a/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
+++ b/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
@@ -4,7 +4,7 @@ public class BiomeTheEndFloatingIslands extends BiomeBase {
@@ -1318,7 +1318,7 @@ index c06512864..a26d56aa4 100644
this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ENDERMAN, 10, 4, 4));
}
diff --git a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
index 90e79b291..e47add3e4 100644
index 90e79b2918..e47add3e43 100644
--- a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
+++ b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
@@ -4,10 +4,10 @@ public class BiomeTheEndHighIsland extends BiomeBase {
@@ -1336,7 +1336,7 @@ index 90e79b291..e47add3e4 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
index c7d5317cc..ec92a8457 100644
index c7d5317cc0..ec92a84579 100644
--- a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
+++ b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
@@ -4,7 +4,7 @@ public class BiomeTheEndMediumIsland extends BiomeBase {
@@ -1349,7 +1349,7 @@ index c7d5317cc..ec92a8457 100644
this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ENDERMAN, 10, 4, 4));
}
diff --git a/src/main/java/net/minecraft/server/BiomeVoid.java b/src/main/java/net/minecraft/server/BiomeVoid.java
index 87fd7e146..c9ba33453 100644
index 87fd7e1467..c9ba334535 100644
--- a/src/main/java/net/minecraft/server/BiomeVoid.java
+++ b/src/main/java/net/minecraft/server/BiomeVoid.java
@@ -4,6 +4,6 @@ public final class BiomeVoid extends BiomeBase {
@@ -1361,7 +1361,7 @@ index 87fd7e146..c9ba33453 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
index 3f8e18a2c..11dc5f637 100644
index 3f8e18a2c7..11dc5f6374 100644
--- a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
@@ -4,10 +4,10 @@ public class BiomeWarmDeepOcean extends BiomeBase {
@@ -1380,7 +1380,7 @@ index 3f8e18a2c..11dc5f637 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeWarmOcean.java b/src/main/java/net/minecraft/server/BiomeWarmOcean.java
index dd7916c09..e4dc7d198 100644
index dd7916c090..e4dc7d198c 100644
--- a/src/main/java/net/minecraft/server/BiomeWarmOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeWarmOcean.java
@@ -6,9 +6,9 @@ public class BiomeWarmOcean extends BiomeBase {
@@ -1409,7 +1409,7 @@ index dd7916c09..e4dc7d198 100644
this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SQUID, 10, 4, 4));
this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.PUFFERFISH, 15, 1, 3));
diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java
index d384e9578..f0d72ea39 100644
index d384e9578a..f0d72ea39d 100644
--- a/src/main/java/net/minecraft/server/CommandDebug.java
+++ b/src/main/java/net/minecraft/server/CommandDebug.java
@@ -25,7 +25,7 @@ public class CommandDebug {
@@ -1422,7 +1422,7 @@ index d384e9578..f0d72ea39 100644
public static void a(com.mojang.brigadier.CommandDispatcher<CommandListenerWrapper> com_mojang_brigadier_commanddispatcher) {
com_mojang_brigadier_commanddispatcher.register((LiteralArgumentBuilder) ((LiteralArgumentBuilder) ((LiteralArgumentBuilder) ((LiteralArgumentBuilder) CommandDispatcher.a("debug").requires((commandlistenerwrapper) -> {
diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java
index 5b1d2c7f5..da6a3fa2c 100644
index 5b1d2c7f50..da6a3fa2c8 100644
--- a/src/main/java/net/minecraft/server/EntityBlaze.java
+++ b/src/main/java/net/minecraft/server/EntityBlaze.java
@@ -24,7 +24,7 @@ public class EntityBlaze extends EntityMonster {
@@ -1435,7 +1435,7 @@ index 5b1d2c7f5..da6a3fa2c 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
index 57af3835e..b3bdc194a 100644
index 57af3835ee..b3bdc194ab 100644
--- a/src/main/java/net/minecraft/server/EntityCat.java
+++ b/src/main/java/net/minecraft/server/EntityCat.java
@@ -16,7 +16,7 @@ public class EntityCat extends EntityTameableAnimal {
@@ -1448,7 +1448,7 @@ index 57af3835e..b3bdc194a 100644
hashmap.put(1, new MinecraftKey("textures/entity/cat/black.png"));
hashmap.put(2, new MinecraftKey("textures/entity/cat/red.png"));
diff --git a/src/main/java/net/minecraft/server/EntityEnderSignal.java b/src/main/java/net/minecraft/server/EntityEnderSignal.java
index c13abc7e0..7ebd7da1c 100644
index c13abc7e07..7ebd7da1c5 100644
--- a/src/main/java/net/minecraft/server/EntityEnderSignal.java
+++ b/src/main/java/net/minecraft/server/EntityEnderSignal.java
@@ -21,7 +21,7 @@ public class EntityEnderSignal extends Entity {
@@ -1461,7 +1461,7 @@ index c13abc7e0..7ebd7da1c 100644
}));
}
diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
index b34695f2d..e4bd2796a 100644
index b34695f2d0..e4bd2796a4 100644
--- a/src/main/java/net/minecraft/server/EntityEndermite.java
+++ b/src/main/java/net/minecraft/server/EntityEndermite.java
@@ -19,7 +19,7 @@ public class EntityEndermite extends EntityMonster {
@@ -1474,7 +1474,7 @@ index b34695f2d..e4bd2796a 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
index 886268b09..b030fe957 100644
index 886268b09e..b030fe9577 100644
--- a/src/main/java/net/minecraft/server/EntityEvoker.java
+++ b/src/main/java/net/minecraft/server/EntityEvoker.java
@@ -24,7 +24,7 @@ public class EntityEvoker extends EntityIllagerWizard {
@@ -1487,7 +1487,7 @@ index 886268b09..b030fe957 100644
this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, false));
diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
index d332907b3..b853fd0d9 100644
index d332907b3b..b853fd0d9b 100644
--- a/src/main/java/net/minecraft/server/EntityFish.java
+++ b/src/main/java/net/minecraft/server/EntityFish.java
@@ -73,11 +73,7 @@ public abstract class EntityFish extends EntityWaterAnimal {
@@ -1504,7 +1504,7 @@ index d332907b3..b853fd0d9 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
index 140208761..94e57a2d8 100644
index 1402087612..94e57a2d85 100644
--- a/src/main/java/net/minecraft/server/EntityParrot.java
+++ b/src/main/java/net/minecraft/server/EntityParrot.java
@@ -20,8 +20,8 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -1519,7 +1519,7 @@ index 140208761..94e57a2d8 100644
hashmap.put(EntityTypes.CAVE_SPIDER, SoundEffects.ENTITY_PARROT_IMITATE_SPIDER);
hashmap.put(EntityTypes.CREEPER, SoundEffects.ENTITY_PARROT_IMITATE_CREEPER);
diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
index bb46247f2..f63528ca3 100644
index bb46247f2f..f63528ca3e 100644
--- a/src/main/java/net/minecraft/server/EntitySheep.java
+++ b/src/main/java/net/minecraft/server/EntitySheep.java
@@ -18,7 +18,7 @@ import org.bukkit.inventory.InventoryView;
@@ -1543,7 +1543,7 @@ index bb46247f2..f63528ca3 100644
private PathfinderGoalEatTile bA;
diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
index 7b6b1ad17..1432d3f6b 100644
index 7b6b1ad17b..1432d3f6bf 100644
--- a/src/main/java/net/minecraft/server/EntityWitch.java
+++ b/src/main/java/net/minecraft/server/EntityWitch.java
@@ -30,13 +30,13 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -1563,7 +1563,7 @@ index 7b6b1ad17..1432d3f6b 100644
this.targetSelector.a(3, this.bA);
}
diff --git a/src/main/java/net/minecraft/server/GeneratorAccess.java b/src/main/java/net/minecraft/server/GeneratorAccess.java
index 5648ba73c..304190fdc 100644
index 5648ba73c5..304190fdc4 100644
--- a/src/main/java/net/minecraft/server/GeneratorAccess.java
+++ b/src/main/java/net/minecraft/server/GeneratorAccess.java
@@ -49,7 +49,7 @@ public interface GeneratorAccess extends IEntityAccess, IWorldReader, VirtualLev
@@ -1576,7 +1576,7 @@ index 5648ba73c..304190fdc 100644
@Override default java.util.List<VoxelShape> getEntityCollisions(@Nullable Entity entity, AxisAlignedBB axisalignedbb, Set<Entity> set, boolean returnFast) {return IEntityAccess.super.getEntityCollisions(entity, axisalignedbb, set, returnFast); } // Paper
diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
index 38b79b5b1..c4aa38ddf 100644
index 38b79b5b10..c4aa38ddf1 100644
--- a/src/main/java/net/minecraft/server/MathHelper.java
+++ b/src/main/java/net/minecraft/server/MathHelper.java
@@ -7,7 +7,7 @@ import java.util.function.IntPredicate;
@@ -1589,7 +1589,7 @@ index 38b79b5b1..c4aa38ddf 100644
afloat[i] = (float) Math.sin((double) i * 3.141592653589793D * 2.0D / 65536.0D);
}
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
index de8f1874a..73402f2b5 100644
index de8f1874af..73402f2b5a 100644
--- a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
@@ -25,7 +25,7 @@ public class WorldGenFeatureConfigured<FC extends WorldGenFeatureConfiguration,
@@ -1602,7 +1602,7 @@ index de8f1874a..73402f2b5 100644
public WorldGenFeatureRandomChoiceConfigurationWeight<FC> a(float f) {
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java b/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
index 979f3517c..5827b1ba1 100644
index 979f3517c0..5827b1ba1a 100644
--- a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
@@ -58,6 +58,6 @@ public class WorldGenFeatureTreeBeehive extends WorldGenFeatureTree {

2
patches/server/0004-Add-language-asset-purpur.lang.patch → patches/server/0005-Add-language-asset-purpur.lang.patch
View File

@@ -1,4 +1,4 @@
From 16fd129dea27af5866c4ff2281febb202873f9ac Mon Sep 17 00:00:00 2001
From 0501bb760a4b2c1ddfb42b59e38fbb8f98e2d874 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 13:17:09 -0500
Subject: [PATCH] Add language asset purpur.lang

4
patches/server/0005-Fix-vanilla-command-permission-handler.patch → patches/server/0006-Fix-vanilla-command-permission-handler.patch
View File

@@ -1,4 +1,4 @@
From f8df3bbaaa80fa78bf8c279cef08ad1884b8945a Mon Sep 17 00:00:00 2001
From 98e87908d5f618cbd2c223f6315b9dd62f1baa7f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 28 Mar 2020 01:51:32 -0500
Subject: [PATCH] Fix vanilla command permission handler
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix vanilla command permission handler
2 files changed, 2 insertions(+)
diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
index 98592a3e63..93d878bf1c 100644
index bd2802d362..5fa2a45c81 100644
--- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
+++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
@@ -34,6 +34,7 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {

4
patches/server/0006-Host-our-own-timings.patch → patches/server/0007-Host-our-own-timings.patch
View File

@@ -1,4 +1,4 @@
From 7401e76df06e0028a842fa4415106ec401a9bc3a Mon Sep 17 00:00:00 2001
From be0d0fa48d1a6aad73e95083e4562505501d0ecb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 18 Feb 2020 20:38:34 -0600
Subject: [PATCH] Host our own timings
@@ -8,7 +8,7 @@ Subject: [PATCH] Host our own timings
1 file changed, 4 insertions(+)
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 333c880bf..2673de821 100644
index 333c880bf2..2673de8212 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -127,4 +127,8 @@ public class PurpurConfig {

8
patches/server/0007-Ridables.patch → patches/server/0008-Ridables.patch
View File

@@ -1,4 +1,4 @@
From 89312840b1523b425c3bd27c34bd0793db68eefc Mon Sep 17 00:00:00 2001
From 67dffaad30d16e4b0c9918d58c710e4ebe9509b7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 6 Feb 2020 19:53:59 -0600
Subject: [PATCH] Ridables
@@ -5227,7 +5227,7 @@ index 0c7f094e54..62a0810062 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 6ada239185..c3a862fea0 100644
index f97b304ade..d2fac7f296 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -995,6 +995,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -6517,10 +6517,10 @@ index 0000000000..9bb9da22aa
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index ff60568ce4..ef64cfadec 100644
index d16d3fe58e..5246db9636 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1059,4 +1059,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1058,4 +1058,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return getHandle().spawnReason;
}
// Paper end

12
patches/server/0008-Logger-settings-suppressing-pointless-logs.patch → patches/server/0009-Logger-settings-suppressing-pointless-logs.patch
View File

@@ -1,4 +1,4 @@
From 89502c80c6cf9a1f07462f3475aef7c65949a6ef Mon Sep 17 00:00:00 2001
From 0befe14c7c515802c2dcb800db9859c79822d9dd Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:52:12 -0500
Subject: [PATCH] Logger settings (suppressing pointless logs)
@@ -12,7 +12,7 @@ Subject: [PATCH] Logger settings (suppressing pointless logs)
5 files changed, 15 insertions(+)
diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
index c41e13847..44331cea7 100644
index c41e138472..44331cea7c 100644
--- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
+++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
@@ -162,6 +162,7 @@ public class AdvancementDataPlayer {
@@ -24,7 +24,7 @@ index c41e13847..44331cea7 100644
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java
index 469e293c2..ca58302cf 100644
index 469e293c25..ca58302cf7 100644
--- a/src/main/java/net/minecraft/server/GenericAttributes.java
+++ b/src/main/java/net/minecraft/server/GenericAttributes.java
@@ -79,6 +79,7 @@ public class GenericAttributes {
@@ -36,7 +36,7 @@ index 469e293c2..ca58302cf 100644
} else {
a(attributeinstance, nbttagcompound);
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
index 73402f2b5..1c2320cc5 100644
index 73402f2b5a..1c2320cc54 100644
--- a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
@@ -47,6 +47,7 @@ public class WorldGenFeatureConfigured<FC extends WorldGenFeatureConfiguration,
@@ -48,7 +48,7 @@ index 73402f2b5..1c2320cc5 100644
return new WorldGenFeatureConfigured<>(WorldGenerator.NO_OP, WorldGenFeatureEmptyConfiguration.e);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 2673de821..d6f82d119 100644
index 2673de8212..d6f82d119e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -128,6 +128,17 @@ public class PurpurConfig {
@@ -70,7 +70,7 @@ index 2673de821..d6f82d119 100644
getString("settings.timings.url", "https://timings.pl3x.net");
}
diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
index 049e9f98d..1d179cd5b 100644
index 049e9f98de..1d179cd5bc 100644
--- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
+++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
@@ -254,6 +254,7 @@ public final class CraftLegacy {

4
patches/server/0009-Disable-outdated-build-check.patch → patches/server/0010-Disable-outdated-build-check.patch
View File

@@ -1,4 +1,4 @@
From e15515e1c1a6f10072bb7ac3a2636403eddb86dd Mon Sep 17 00:00:00 2001
From 139d189fa8600958abb4e5d209a2ab6dafdbfe99 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 15 Dec 2019 12:53:59 -0600
Subject: [PATCH] Disable outdated build check
@@ -8,7 +8,7 @@ Subject: [PATCH] Disable outdated build check
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index f4626daed..4b95b3c22 100644
index 17ebc84f51..ced4acc5f5 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -252,7 +252,7 @@ public class Main {

8
patches/server/0010-Add-obfhelpers-for-plugin-use.patch → patches/server/0011-Add-obfhelpers-for-plugin-use.patch
View File

@@ -1,4 +1,4 @@
From d00b977d56be597aaafd83184f0693c10b656fd3 Mon Sep 17 00:00:00 2001
From b28d366ed0e2e748cc515c6ac6c5d5a90652f579 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 1 Jan 2020 20:12:39 -0600
Subject: [PATCH] Add obfhelpers for plugin use
@@ -10,7 +10,7 @@ Subject: [PATCH] Add obfhelpers for plugin use
3 files changed, 4 insertions(+)
diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
index fb97c51bb..50ed4001d 100644
index fb97c51bb1..50ed4001d1 100644
--- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
+++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
@@ -145,6 +145,7 @@ public interface IChatBaseComponent extends Message, Iterable<IChatBaseComponent
@@ -30,7 +30,7 @@ index fb97c51bb..50ed4001d 100644
return IChatBaseComponent.ChatSerializer.a.toJson(ichatbasecomponent);
}
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index ea60880c6..413b888a0 100644
index ea60880c6f..413b888a04 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -596,6 +596,7 @@ public final class ItemStack {
@@ -42,7 +42,7 @@ index ea60880c6..413b888a0 100644
if (this.tag != null && this.tag.hasKeyOfType(s, 10)) {
return this.tag.getCompound(s);
diff --git a/src/main/java/net/minecraft/server/NBTTagString.java b/src/main/java/net/minecraft/server/NBTTagString.java
index bea4a0b80..c6481c7ff 100644
index bea4a0b808..c6481c7ff1 100644
--- a/src/main/java/net/minecraft/server/NBTTagString.java
+++ b/src/main/java/net/minecraft/server/NBTTagString.java
@@ -40,6 +40,7 @@ public class NBTTagString implements NBTBase {

8
patches/server/0011-Silk-touch-spawners.patch → patches/server/0012-Silk-touch-spawners.patch
View File

@@ -1,4 +1,4 @@
From 454f9a81df12ad44d358eeda82b46fedc91f3786 Mon Sep 17 00:00:00 2001
From c458e4eb00beea0dc60c35e6c343e6b013c80a97 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 14:27:37 -0500
Subject: [PATCH] Silk touch spawners
@@ -10,7 +10,7 @@ Subject: [PATCH] Silk touch spawners
3 files changed, 47 insertions(+)
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index d051a54aa..8c8dc9d6b 100644
index d051a54aa0..8c8dc9d6b8 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -501,6 +501,7 @@ public class Block implements IMaterial {
@@ -22,7 +22,7 @@ index d051a54aa..8c8dc9d6b 100644
if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
float f = 0.5F;
diff --git a/src/main/java/net/minecraft/server/BlockMobSpawner.java b/src/main/java/net/minecraft/server/BlockMobSpawner.java
index 5296fdf16..69d04f6cb 100644
index 5296fdf168..69d04f6cbf 100644
--- a/src/main/java/net/minecraft/server/BlockMobSpawner.java
+++ b/src/main/java/net/minecraft/server/BlockMobSpawner.java
@@ -11,6 +11,40 @@ public class BlockMobSpawner extends BlockTileEntity {
@@ -67,7 +67,7 @@ index 5296fdf16..69d04f6cb 100644
public void dropNaturally(IBlockData iblockdata, World world, BlockPosition blockposition, ItemStack itemstack) {
super.dropNaturally(iblockdata, world, blockposition, itemstack);
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index 5a7494947..8e8d392a1 100644
index 5a7494947c..8e8d392a15 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -136,10 +136,17 @@ public class EntityTypes<T extends Entity> {

6
patches/server/0012-Give-giants-AI.patch → patches/server/0013-Give-giants-AI.patch
View File

@@ -1,4 +1,4 @@
From 8815a77a92f3c438d6a379f34307de09b536c87a Mon Sep 17 00:00:00 2001
From 32ed6366b03dbec3921692e4297a0674beb0615c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 00:43:12 -0500
Subject: [PATCH] Give giants AI
@@ -78,7 +78,7 @@ index ff8a41a539..4296aaa074 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 28218f048d..00cbd99914 100644
index cbbbc875be..fbca429090 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -867,6 +867,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -98,7 +98,7 @@ index 28218f048d..00cbd99914 100644
float f = difficultydamagescaler.d();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fafbea673e..b5d9fc76b6 100644
index 69f99a993d..7cf7ae3dcb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -255,12 +255,22 @@ public class PurpurWorldConfig {

4
patches/server/0013-Illusioners-AI-settings.patch → patches/server/0014-Illusioners-AI-settings.patch
View File

@@ -1,4 +1,4 @@
From f69c078a136c8b4c90d46b19f5f0498fb94df06d Mon Sep 17 00:00:00 2001
From e5b3ef66104c980b1d533be8844feb0814837194 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 5 Jul 2019 11:09:25 -0500
Subject: [PATCH] Illusioners AI settings
@@ -26,7 +26,7 @@ index 3e6722cfce..13545a8efe 100644
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b5d9fc76b6..749fa33e55 100644
index 7cf7ae3dcb..96a66926fc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -299,10 +299,16 @@ public class PurpurWorldConfig {

2
patches/server/0014-Zombie-horse-naturally-spawn.patch → patches/server/0015-Zombie-horse-naturally-spawn.patch
View File

@@ -1,4 +1,4 @@
From 84c4a40a15f523104c986a0a12140d94c537a8eb Mon Sep 17 00:00:00 2001
From 9e770d2145e55b702d98ee898bf024d5a8a7eda6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 7 Jul 2019 19:52:16 -0500
Subject: [PATCH] Zombie horse naturally spawn

4
patches/server/0015-Charged-creeper-naturally-spawn.patch → patches/server/0016-Charged-creeper-naturally-spawn.patch
View File

@@ -1,4 +1,4 @@
From b193d1eae06da1137336b4beb8b8036af4b178ea Mon Sep 17 00:00:00 2001
From 136521abd75dada9b5a980379b39c12838c50ff3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 29 Nov 2019 22:37:44 -0600
Subject: [PATCH] Charged creeper naturally spawn
@@ -31,7 +31,7 @@ index 48fd8e716b..ce366f401f 100644
public void b(NBTTagCompound nbttagcompound) {
super.b(nbttagcompound);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1a8b8de8dd..e38d0bea2c 100644
index 4c7469b903..bbae44ddb5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -148,10 +148,12 @@ public class PurpurWorldConfig {

2
patches/server/0016-Rabbit-naturally-spawn-toast-and-killer.patch → patches/server/0017-Rabbit-naturally-spawn-toast-and-killer.patch
View File

@@ -1,4 +1,4 @@
From 58e34621703befdfff630573a97f05c8f636304a Mon Sep 17 00:00:00 2001
From 7a740eac98a1acd7253c498e690324cd18e42d47 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 31 Aug 2019 17:47:11 -0500
Subject: [PATCH] Rabbit naturally spawn toast and killer

4
patches/server/0017-Cat-spawning-options.patch → patches/server/0018-Cat-spawning-options.patch
View File

@@ -1,4 +1,4 @@
From 975326f787697bfeca3d2629407771ec917523cf Mon Sep 17 00:00:00 2001
From 4d0a8cc4bd681061763e57d2addcbfff9a87f6b4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Dec 2019 18:52:55 -0600
Subject: [PATCH] Cat spawning options
@@ -57,7 +57,7 @@ index 6024478dc0..4b55c07d41 100644
return list.size() < 1 ? this.a(blockposition, world) : 0;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7df44adc8a..8ecf47f25a 100644
index 4aaf75fcf4..12fbdf65c5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,10 +101,16 @@ public class PurpurWorldConfig {

2
patches/server/0018-Fix-non-black-cat-types-spawning-in-swamp-huts.patch → patches/server/0019-Fix-non-black-cat-types-spawning-in-swamp-huts.patch
View File

@@ -1,4 +1,4 @@
From 61da90d5caa954016f81121175adcae46f5c5c98 Mon Sep 17 00:00:00 2001
From aa2411409c85d1baa93f157506e929bfcf44d62c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Jan 2020 01:23:22 -0600
Subject: [PATCH] Fix non black cat types spawning in swamp huts

10
patches/server/0019-Cows-eat-mushrooms.patch → patches/server/0020-Cows-eat-mushrooms.patch
View File

@@ -1,4 +1,4 @@
From 424361653f547e2ef080fcccba4bca7e6752a6ba Mon Sep 17 00:00:00 2001
From 4359121c6cc4b87aa44cdf26bc9bbb55d75d8b67 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:10:30 -0500
Subject: [PATCH] Cows eat mushrooms
@@ -11,7 +11,7 @@ Subject: [PATCH] Cows eat mushrooms
4 files changed, 77 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 1ef13ee78..0652f6312 100644
index 1ef13ee78e..0652f63124 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1098,6 +1098,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -31,7 +31,7 @@ index 1ef13ee78..0652f6312 100644
this.setPositionRotation(entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch);
}
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
index 723a9fa1e..f56fd7c01 100644
index 723a9fa1ee..f56fd7c012 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -34,6 +34,7 @@ public class EntityCow extends EntityAnimal {
@@ -124,7 +124,7 @@ index 723a9fa1e..f56fd7c01 100644
public EntityCow createChild(EntityAgeable entityageable) {
return (EntityCow) EntityTypes.COW.a(this.world);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 58aa2a9a3..ea245de18 100644
index 58aa2a9a3e..ea245de18c 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2831,8 +2831,9 @@ public abstract class EntityLiving extends Entity {
@@ -140,7 +140,7 @@ index 58aa2a9a3..ea245de18 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 12fbdf65c..091f30727 100644
index 12fbdf65c5..091f30727f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -145,10 +145,12 @@ public class PurpurWorldConfig {

4
patches/server/0020-Fix-cow-rotation-when-shearing-mooshroom.patch → patches/server/0021-Fix-cow-rotation-when-shearing-mooshroom.patch
View File

@@ -1,4 +1,4 @@
From 1d65387a081f39fa4878f89bb059b6e142e3ad16 Mon Sep 17 00:00:00 2001
From 79c6e032d882ad999fd65f3eab561f36397bddb6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 23:53:16 -0500
Subject: [PATCH] Fix cow rotation when shearing mooshroom
@@ -8,7 +8,7 @@ Subject: [PATCH] Fix cow rotation when shearing mooshroom
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
index 53bc31287..bf835aaf9 100644
index 53bc312870..bf835aaf9a 100644
--- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
+++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
@@ -114,7 +114,13 @@ public class EntityMushroomCow extends EntityCow {

2
patches/server/0021-Pigs-give-saddle-back.patch → patches/server/0022-Pigs-give-saddle-back.patch
View File

@@ -1,4 +1,4 @@
From d27bc15e80c2fa9bb8612938a9fb0746a48aa609 Mon Sep 17 00:00:00 2001
From 9f40bd20e244a74b5840eff4e216421775c3bf51 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 01:14:46 -0500
Subject: [PATCH] Pigs give saddle back

14
patches/server/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch → patches/server/0023-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -1,4 +1,4 @@
From a50f400dcbc7332935e3d8292445bc40191fef76 Mon Sep 17 00:00:00 2001
From 522d8cbc36b8834ce7c4b5e2cf4192fe37cef25f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 18:26:06 -0500
Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -13,7 +13,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
6 files changed, 226 insertions(+), 11 deletions(-)
diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java
index f7344d3ae..f6c0165f9 100644
index f7344d3aec..f6c0165f94 100644
--- a/src/main/java/net/minecraft/server/DamageSource.java
+++ b/src/main/java/net/minecraft/server/DamageSource.java
@@ -82,6 +82,7 @@ public class DamageSource {
@@ -25,7 +25,7 @@ index f7344d3ae..f6c0165f9 100644
return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0652f6312..197953e19 100644
index 0652f63124..197953e19f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1445,6 +1445,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -55,7 +55,7 @@ index 0652f6312..197953e19 100644
return null;
} else if (this.world.isClientSide) {
diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
index a57d0089d..02952c3af 100644
index a57d0089d8..02952c3af8 100644
--- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java
+++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
@@ -13,6 +13,12 @@ public class EntityEnderCrystal extends Entity {
@@ -123,7 +123,7 @@ index a57d0089d..02952c3af 100644
@Override
protected void b(NBTTagCompound nbttagcompound) {
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index 777bc95ee..265077048 100644
index 777bc95eef..2650770489 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -8,9 +8,10 @@ import javax.annotation.Nullable;
@@ -350,7 +350,7 @@ index 777bc95ee..265077048 100644
return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false;
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 3bc57ef91..e0d97d2c8 100644
index 3bc57ef91d..e0d97d2c8b 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -34,6 +34,7 @@ public interface IEntityAccess {
@@ -362,7 +362,7 @@ index 3bc57ef91..e0d97d2c8 100644
return this.a(oclass, axisalignedbb, IEntitySelector.f);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 85692500b..c9b41cebd 100644
index 85692500b4..c9b41cebd6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -402,6 +402,9 @@ public class PurpurWorldConfig {

6
patches/server/0023-Snowman-drop-and-put-back-pumpkin.patch → patches/server/0024-Snowman-drop-and-put-back-pumpkin.patch
View File

@@ -1,4 +1,4 @@
From 0cdfff808b4570fe20e44a30c12880318b2942f6 Mon Sep 17 00:00:00 2001
From f7ebb12367af42882a2ad9c9cc7e4414197bc40b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 23:58:44 -0500
Subject: [PATCH] Snowman drop and put back pumpkin
@@ -9,7 +9,7 @@ Subject: [PATCH] Snowman drop and put back pumpkin
2 files changed, 21 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index 65d746899..3f6f8ad45 100644
index 65d7468997..3f6f8ad454 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -7,6 +7,7 @@ import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -47,7 +47,7 @@ index 65d746899..3f6f8ad45 100644
return tryRide(entityhuman, enumhand); // Purpur
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c9b41cebd..56b67c408 100644
index c9b41cebd6..56b67c4082 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -540,11 +540,15 @@ public class PurpurWorldConfig {

6
patches/server/0024-Ender-dragon-always-drop-egg.patch → patches/server/0025-Ender-dragon-always-drop-egg.patch
View File

@@ -1,4 +1,4 @@
From 902c04b41327f7db8aa12a85bae347e1969e2cf9 Mon Sep 17 00:00:00 2001
From 5b5cebc495d4db4f7eddd40c578e7d4fa9faf36a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 7 Feb 2020 04:42:57 -0600
Subject: [PATCH] Ender dragon always drop egg
@@ -9,7 +9,7 @@ Subject: [PATCH] Ender dragon always drop egg
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
index 687efa022..ead334607 100644
index 687efa022d..ead3346072 100644
--- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
@@ -21,7 +21,7 @@ public class EnderDragonBattle {
@@ -39,7 +39,7 @@ index 687efa022..ead334607 100644
return this.l;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 56b67c408..cc6f8563b 100644
index 56b67c4082..cc6f8563b1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -206,11 +206,13 @@ public class PurpurWorldConfig {

6
patches/server/0025-Ender-dragon-always-drop-full-exp.patch → patches/server/0026-Ender-dragon-always-drop-full-exp.patch
View File

@@ -1,4 +1,4 @@
From ec4c2b7e0bc52fbd36bbe6a011a5dbd0c6149d51 Mon Sep 17 00:00:00 2001
From 5cfee6aa56787421ed223aad2ebcbf6fd108be63 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 24 Aug 2019 14:42:54 -0500
Subject: [PATCH] Ender dragon always drop full exp
@@ -9,7 +9,7 @@ Subject: [PATCH] Ender dragon always drop full exp
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index a6a79f5e9..336cf7da2 100644
index ab1747198a..f06fde3242 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -641,7 +641,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -22,7 +22,7 @@ index a6a79f5e9..336cf7da2 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index cc6f8563b..426e6f18b 100644
index cc6f8563b1..426e6f18bd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -207,12 +207,14 @@ public class PurpurWorldConfig {

8
patches/server/0026-Signs-editable-on-right-click.patch → patches/server/0027-Signs-editable-on-right-click.patch
View File

@@ -1,4 +1,4 @@
From 4e4a23e39281ccb5cc11de0010520655acabd6ec Mon Sep 17 00:00:00 2001
From d724d49d366b35c1181dd2fc15e42daade8f1ce6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 24 May 2019 02:39:25 -0500
Subject: [PATCH] Signs editable on right click
@@ -10,7 +10,7 @@ Subject: [PATCH] Signs editable on right click
3 files changed, 17 insertions(+)
diff --git a/src/main/java/net/minecraft/server/BlockSign.java b/src/main/java/net/minecraft/server/BlockSign.java
index 8a31054a1..d20849ce2 100644
index 8a31054a1d..d20849ce2b 100644
--- a/src/main/java/net/minecraft/server/BlockSign.java
+++ b/src/main/java/net/minecraft/server/BlockSign.java
@@ -56,6 +56,17 @@ public abstract class BlockSign extends BlockTileEntity implements IBlockWaterlo
@@ -32,7 +32,7 @@ index 8a31054a1..d20849ce2 100644
} else {
return EnumInteractionResult.PASS;
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
index 0e9a90b70..099d98e04 100644
index 0e9a90b70f..099d98e04c 100644
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -109,6 +109,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -44,7 +44,7 @@ index 0e9a90b70..099d98e04 100644
// Paper start
//this.c = entityhuman;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 426e6f18b..f098a36b5 100644
index 426e6f18bd..f098a36b51 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -65,6 +65,11 @@ public class PurpurWorldConfig {

4
patches/server/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch → patches/server/0028-Fix-outdated-server-showing-in-ping-before-server-fu.patch
View File

@@ -1,4 +1,4 @@
From a0e02325c7e83ed45be41dee9d2d987e1f25f16d Mon Sep 17 00:00:00 2001
From be19ef44f61995d316120b8dd763c91cd8a2d56d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 4 Jun 2019 15:50:08 -0500
Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
1 file changed, 1 insertion(+)
diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
index 4bb21c48b..30f16db02 100644
index 4bb21c48bd..30f16db02c 100644
--- a/src/main/java/net/minecraft/server/PacketStatusListener.java
+++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
@@ -135,6 +135,7 @@ public class PacketStatusListener implements PacketStatusInListener {

6
patches/server/0028-Make-Iron-Golems-Swim.patch → patches/server/0029-Make-Iron-Golems-Swim.patch
View File

@@ -1,4 +1,4 @@
From 45691659f26a3ab5b01aad9dd042a01f425313c0 Mon Sep 17 00:00:00 2001
From 7091b58fda2ba308981493e7d38cb0d28e34b871 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 15 Jun 2019 03:12:15 -0500
Subject: [PATCH] Make Iron Golems Swim
@@ -9,7 +9,7 @@ Subject: [PATCH] Make Iron Golems Swim
2 files changed, 3 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
index 288a043fb..0cc3b8eb0 100644
index 288a043fbd..0cc3b8eb01 100644
--- a/src/main/java/net/minecraft/server/EntityIronGolem.java
+++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
@@ -36,6 +36,7 @@ public class EntityIronGolem extends EntityGolem {
@@ -21,7 +21,7 @@ index 288a043fb..0cc3b8eb0 100644
this.goalSelector.a(1, new PathfinderGoalMeleeAttack(this, 1.0D, true));
this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f098a36b5..a07781929 100644
index f098a36b51..a077819292 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -333,10 +333,12 @@ public class PurpurWorldConfig {

6
patches/server/0029-Allow-soil-to-moisten-from-water-directly-under-it.patch → patches/server/0030-Allow-soil-to-moisten-from-water-directly-under-it.patch
View File

@@ -1,4 +1,4 @@
From 1bfeca54570f6b815f10b6b266761cb8c6a18ccc Mon Sep 17 00:00:00 2001
From 107b47e289b36fc4e4f9568dbf0958ed0cad3101 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 21 Jun 2019 14:37:10 -0500
Subject: [PATCH] Allow soil to moisten from water directly under it
@@ -9,7 +9,7 @@ Subject: [PATCH] Allow soil to moisten from water directly under it
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockSoil.java b/src/main/java/net/minecraft/server/BlockSoil.java
index b6561f2c7..f2ab3ee01 100644
index b6561f2c79..f2ab3ee011 100644
--- a/src/main/java/net/minecraft/server/BlockSoil.java
+++ b/src/main/java/net/minecraft/server/BlockSoil.java
@@ -1,6 +1,5 @@
@@ -47,7 +47,7 @@ index b6561f2c7..f2ab3ee01 100644
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a07781929..e2bda806e 100644
index a077819292..e2bda806ec 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -65,6 +65,11 @@ public class PurpurWorldConfig {

10
patches/server/0030-Controllable-Minecarts.patch → patches/server/0031-Controllable-Minecarts.patch
View File

@@ -1,4 +1,4 @@
From 0d016d81edb562a793a0c1cf2a1f393e03f9509b Mon Sep 17 00:00:00 2001
From 22464945049dd22fcd1a5ccf19c4985e6f8d011b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 29 Jun 2019 02:32:40 -0500
Subject: [PATCH] Controllable Minecarts
@@ -11,7 +11,7 @@ Subject: [PATCH] Controllable Minecarts
4 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 197953e19..5d39d86f0 100644
index 197953e19f..5d39d86f0f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1346,6 +1346,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -23,7 +23,7 @@ index 197953e19..5d39d86f0 100644
return this.inLava;
}
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 665bbe07f..1f3e5bd28 100644
index 665bbe07fa..1f3e5bd288 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -357,12 +357,50 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -78,7 +78,7 @@ index 665bbe07f..1f3e5bd28 100644
this.setMot(new Vec3D(this.getMot().x * this.derailedX, this.getMot().y * this.derailedY, this.getMot().z * this.derailedZ));
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java
index b73e317fb..e1337a9c0 100644
index b73e317fbb..e1337a9c04 100644
--- a/src/main/java/net/minecraft/server/ItemMinecart.java
+++ b/src/main/java/net/minecraft/server/ItemMinecart.java
@@ -103,8 +103,10 @@ public class ItemMinecart extends Item {
@@ -103,7 +103,7 @@ index b73e317fb..e1337a9c0 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e2bda806e..f8992136a 100644
index e2bda806ec..f8992136a7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,10 +1,16 @@

4
patches/server/0031-Signs-allow-color-codes.patch → patches/server/0032-Signs-allow-color-codes.patch
View File

@@ -1,4 +1,4 @@
From 12574726d188132c0693a180083ff7b7370b46b8 Mon Sep 17 00:00:00 2001
From 578bd4ebc2abd908e9f63ef91319e3a816115082 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Signs allow color codes
@@ -23,7 +23,7 @@ index dbdef3ad96..f0603a575c 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index b25b3b4816..ee961bc05c 100644
index d52fbda79f..96161160bb 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2622,6 +2622,14 @@ public class PlayerConnection implements PacketListenerPlayIn {

12
patches/server/0032-Campfires-have-regen-effect.patch → patches/server/0033-Campfires-have-regen-effect.patch
View File

@@ -1,4 +1,4 @@
From 3f8e50fb578ffdc4e0d49e38df733f949f090bbc Mon Sep 17 00:00:00 2001
From d89c8591d4ebe87d0aeadf9a92f5a9ca85a1beba Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 19 May 2019 18:11:53 -0500
Subject: [PATCH] Campfires have regen effect
@@ -12,7 +12,7 @@ Subject: [PATCH] Campfires have regen effect
5 files changed, 92 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
index 6303be944..65f8d803b 100644
index 6303be944c..65f8d803b8 100644
--- a/src/main/java/net/minecraft/server/BlockCampfire.java
+++ b/src/main/java/net/minecraft/server/BlockCampfire.java
@@ -8,7 +8,7 @@ public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged
@@ -25,7 +25,7 @@ index 6303be944..65f8d803b 100644
public static final BlockStateDirection e = BlockProperties.N;
private static final VoxelShape f = Block.a(6.0D, 0.0D, 6.0D, 10.0D, 16.0D, 10.0D);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ea245de18..10c222ddb 100644
index ea245de18c..10c222ddb2 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2791,10 +2791,19 @@ public abstract class EntityLiving extends Entity {
@@ -52,7 +52,7 @@ index ea245de18..10c222ddb 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
index b56b021b4..fcc5a5c23 100644
index b56b021b4c..fcc5a5c234 100644
--- a/src/main/java/net/minecraft/server/EntityPotion.java
+++ b/src/main/java/net/minecraft/server/EntityPotion.java
@@ -92,6 +92,7 @@ public class EntityPotion extends EntityProjectile {
@@ -96,7 +96,7 @@ index b56b021b4..fcc5a5c23 100644
AxisAlignedBB axisalignedbb = this.getBoundingBox().grow(4.0D, 2.0D, 4.0D);
List<EntityLiving> list = this.world.a(EntityLiving.class, axisalignedbb, EntityPotion.e);
diff --git a/src/main/java/net/minecraft/server/TileEntityCampfire.java b/src/main/java/net/minecraft/server/TileEntityCampfire.java
index a1580b8c6..618ca2d76 100644
index a1580b8c6d..618ca2d763 100644
--- a/src/main/java/net/minecraft/server/TileEntityCampfire.java
+++ b/src/main/java/net/minecraft/server/TileEntityCampfire.java
@@ -14,6 +14,7 @@ public class TileEntityCampfire extends TileEntity implements Clearable, ITickab
@@ -165,7 +165,7 @@ index a1580b8c6..618ca2d76 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 94744c78b..d8d95d787 100644
index 94744c78ba..d8d95d787f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -71,6 +71,29 @@ public class PurpurWorldConfig {

6
patches/server/0033-Disable-loot-drops-on-death-by-cramming.patch → patches/server/0034-Disable-loot-drops-on-death-by-cramming.patch
View File

@@ -1,4 +1,4 @@
From f38570aa3c24eec676986a9ee59d73cf8da88bd1 Mon Sep 17 00:00:00 2001
From 446502ec75432982c848f4a2e84eb4c7824de048 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 3 Jul 2019 23:58:31 -0500
Subject: [PATCH] Disable loot drops on death by cramming
@@ -9,7 +9,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
2 files changed, 4 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index fdc32d986..cf222a9a1 100644
index 10c222ddb2..21b5bc47d7 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1374,8 +1374,10 @@ public abstract class EntityLiving extends Entity {
@@ -24,7 +24,7 @@ index fdc32d986..cf222a9a1 100644
deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
} else {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d8d95d787..8c84431e5 100644
index d8d95d787f..8c84431e59 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -112,6 +112,7 @@ public class PurpurWorldConfig {

8
patches/server/0034-Campfires-burn-out-in-rain.patch → patches/server/0035-Campfires-burn-out-in-rain.patch
View File

@@ -1,4 +1,4 @@
From fff946598371ecb10e4108eed1ed7273099bae31 Mon Sep 17 00:00:00 2001
From f8286ee301aafa334f5f547a3b0e2763dbaf79a7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 21:30:49 -0500
Subject: [PATCH] Campfires burn out in rain
@@ -10,7 +10,7 @@ Subject: [PATCH] Campfires burn out in rain
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index 8c8dc9d6b..13981967b 100644
index 8c8dc9d6b8..13981967b3 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -394,7 +394,7 @@ public class Block implements IMaterial {
@@ -23,7 +23,7 @@ index 8c8dc9d6b..13981967b 100644
}
diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
index 65f8d803b..3b95dfaaa 100644
index 65f8d803b8..3b95dfaaae 100644
--- a/src/main/java/net/minecraft/server/BlockCampfire.java
+++ b/src/main/java/net/minecraft/server/BlockCampfire.java
@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
@@ -58,7 +58,7 @@ index 65f8d803b..3b95dfaaa 100644
public IBlockData updateState(IBlockData iblockdata, EnumDirection enumdirection, IBlockData iblockdata1, GeneratorAccess generatoraccess, BlockPosition blockposition, BlockPosition blockposition1) {
if ((Boolean) iblockdata.get(BlockCampfire.d)) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8c84431e5..a761b2c73 100644
index 8c84431e59..a761b2c734 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -81,6 +81,7 @@ public class PurpurWorldConfig {

6
patches/server/0035-Campfires-should-fall-with-gravity.patch → patches/server/0036-Campfires-should-fall-with-gravity.patch
View File

@@ -1,4 +1,4 @@
From 4d2fbaefcc562726397224c34fe477dfb4e0f640 Mon Sep 17 00:00:00 2001
From 94def13a47b03244a57d1da80c6a9839cd7a9fc3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 23 May 2019 16:20:21 -0500
Subject: [PATCH] Campfires should fall with gravity
@@ -9,7 +9,7 @@ Subject: [PATCH] Campfires should fall with gravity
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
index 3b95dfaaa..418fa6d1f 100644
index 3b95dfaaae..418fa6d1fe 100644
--- a/src/main/java/net/minecraft/server/BlockCampfire.java
+++ b/src/main/java/net/minecraft/server/BlockCampfire.java
@@ -9,7 +9,7 @@ public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged
@@ -59,7 +59,7 @@ index 3b95dfaaa..418fa6d1f 100644
if (flag) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a761b2c73..d6405b2ec 100644
index a761b2c734..d6405b2ec5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -82,6 +82,7 @@ public class PurpurWorldConfig {

8
patches/server/0036-Dont-send-useless-entity-packets.patch → patches/server/0037-Dont-send-useless-entity-packets.patch
View File

@@ -1,4 +1,4 @@
From 46c6b61048ea662203af345382ace73735a9e179 Mon Sep 17 00:00:00 2001
From 041d671573323148c0992ea04a534ffe6beee106 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 6 Jul 2019 17:00:04 -0500
Subject: [PATCH] Dont send useless entity packets
@@ -10,7 +10,7 @@ Subject: [PATCH] Dont send useless entity packets
3 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index 5cc89c0cf..390cb8e76 100644
index 5cc89c0cf9..390cb8e767 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -169,6 +169,7 @@ public class EntityTrackerEntry {
@@ -45,7 +45,7 @@ index 5cc89c0cf..390cb8e76 100644
this.tracker.c(entityplayer);
entityplayer.c(this.tracker);
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
index e5da2b19c..5b1d95935 100644
index e5da2b19c1..5b1d959354 100644
--- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
+++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
@@ -5,11 +5,11 @@ import java.io.IOException;
@@ -66,7 +66,7 @@ index e5da2b19c..5b1d95935 100644
protected boolean h;
protected boolean i;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d6f82d119..d3e1c8c40 100644
index d6f82d119e..d3e1c8c407 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -139,6 +139,11 @@ public class PurpurConfig {

8
patches/server/0037-Implement-AFK-API.patch → patches/server/0038-Implement-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From 8cc701ec2d23eb18135b0914ba8c46d8051444c4 Mon Sep 17 00:00:00 2001
From 742fb5171cd5cada47c66919b143981cc02598e9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] Implement AFK API
@@ -171,7 +171,7 @@ index 1398c47a2f..0bf1a14b7c 100644
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
double d4 = d3 * d3;
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index ee961bc05c..17b23ed2fb 100644
index 96161160bb..762aad378c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -233,6 +233,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -250,10 +250,10 @@ index d6405b2ec5..41dd1b8616 100644
public boolean batRidableInWater = false;
public boolean batRequireShiftToMount = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index dcbda5b35a..c144939291 100644
index bd4d5184b6..7bd271d4c2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2079,4 +2079,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2078,4 +2078,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return spigot;
}
// Spigot end

6
patches/server/0038-Option-to-toggle-milk-curing-bad-omen.patch → patches/server/0039-Option-to-toggle-milk-curing-bad-omen.patch
View File

@@ -1,4 +1,4 @@
From cf80360efb42add4ff869ded9a9020bb15078434 Mon Sep 17 00:00:00 2001
From 28b04ef1fe86e3426ce788782a77877c4ee6e792 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 10 Jul 2019 20:43:05 -0500
Subject: [PATCH] Option to toggle milk curing bad omen
@@ -9,7 +9,7 @@ Subject: [PATCH] Option to toggle milk curing bad omen
2 files changed, 5 insertions(+)
diff --git a/src/main/java/net/minecraft/server/ItemMilkBucket.java b/src/main/java/net/minecraft/server/ItemMilkBucket.java
index 6b255e09a..e1d3894ab 100644
index 6b255e09ac..e1d3894ab7 100644
--- a/src/main/java/net/minecraft/server/ItemMilkBucket.java
+++ b/src/main/java/net/minecraft/server/ItemMilkBucket.java
@@ -20,7 +20,10 @@ public class ItemMilkBucket extends Item {
@@ -24,7 +24,7 @@ index 6b255e09a..e1d3894ab 100644
return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 41dd1b861..7cbb1df7a 100644
index 41dd1b8616..7cbb1df7ab 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -117,6 +117,7 @@ public class PurpurWorldConfig {

10
patches/server/0039-Mending-mends-most-damages-equipment-first.patch → patches/server/0040-Mending-mends-most-damages-equipment-first.patch
View File

@@ -1,4 +1,4 @@
From 650646daddf4a1af505b0dd966ccc2414b583ffd Mon Sep 17 00:00:00 2001
From 1a2bf40259378ed601f5aa34a4f834d412ac2e0e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 14 Jul 2019 19:52:47 -0500
Subject: [PATCH] Mending mends most damages equipment first
@@ -11,7 +11,7 @@ Subject: [PATCH] Mending mends most damages equipment first
4 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
index d96c03a1a..da1cfc1d3 100644
index d96c03a1a1..da1cfc1d3f 100644
--- a/src/main/java/net/minecraft/server/EnchantmentManager.java
+++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
@@ -246,9 +246,32 @@ public class EnchantmentManager {
@@ -49,7 +49,7 @@ index d96c03a1a..da1cfc1d3 100644
}
@Nullable
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
index 53c6c3389..0fae3693c 100644
index 53c6c33892..0fae3693c9 100644
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -225,7 +225,7 @@ public class EntityExperienceOrb extends Entity {
@@ -62,7 +62,7 @@ index 53c6c3389..0fae3693c 100644
if (entry != null) {
ItemStack itemstack = (ItemStack) entry.getValue();
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 413b888a0..ce6a46685 100644
index 413b888a04..ce6a466852 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -370,10 +370,19 @@ public final class ItemStack {
@@ -86,7 +86,7 @@ index 413b888a0..ce6a46685 100644
return this.tag == null ? 0 : this.tag.getInt("Damage");
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7cbb1df7a..b76a8c5be 100644
index 7cbb1df7ab..b76a8c5bee 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -118,6 +118,7 @@ public class PurpurWorldConfig {

8
patches/server/0040-Tulips-change-fox-type.patch → patches/server/0041-Tulips-change-fox-type.patch
View File

@@ -1,4 +1,4 @@
From 901aac97fe69e840c4f2008dc91cdeb3fef88da3 Mon Sep 17 00:00:00 2001
From fe135b5240b7ddecd167e01f167a86b2ee92892e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 13 Jul 2019 15:56:22 -0500
Subject: [PATCH] Tulips change fox type
@@ -10,7 +10,7 @@ Subject: [PATCH] Tulips change fox type
3 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
index 4f53090d3..13afd7bcd 100644
index 4f53090d3d..13afd7bcde 100644
--- a/src/main/java/net/minecraft/server/EntityFox.java
+++ b/src/main/java/net/minecraft/server/EntityFox.java
@@ -37,9 +37,9 @@ public class EntityFox extends EntityAnimal {
@@ -75,7 +75,7 @@ index 4f53090d3..13afd7bcd 100644
public void onMount(EntityHuman entityhuman) {
super.onMount(entityhuman);
diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java
index 54670f64c..9c9b93f28 100644
index 54670f64cf..9c9b93f280 100644
--- a/src/main/java/net/minecraft/server/Items.java
+++ b/src/main/java/net/minecraft/server/Items.java
@@ -106,8 +106,8 @@ public class Items {
@@ -90,7 +90,7 @@ index 54670f64c..9c9b93f28 100644
public static final Item bd = a(Blocks.OXEYE_DAISY, CreativeModeTab.c);
public static final Item be = a(Blocks.CORNFLOWER, CreativeModeTab.c);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b76a8c5be..a2fce0c63 100644
index b76a8c5bee..a2fce0c635 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -335,10 +335,12 @@ public class PurpurWorldConfig {

8
patches/server/0041-Pillager-limits-and-leaders-chance.patch → patches/server/0042-Pillager-limits-and-leaders-chance.patch
View File

@@ -1,4 +1,4 @@
From 491effa3370a085885f8d7a3032af41df7da454c Mon Sep 17 00:00:00 2001
From 21c076c767f3a22e0ca03b2f0905eb8c6045920c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 22 Jul 2019 14:24:26 -0500
Subject: [PATCH] Pillager limits and leaders chance
@@ -10,7 +10,7 @@ Subject: [PATCH] Pillager limits and leaders chance
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
index 70f43c515..fa08b8e1a 100644
index 70f43c5159..fa08b8e1ab 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
@@ -143,6 +143,7 @@ public class ChunkProviderGenerate extends ChunkGeneratorAbstract<GeneratorSetti
@@ -22,7 +22,7 @@ index 70f43c515..fa08b8e1a 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityMonsterPatrolling.java b/src/main/java/net/minecraft/server/EntityMonsterPatrolling.java
index f44334b9e..70559714a 100644
index f44334b9e1..70559714ac 100644
--- a/src/main/java/net/minecraft/server/EntityMonsterPatrolling.java
+++ b/src/main/java/net/minecraft/server/EntityMonsterPatrolling.java
@@ -49,6 +49,7 @@ public abstract class EntityMonsterPatrolling extends EntityMonster {
@@ -47,7 +47,7 @@ index f44334b9e..70559714a 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a2fce0c63..299b080c8 100644
index a2fce0c635..299b080c89 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -525,10 +525,16 @@ public class PurpurWorldConfig {

38
patches/server/0042-Make-the-GUI-better.patch → patches/server/0043-Make-the-GUI-better.patch
View File

@@ -1,4 +1,4 @@
From 045bfdd1709b11fa5befd268f29f18b5187e81eb Mon Sep 17 00:00:00 2001
From d758a1fb984a3aeab4c5c266153006a8c254028c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 16 Jan 2020 14:59:16 -0600
Subject: [PATCH] Make the GUI better
@@ -40,7 +40,7 @@ Subject: [PATCH] Make the GUI better
create mode 100644 src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index cf5abd393..73d2b32c5 100644
index cf5abd393e..73d2b32c5c 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -8,6 +8,8 @@ import com.mojang.authlib.GameProfileRepository;
@@ -88,7 +88,7 @@ index cf5abd393..73d2b32c5 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 92677b38b..f1266767e 100644
index d7e29a59de..d9407aedbf 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1366,6 +1366,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -101,7 +101,7 @@ index 92677b38b..f1266767e 100644
}
diff --git a/src/main/java/net/pl3x/purpur/gui/ServerGUI.java b/src/main/java/net/pl3x/purpur/gui/ServerGUI.java
new file mode 100644
index 000000000..973b5efef
index 0000000000..973b5efef5
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/ServerGUI.java
@@ -0,0 +1,123 @@
@@ -230,7 +230,7 @@ index 000000000..973b5efef
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java b/src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java
new file mode 100644
index 000000000..55feec811
index 0000000000..55feec811f
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java
@@ -0,0 +1,81 @@
@@ -317,7 +317,7 @@ index 000000000..55feec811
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java b/src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java
new file mode 100644
index 000000000..fb017a070
index 0000000000..fb017a0708
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java
@@ -0,0 +1,128 @@
@@ -451,7 +451,7 @@ index 000000000..fb017a070
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/DetailsListSelectionModel.java b/src/main/java/net/pl3x/purpur/gui/info/DetailsListSelectionModel.java
new file mode 100644
index 000000000..4e0b80fdd
index 0000000000..4e0b80fddb
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/DetailsListSelectionModel.java
@@ -0,0 +1,21 @@
@@ -478,7 +478,7 @@ index 000000000..4e0b80fdd
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
new file mode 100644
index 000000000..c4903c7db
index 0000000000..c4903c7db6
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
@@ -0,0 +1,42 @@
@@ -526,7 +526,7 @@ index 000000000..c4903c7db
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
new file mode 100644
index 000000000..1e049d575
index 0000000000..1e049d575b
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
@@ -0,0 +1,59 @@
@@ -591,7 +591,7 @@ index 000000000..1e049d575
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/graph/GraphColor.java b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphColor.java
new file mode 100644
index 000000000..2fdb9bdd0
index 0000000000..2fdb9bdd0d
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphColor.java
@@ -0,0 +1,44 @@
@@ -641,7 +641,7 @@ index 000000000..2fdb9bdd0
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/graph/GraphData.java b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphData.java
new file mode 100644
index 000000000..85babad9c
index 0000000000..85babad9cd
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphData.java
@@ -0,0 +1,47 @@
@@ -694,7 +694,7 @@ index 000000000..85babad9c
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/graph/RAMGraph.java b/src/main/java/net/pl3x/purpur/gui/info/graph/RAMGraph.java
new file mode 100644
index 000000000..0c0c73bee
index 0000000000..0c0c73beeb
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/graph/RAMGraph.java
@@ -0,0 +1,144 @@
@@ -844,7 +844,7 @@ index 000000000..0c0c73bee
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/JPlayerList.java b/src/main/java/net/pl3x/purpur/gui/playerlist/JPlayerList.java
new file mode 100644
index 000000000..17e75a207
index 0000000000..17e75a2070
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/playerlist/JPlayerList.java
@@ -0,0 +1,57 @@
@@ -907,7 +907,7 @@ index 000000000..17e75a207
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListCellRenderer.java b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListCellRenderer.java
new file mode 100644
index 000000000..2f02e9adc
index 0000000000..2f02e9adc7
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListCellRenderer.java
@@ -0,0 +1,22 @@
@@ -935,7 +935,7 @@ index 000000000..2f02e9adc
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListModel.java b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListModel.java
new file mode 100644
index 000000000..edbf45416
index 0000000000..edbf454163
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListModel.java
@@ -0,0 +1,47 @@
@@ -988,7 +988,7 @@ index 000000000..edbf45416
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListMouseAdapter.java b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListMouseAdapter.java
new file mode 100644
index 000000000..13a5eb3ad
index 0000000000..13a5eb3ad3
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListMouseAdapter.java
@@ -0,0 +1,32 @@
@@ -1026,7 +1026,7 @@ index 000000000..13a5eb3ad
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/util/GUIColor.java b/src/main/java/net/pl3x/purpur/gui/util/GUIColor.java
new file mode 100644
index 000000000..973c8ddf9
index 0000000000..973c8ddf93
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/util/GUIColor.java
@@ -0,0 +1,54 @@
@@ -1086,7 +1086,7 @@ index 000000000..973c8ddf9
+}
diff --git a/src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java b/src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
new file mode 100644
index 000000000..4b340b88a
index 0000000000..4b340b88a2
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
@@ -0,0 +1,86 @@
@@ -1177,7 +1177,7 @@ index 000000000..4b340b88a
+
+}
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index a9bb98765..4be7613d0 100644
index 476f4a5cbe..522048dc9e 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -1,8 +1,17 @@

2
patches/server/0043-Players-should-not-cram-to-death.patch → patches/server/0044-Players-should-not-cram-to-death.patch
View File

@@ -1,4 +1,4 @@
From 6983533f3725df31adc9fce5c7e3adc55485a42e Mon Sep 17 00:00:00 2001
From 9529db7062205568ba0d4dc05d0dd9fad730bddf Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:01:46 -0500
Subject: [PATCH] Players should not cram to death

2
patches/server/0044-Add-EntityPortalReadyEvent.patch → patches/server/0045-Add-EntityPortalReadyEvent.patch
View File

@@ -1,4 +1,4 @@
From 79234404abf4dff72c9563f80ee54b351978ed62 Mon Sep 17 00:00:00 2001
From b57d0b74f8cafb178eada55ddc0ea8370bc9da1e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 11 Jan 2020 23:12:52 -0600
Subject: [PATCH] Add EntityPortalReadyEvent

14
patches/server/0045-Implement-elytra-settings.patch → patches/server/0046-Implement-elytra-settings.patch
View File

@@ -1,4 +1,4 @@
From b27d4ef147b5bdf0411208613ae3b4a13dc914e2 Mon Sep 17 00:00:00 2001
From 06d3e2899cea8bb9a7a4143b6acf6afc157e14f3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 25 Jul 2019 18:07:37 -0500
Subject: [PATCH] Implement elytra settings
@@ -13,7 +13,7 @@ Subject: [PATCH] Implement elytra settings
6 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 21b5bc47d..c1cc24cf1 100644
index 21b5bc47d7..c1cc24cf11 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2658,9 +2658,16 @@ public abstract class EntityLiving extends Entity {
@@ -37,7 +37,7 @@ index 21b5bc47d..c1cc24cf1 100644
} else {
flag = false;
diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
index bd524a35b..c0e8cd0cd 100644
index bd524a35bb..c0e8cd0cdc 100644
--- a/src/main/java/net/minecraft/server/ItemFireworks.java
+++ b/src/main/java/net/minecraft/server/ItemFireworks.java
@@ -39,6 +39,14 @@ public class ItemFireworks extends Item {
@@ -56,7 +56,7 @@ index bd524a35b..c0e8cd0cd 100644
itemstack.subtract(1);
} else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index ce6a46685..8c3bbef66 100644
index ce6a466852..8c3bbef666 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -402,7 +402,7 @@ public final class ItemStack {
@@ -82,7 +82,7 @@ index ce6a46685..8c3bbef66 100644
if (this.count == 1 && t0 instanceof EntityHuman) {
org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityHuman) t0, this);
diff --git a/src/main/java/net/minecraft/server/ItemTrident.java b/src/main/java/net/minecraft/server/ItemTrident.java
index f571a1586..c26300eac 100644
index f571a1586d..c26300eacd 100644
--- a/src/main/java/net/minecraft/server/ItemTrident.java
+++ b/src/main/java/net/minecraft/server/ItemTrident.java
@@ -100,6 +100,16 @@ public class ItemTrident extends Item {
@@ -103,7 +103,7 @@ index f571a1586..c26300eac 100644
entityhuman.r(20);
if (entityhuman.onGround) {
diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java
index 62a081006..53e7e8268 100644
index 62a0810062..53e7e82688 100644
--- a/src/main/java/net/minecraft/server/Vec3D.java
+++ b/src/main/java/net/minecraft/server/Vec3D.java
@@ -100,6 +100,7 @@ public class Vec3D implements IPosition {
@@ -115,7 +115,7 @@ index 62a081006..53e7e8268 100644
return this.x * this.x + this.y * this.y + this.z * this.z;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 299b080c8..5318a8e32 100644
index 299b080c89..5318a8e327 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -142,6 +142,19 @@ public class PurpurWorldConfig {

8
patches/server/0046-Add-blacklist-option-for-grindstone.patch → patches/server/0047-Add-blacklist-option-for-grindstone.patch
View File

@@ -1,4 +1,4 @@
From caa81e11598a014df82fe474f0dac6eaad0c4b39 Mon Sep 17 00:00:00 2001
From d445f4a7df0a26d7805584ac4d5939b178a30062 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 1 Aug 2019 19:15:12 -0500
Subject: [PATCH] Add blacklist option for grindstone
@@ -10,7 +10,7 @@ Subject: [PATCH] Add blacklist option for grindstone
3 files changed, 35 insertions(+)
diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java
index ed88e208d..fcfb4abdc 100644
index ed88e208d0..fcfb4abdc2 100644
--- a/src/main/java/net/minecraft/server/ContainerGrindstone.java
+++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java
@@ -57,12 +57,24 @@ public class ContainerGrindstone extends Container {
@@ -51,7 +51,7 @@ index ed88e208d..fcfb4abdc 100644
Map<Enchantment, Integer> map = EnchantmentManager.a(itemstack);
Iterator iterator = map.entrySet().iterator();
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 8c3bbef66..d5e0578b2 100644
index 8c3bbef666..d5e0578b25 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -542,6 +542,12 @@ public final class ItemStack {
@@ -68,7 +68,7 @@ index 8c3bbef66..d5e0578b2 100644
return this.getItem().f(this);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5318a8e32..9c60855d6 100644
index 5318a8e327..9c60855d66 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -8,6 +8,7 @@ import net.minecraft.server.MinecraftKey;

8
patches/server/0047-Implement-lagging-threshold.patch → patches/server/0048-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From dec4e338ded47a5c9bbcfbc93899016dea718f4e Mon Sep 17 00:00:00 2001
From 27637e65736ed89d854c2693de7352528be84b84 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
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, 14 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f1266767e..2b60ecde7 100644
index d9407aedbf..5baeb156e1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -184,6 +184,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -30,7 +30,7 @@ index f1266767e..2b60ecde7 100644
}
midTickChunksTasksRan = 0; // Paper
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d3e1c8c40..ab20fa2fa 100644
index d3e1c8c407..ab20fa2fae 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -139,6 +139,11 @@ public class PurpurConfig {
@@ -46,7 +46,7 @@ index d3e1c8c40..ab20fa2fa 100644
private static void dontSendUselessEntityPackets() {
dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 64f1190b0..e890a1f81 100644
index 64f1190b03..e890a1f815 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2286,4 +2286,11 @@ public final class CraftServer implements Server {

2
patches/server/0048-Implement-configurable-villager-brain-ticks.patch → patches/server/0049-Implement-configurable-villager-brain-ticks.patch
View File

@@ -1,4 +1,4 @@
From 074446feb4df94dc7e1a086805c30953ba0e5888 Mon Sep 17 00:00:00 2001
From c7c80f357a335240d763c8f9a0306e2541d151e3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 08:28:21 -0500
Subject: [PATCH] Implement configurable villager brain ticks

6
patches/server/0049-Add-option-for-zombies-targetting-turtle-eggs.patch → patches/server/0050-Add-option-for-zombies-targetting-turtle-eggs.patch
View File

@@ -1,4 +1,4 @@
From 9fff2923f2cbf3a4d1dc4a5a798fb64955352e1f Mon Sep 17 00:00:00 2001
From d096e6768ecf1714afac203d91cb4b0609e7ae90 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 17 Aug 2019 15:27:09 -0500
Subject: [PATCH] Add option for zombies targetting turtle eggs
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option for zombies targetting turtle eggs
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 8d1f04415..95ae6f349 100644
index 8d1f04415e..95ae6f3494 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -64,7 +64,7 @@ public class EntityZombie extends EntityMonster {
@@ -22,7 +22,7 @@ index 8d1f04415..95ae6f349 100644
this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
this.targetSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f1ed653b3..114cd3f80 100644
index f1ed653b3a..114cd3f808 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -806,10 +806,12 @@ public class PurpurWorldConfig {

6
patches/server/0050-Implement-bamboo-growth-settings.patch → patches/server/0051-Implement-bamboo-growth-settings.patch
View File

@@ -1,4 +1,4 @@
From 5b9bc011ab97ef7aa3239b6d6bfc6bf078348768 Mon Sep 17 00:00:00 2001
From 6653c569a030023fcef774eb65bd80e36c5380fe Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 23 Aug 2019 20:57:29 -0500
Subject: [PATCH] Implement bamboo growth settings
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement bamboo growth settings
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java
index 02c548dd9..016ceebb9 100644
index 02c548dd9c..016ceebb9d 100644
--- a/src/main/java/net/minecraft/server/BlockBamboo.java
+++ b/src/main/java/net/minecraft/server/BlockBamboo.java
@@ -10,7 +10,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {
@@ -76,7 +76,7 @@ index 02c548dd9..016ceebb9 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 114cd3f80..61c19661c 100644
index 114cd3f808..61c19661c3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -72,6 +72,13 @@ public class PurpurWorldConfig {

22
patches/server/0051-Climbing-should-not-bypass-cramming-gamerule.patch → patches/server/0052-Climbing-should-not-bypass-cramming-gamerule.patch
View File

@@ -1,4 +1,4 @@
From 7692271288d67f40ec95da714f6d6b33fa4da4b2 Mon Sep 17 00:00:00 2001
From 1f7d701d09511913123d84fabb0e93c65b92352c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:06:20 -0500
Subject: [PATCH] Climbing should not bypass cramming gamerule
@@ -17,7 +17,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
10 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 39bd34ab3..ce0821a65 100644
index 39bd34ab34..ce0821a656 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1573,6 +1573,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -34,7 +34,7 @@ index 39bd34ab3..ce0821a65 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index d35a0b2d9..d4aa9b24f 100644
index d35a0b2d94..d4aa9b24f7 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -318,7 +318,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -47,7 +47,7 @@ index d35a0b2d9..d4aa9b24f 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
index 592408bac..7a740f676 100644
index 592408bac9..7a740f6768 100644
--- a/src/main/java/net/minecraft/server/EntityBat.java
+++ b/src/main/java/net/minecraft/server/EntityBat.java
@@ -85,7 +85,7 @@ public class EntityBat extends EntityAmbient {
@@ -60,7 +60,7 @@ index 592408bac..7a740f676 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index fdf306e80..563fc8ced 100644
index fdf306e80a..563fc8ced0 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -98,7 +98,7 @@ public class EntityBoat extends Entity {
@@ -73,7 +73,7 @@ index fdf306e80..563fc8ced 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index f31cb0554..0ecdea671 100644
index f31cb05542..0ecdea6710 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -181,7 +181,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -86,7 +86,7 @@ index f31cb0554..0ecdea671 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index c1cc24cf1..0f8ba92a8 100644
index c1cc24cf11..0f8ba92a84 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2692,7 +2692,7 @@ public abstract class EntityLiving extends Entity {
@@ -112,7 +112,7 @@ index c1cc24cf1..0f8ba92a8 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 1f3e5bd28..ae4758f25 100644
index 1f3e5bd288..ae4758f251 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -105,7 +105,7 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -125,7 +125,7 @@ index 1f3e5bd28..ae4758f25 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
index 7ba2f3a35..dd2cd7b21 100644
index 7ba2f3a351..dd2cd7b219 100644
--- a/src/main/java/net/minecraft/server/EntityParrot.java
+++ b/src/main/java/net/minecraft/server/EntityParrot.java
@@ -392,7 +392,7 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -138,7 +138,7 @@ index 7ba2f3a35..dd2cd7b21 100644
}
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 0bf1a14b7..9f5860ca8 100644
index 0bf1a14b7c..9f5860ca8b 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -36,11 +36,17 @@ public final class IEntitySelector {
@@ -161,7 +161,7 @@ index 0bf1a14b7..9f5860ca8 100644
} else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ec())) {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 61c19661c..1a2512b52 100644
index 61c19661c3..1a2512b528 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -136,6 +136,7 @@ public class PurpurWorldConfig {

8
patches/server/0052-Option-for-slimes-not-pushable.patch → patches/server/0053-Option-for-slimes-not-pushable.patch
View File

@@ -1,4 +1,4 @@
From cf638798f15948a19cdb28890f59418cd3234fa3 Mon Sep 17 00:00:00 2001
From 1897ed89852ab0037f27f345b3f908c8cfff0e3d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 23 Aug 2019 21:56:31 -0500
Subject: [PATCH] Option for slimes not pushable
@@ -10,7 +10,7 @@ Subject: [PATCH] Option for slimes not pushable
3 files changed, 22 insertions(+)
diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
index b29525c40..1e72b3bbc 100644
index b29525c40d..1e72b3bbc5 100644
--- a/src/main/java/net/minecraft/server/BlockPiston.java
+++ b/src/main/java/net/minecraft/server/BlockPiston.java
@@ -332,6 +332,16 @@ public class BlockPiston extends BlockDirectional {
@@ -31,7 +31,7 @@ index b29525c40..1e72b3bbc 100644
if (event.isCancelled()) {
diff --git a/src/main/java/net/minecraft/server/BlockSlime.java b/src/main/java/net/minecraft/server/BlockSlime.java
index 01f32659d..52ab86f0b 100644
index 01f32659d9..52ab86f0b1 100644
--- a/src/main/java/net/minecraft/server/BlockSlime.java
+++ b/src/main/java/net/minecraft/server/BlockSlime.java
@@ -49,4 +49,11 @@ public class BlockSlime extends BlockHalfTransparent {
@@ -47,7 +47,7 @@ index 01f32659d..52ab86f0b 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index ab20fa2fa..72ad9dce7 100644
index ab20fa2fae..72ad9dce7d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -149,6 +149,11 @@ public class PurpurConfig {

6
patches/server/0053-Bring-back-server-name.patch → patches/server/0054-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From c26c5993da3fb17e8d5cdb2335d45e8cabcb0363 Mon Sep 17 00:00:00 2001
From e82128bc8f0e4381e117ea7d5546b7afd661791c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
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<DedicatedServerPr
@@ -21,7 +21,7 @@ index 0c3ec8357..309f5562b 100644
public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
public final boolean pvp = this.getBoolean("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e890a1f81..b488d1848 100644
index e890a1f815..b488d18486 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2288,6 +2288,11 @@ public final class CraftServer implements Server {

8
patches/server/0054-Dispenser-curse-of-binding-protection.patch → patches/server/0055-Dispenser-curse-of-binding-protection.patch
View File

@@ -1,4 +1,4 @@
From ab6859b1dd1b906b4c268ae29f01824618083f52 Mon Sep 17 00:00:00 2001
From 3ba680a8a7fb7db101ca8b54a7e26eff2193d0f5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 25 Aug 2019 00:09:52 -0500
Subject: [PATCH] Dispenser curse of binding protection
@@ -10,7 +10,7 @@ Subject: [PATCH] Dispenser curse of binding protection
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index a35459d09..84f208b8c 100644
index fbca429090..bf9d044b0b 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -913,6 +913,13 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -28,7 +28,7 @@ index a35459d09..84f208b8c 100644
Item item = itemstack.getItem();
diff --git a/src/main/java/net/minecraft/server/ItemArmor.java b/src/main/java/net/minecraft/server/ItemArmor.java
index df8c42bfb..a4b3d0c29 100644
index df8c42bfbd..a4b3d0c298 100644
--- a/src/main/java/net/minecraft/server/ItemArmor.java
+++ b/src/main/java/net/minecraft/server/ItemArmor.java
@@ -31,7 +31,7 @@ public class ItemArmor extends Item {
@@ -49,7 +49,7 @@ index df8c42bfb..a4b3d0c29 100644
return this.b;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1a2512b52..b8754ba2d 100644
index 1a2512b528..b8754ba2d2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -106,6 +106,11 @@ public class PurpurWorldConfig {

10
patches/server/0055-Implement-LivingEntity-safeFallDistance.patch → patches/server/0056-Implement-LivingEntity-safeFallDistance.patch
View File

@@ -1,4 +1,4 @@
From 30b16e3582f794fd004dc65a83a91cef2951cc93 Mon Sep 17 00:00:00 2001
From 5b5ba5db23982d2d32640b026f8e837318a7a5fd Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 5 May 2019 12:58:45 -0500
Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -11,7 +11,7 @@ Subject: [PATCH] Implement LivingEntity safeFallDistance
4 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
index 4296aaa07..a2e3e6001 100644
index 4296aaa074..a2e3e60012 100644
--- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
+++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
@@ -5,6 +5,9 @@ public class EntityGiantZombie extends EntityMonster {
@@ -25,7 +25,7 @@ index 4296aaa07..a2e3e6001 100644
// Purpur start
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index 0ecdea671..e099ef9a0 100644
index 0ecdea6710..e099ef9a06 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -222,7 +222,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -38,7 +38,7 @@ index 0ecdea671..e099ef9a0 100644
protected int getChestSlots() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 0f8ba92a8..d6751e3cc 100644
index 0f8ba92a84..d6751e3cce 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -125,6 +125,7 @@ public abstract class EntityLiving extends Entity {
@@ -59,7 +59,7 @@ index 0f8ba92a8..d6751e3cc 100644
protected void cZ() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 245bd116d..4c16f96ab 100644
index a461ac3614..4874c2242f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -739,4 +739,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

6
patches/server/0056-Add-option-for-boats-to-eject-players-on-land.patch → patches/server/0057-Add-option-for-boats-to-eject-players-on-land.patch
View File

@@ -1,4 +1,4 @@
From 03c1819b749fc733b4a3a502286e33037187f2b8 Mon Sep 17 00:00:00 2001
From 160daef535fc94a099255c2f409c92028bcee7e7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 7 Sep 2019 22:47:59 -0500
Subject: [PATCH] Add option for boats to eject players on land
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option for boats to eject players on land
2 files changed, 3 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index 563fc8ced..479ed7c7b 100644
index 563fc8ced0..479ed7c7bc 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -431,6 +431,7 @@ public class EntityBoat extends Entity {
@@ -21,7 +21,7 @@ index 563fc8ced..479ed7c7b 100644
} else {
return EntityBoat.EnumStatus.IN_AIR;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b8754ba2d..2271d13f1 100644
index b8754ba2d2..2271d13f11 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -134,6 +134,7 @@ public class PurpurWorldConfig {

14
patches/server/0057-Advancement-API-Additions.patch → patches/server/0058-Advancement-API-Additions.patch
View File

@@ -1,4 +1,4 @@
From d62e303f4790eeb5bed000ee1149ffbd093642bc Mon Sep 17 00:00:00 2001
From a85e45062879867543939848629375d400158d31 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 31 May 2019 21:24:33 -0500
Subject: [PATCH] Advancement API Additions
@@ -14,7 +14,7 @@ Subject: [PATCH] Advancement API Additions
create mode 100644 src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
diff --git a/src/main/java/net/minecraft/server/Advancement.java b/src/main/java/net/minecraft/server/Advancement.java
index 4b85551fa..4cba4187a 100644
index 4b85551faf..4cba4187a0 100644
--- a/src/main/java/net/minecraft/server/Advancement.java
+++ b/src/main/java/net/minecraft/server/Advancement.java
@@ -65,7 +65,7 @@ public class Advancement {
@@ -27,7 +27,7 @@ index 4b85551fa..4cba4187a 100644
}
diff --git a/src/main/java/net/minecraft/server/AdvancementDisplay.java b/src/main/java/net/minecraft/server/AdvancementDisplay.java
index e8172d56f..976c85ef1 100644
index e8172d56fe..976c85ef1b 100644
--- a/src/main/java/net/minecraft/server/AdvancementDisplay.java
+++ b/src/main/java/net/minecraft/server/AdvancementDisplay.java
@@ -16,10 +16,11 @@ public class AdvancementDisplay {
@@ -75,7 +75,7 @@ index e8172d56f..976c85ef1 100644
return this.h;
}
diff --git a/src/main/java/net/minecraft/server/AdvancementFrameType.java b/src/main/java/net/minecraft/server/AdvancementFrameType.java
index a9c49a434..551a84547 100644
index a9c49a4348..551a845476 100644
--- a/src/main/java/net/minecraft/server/AdvancementFrameType.java
+++ b/src/main/java/net/minecraft/server/AdvancementFrameType.java
@@ -1,14 +1,25 @@
@@ -107,7 +107,7 @@ index a9c49a434..551a84547 100644
this.e = i;
this.f = enumchatformat;
diff --git a/src/main/java/net/minecraft/server/CriterionTrigger.java b/src/main/java/net/minecraft/server/CriterionTrigger.java
index 4fe732447..6e5d81daf 100644
index 4fe7324475..6e5d81daf1 100644
--- a/src/main/java/net/minecraft/server/CriterionTrigger.java
+++ b/src/main/java/net/minecraft/server/CriterionTrigger.java
@@ -27,6 +27,7 @@ public interface CriterionTrigger<T extends CriterionInstance> {
@@ -119,7 +119,7 @@ index 4fe732447..6e5d81daf 100644
return this.a;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
index a5aadf285..b0a7092d6 100644
index a5aadf2850..b0a7092d62 100644
--- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
+++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
@@ -27,4 +27,11 @@ public class CraftAdvancement implements org.bukkit.advancement.Advancement {
@@ -136,7 +136,7 @@ index a5aadf285..b0a7092d6 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
new file mode 100644
index 000000000..1cbb1e67b
index 0000000000..1cbb1e67b6
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
@@ -0,0 +1,47 @@

6
patches/server/0058-Add-option-to-set-armorstand-step-height.patch → patches/server/0059-Add-option-to-set-armorstand-step-height.patch
View File

@@ -1,4 +1,4 @@
From 97d8a3bb6a940699fdd07db6c75d5ac8d6122f03 Mon Sep 17 00:00:00 2001
From 2566c488642ec8177cda2802bc760f30dccdaa37 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 6 Oct 2019 12:46:35 -0500
Subject: [PATCH] Add option to set armorstand step height
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option to set armorstand step height
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index d4aa9b24f..d65544953 100644
index d4aa9b24f7..d655449534 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -62,7 +62,6 @@ public class EntityArmorStand extends EntityLiving {
@@ -29,7 +29,7 @@ index d4aa9b24f..d65544953 100644
if (!this.canTick) {
if (this.noTickPoseDirty) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2271d13f1..4bb5ddea4 100644
index 2271d13f11..4bb5ddea44 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -135,6 +135,7 @@ public class PurpurWorldConfig {

6
patches/server/0059-Implement-ItemFactory-getMonsterEgg.patch → patches/server/0060-Implement-ItemFactory-getMonsterEgg.patch
View File

@@ -1,4 +1,4 @@
From c647a91f3e4077945915c9be571fa76205454887 Mon Sep 17 00:00:00 2001
From 271dc5e77dee7646380eb8b909e5570731ba83cf Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 5 Jul 2019 16:36:55 -0500
Subject: [PATCH] Implement ItemFactory#getMonsterEgg
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement ItemFactory#getMonsterEgg
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
index 24af4c11d..8ef2c3223 100644
index 24af4c11d6..8ef2c32236 100644
--- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
+++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
@@ -8,7 +8,7 @@ import javax.annotation.Nullable;
@@ -22,7 +22,7 @@ index 24af4c11d..8ef2c3223 100644
private final int c;
private final EntityTypes<?> d;
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
index 23d775645..29161032c 100644
index 23d7756456..29161032c3 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -354,4 +354,18 @@ public final class CraftItemFactory implements ItemFactory {

8
patches/server/0060-Alternative-Keepalive-Handling.patch → patches/server/0061-Alternative-Keepalive-Handling.patch
View File

@@ -1,4 +1,4 @@
From f9d2d62f4fe967fa09e9a03798c4cf3d53a9cb53 Mon Sep 17 00:00:00 2001
From 0f59e2f777292ba288e3488eae06324d7e5159c7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 11 Oct 2019 00:17:39 -0500
Subject: [PATCH] Alternative Keepalive Handling
@@ -10,7 +10,7 @@ Subject: [PATCH] Alternative Keepalive Handling
3 files changed, 33 insertions(+)
diff --git a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
index 8e93f1540..470f92c4f 100644
index 8e93f1540b..470f92c4fb 100644
--- a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
+++ b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
@@ -22,6 +22,7 @@ public class PacketPlayInKeepAlive implements Packet<PacketListenerPlayIn> {
@@ -22,7 +22,7 @@ index 8e93f1540..470f92c4f 100644
return this.a;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 17b23ed2f..d3b4f0bea 100644
index 762aad378c..0cd012dfc3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -75,6 +75,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -74,7 +74,7 @@ index 17b23ed2f..d3b4f0bea 100644
if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 72ad9dce7..ed2a31277 100644
index 72ad9dce7d..ed2a312773 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -144,6 +144,11 @@ public class PurpurConfig {

4
patches/server/0061-Implement-PlayerSetSpawnerTypeWithEggEvent.patch → patches/server/0062-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
View File

@@ -1,4 +1,4 @@
From a5d30ae75a2e55a3450e8a09537268ea07b479b6 Mon Sep 17 00:00:00 2001
From f7c3b76fd6493e7e4105d8a3da92f101f60c0187 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 5 Jul 2019 18:21:00 -0500
Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent
@@ -8,7 +8,7 @@ Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent
1 file changed, 14 insertions(+)
diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
index 8ef2c3223..237fdeda5 100644
index 8ef2c32236..237fdeda5c 100644
--- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
+++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
@@ -2,6 +2,11 @@ package net.minecraft.server;

4
patches/server/0062-Add-moon-phase-API.patch → patches/server/0063-Add-moon-phase-API.patch
View File

@@ -1,4 +1,4 @@
From 634656de202a96a0b4004e5a7820b014b315641c Mon Sep 17 00:00:00 2001
From b3b4d02dc668165685959f67e420b92033d8b438 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 1 Feb 2020 22:22:16 -0600
Subject: [PATCH] Add moon phase API
@@ -8,7 +8,7 @@ Subject: [PATCH] Add moon phase API
1 file changed, 8 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 7230ddbf6..2c2176919 100644
index d3c5b7d190..66f3e9393e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2462,6 +2462,14 @@ public class CraftWorld implements World {

10
patches/server/0063-Add-getPlacementBlockData-to-World.patch → patches/server/0064-Add-getPlacementBlockData-to-World.patch
View File

@@ -1,4 +1,4 @@
From dc561d5d0f39071ea710f243bfe8581ebb71de5d Mon Sep 17 00:00:00 2001
From e566feaf03a63249eef301206503eaf5a3226a17 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
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,7 +66,7 @@ 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 2c2176919..1524d0ed2 100644
index 66f3e9393e..414fc4baf9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2468,6 +2468,11 @@ public class CraftWorld implements World {

Some files were not shown because too many files have changed in this diff Show More