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

Merge in Tuinity patches

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-08 12:49:59 -05:00
parent c8a65b216f
commit a32448bda1
140 changed files with 11159 additions and 1947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
current-paper
View File

@@ -1 +1 @@
1.15.2--9d13d07cc7a8ea9c980692890d7407bc20350c03
1.15.2--14a713f6ad2e85105f0be4e3ddebef4e19d0c22e

113
patches/api/0002-Tuinity-API-Patches.patch Normal file
View File

@@ -0,0 +1,113 @@
From ac2da46e3db5951ece720838726cf5b0d8ceb7f2 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 14 Dec 2018 21:52:29 -0800
Subject: [PATCH] Tuinity API Patches
---
pom.xml | 8 ++++--
src/main/java/org/bukkit/World.java | 28 +++++++++++++++++++++
src/main/java/org/bukkit/entity/Player.java | 23 +++++++++++++++++
3 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 58a1f7d07..19d003fa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,8 +18,8 @@
<properties>
<!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -154,6 +154,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
+ <!-- Tuinity - https://issues.apache.org/jira/browse/MCOMPILER-346 -->
+ <configuration>
+ <forceJavacCompilerUse>true</forceJavacCompilerUse>
+ </configuration>
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 5047be15f..d9df7509a 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3067,6 +3067,34 @@ public interface World extends PluginMessageRecipient, Metadatable {
int getViewDistance();
// Spigot end
+ // Tuinity start - view distance api
+ /**
+ * Sets the view distance for this world.
+ * @param viewDistance view distance in [2, 32]
+ */
+ void setViewDistance(int viewDistance);
+
+ /**
+ * Returns the no-tick view distance for this world.
+ * <p>
+ * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
+ * be set to tick.
+ * </p>
+ * @return The no-tick view distance for this world.
+ */
+ int getNoTickViewDistance();
+
+ /**
+ * Sets the no-tick view distance for this world.
+ * <p>
+ * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
+ * be set to tick.
+ * </p>
+ * @param viewDistance view distance in [2, 32]
+ */
+ void setNoTickViewDistance(int viewDistance);
+ // Tuinity end - view distance api
+
// Spigot start
public class Spigot {
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 877ea4f32..5367975ac 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1969,6 +1969,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetCooldown();
// Paper end
+ // Tuinity start
+ /**
+ * Returns the no-tick view distance for this player.
+ * <p>
+ * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
+ * be set to tick.
+ * </p>
+ * @return The no-tick view distance for this player.
+ */
+ int getNoTickViewDistance();
+
+ /**
+ * Sets the no-tick view distance for this player. Setting to a value of -1 will default to the world no-tick
+ * view distance.
+ * <p>
+ * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
+ * be set to tick.
+ * </p>
+ * @param viewDistance view distance in [2, 32] or -1
+ */
+ void setNoTickViewDistance(int viewDistance);
+ // Tuinity end
+
// Spigot start
public class Spigot extends Entity.Spigot {
--
2.24.0

2
patches/api/0002-Purpur-config-files.patch → patches/api/0003-Purpur-config-files.patch
View File

@@ -1,4 +1,4 @@
From a5bf35da63687caa3e7bca2b719c2c4f279d5723 Mon Sep 17 00:00:00 2001
From 2cab1732fb9596bf2c2b692f3f018dd51609596f 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

4
patches/api/0003-Host-our-own-timings.patch → patches/api/0004-Host-our-own-timings.patch
View File

@@ -1,4 +1,4 @@
From 8a1d326049c054417215c4323b06599aa1c5542b Mon Sep 17 00:00:00 2001
From 31d3ec5ad187df9a8a60c212260a729abc029703 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Host our own timings
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index 23eb8c65c..13f335997 100644
index 93d5a3f97..a4ae730da 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -206,7 +206,8 @@ class TimingsExport extends Thread {

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

@@ -1,4 +1,4 @@
From 2226788f01d043f4c3839259447f0bacb3c166fb Mon Sep 17 00:00:00 2001
From d8696f7eef73586001263719c3c51525c2760d13 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

2
patches/api/0005-Remove-pointless-annotations-and-deprecations.patch → patches/api/0006-Remove-pointless-annotations-and-deprecations.patch
View File

@@ -1,4 +1,4 @@
From 53631afe68d9acea33e6902859a2e3a39fe370b4 Mon Sep 17 00:00:00 2001
From 88169f864dd54bc7ee722705785554377e745594 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

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

@@ -1,4 +1,4 @@
From fc6e3fdc54656b498d5bb9ae14fad4892ba50229 Mon Sep 17 00:00:00 2001
From 3f163f0caeb3cbf242e1fc7a7d52905a36a52d72 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/0008-Implement-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From 2485a3cead97fe0e750fc0d9e91541d22e433593 Mon Sep 17 00:00:00 2001
From a97b62ca22425cb2e180fe13b2e537905b240822 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
@@ -86,10 +86,10 @@ index 000000000..4db334854
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 877ea4f32..b9fe2a0fa 100644
index 5367975ac..c7cba5046 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2067,4 +2067,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2090,4 +2090,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

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

@@ -1,4 +1,4 @@
From 5674b1e40686d33ce2ca4bf877784dadd9aec77f Mon Sep 17 00:00:00 2001
From fb1b62df2e5107f2a3f0a8d3a99a48a6c711ed62 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

2
patches/api/0009-Add-tick-times-API.patch → patches/api/0010-Add-tick-times-API.patch
View File

@@ -1,4 +1,4 @@
From 91cf9066559c224fe335daba79f4cad4a0aac81c Mon Sep 17 00:00:00 2001
From edf1d2066b94a4e52c17e326ace3b64289ecee8b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:08 -0600
Subject: [PATCH] Add tick times API

2
patches/api/0010-Bring-back-server-name.patch → patches/api/0011-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From ff8c9b346b116a2558a9c6499b600ce56c5f7904 Mon Sep 17 00:00:00 2001
From 598786fbe7fa753987cb8593d89e16758f118fc6 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

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

@@ -1,4 +1,4 @@
From 1797a7519f80bf7356430fe1c8e9444942ba35db Mon Sep 17 00:00:00 2001
From 778fce635a6e952ffde90f502fe471cc363913b3 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/0012-Add-ExecuteCommandEvent.patch → patches/api/0013-Add-ExecuteCommandEvent.patch
View File

@@ -1,4 +1,4 @@
From f142340af07c20e2e48954e21d0395563028f742 Mon Sep 17 00:00:00 2001
From e4c1a33b0b4c1f5fab1b728f52585dd283ab9ddc 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/0013-Implement-ChunkTooLargeEvent.patch → patches/api/0014-Implement-ChunkTooLargeEvent.patch
View File

@@ -1,4 +1,4 @@
From 20b2357b34fb3596a795660ec87e3ec2a4488f62 Mon Sep 17 00:00:00 2001
From 903689d819caca268cb23ae68aa7d452e89cf5e7 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

2
patches/api/0014-Implement-lagging-threshold.patch → patches/api/0015-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From 5d638f431165d9cce1456fa35e5f5947c2dc5893 Mon Sep 17 00:00:00 2001
From 438626929d0f7ecdc1a476539c93fe94230d4226 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

2
patches/api/0015-Advancement-API-Additions.patch → patches/api/0016-Advancement-API-Additions.patch
View File

@@ -1,4 +1,4 @@
From e43f10dce3d188e53ec6cd1a4d9e8819350e95d4 Mon Sep 17 00:00:00 2001
From e073e5ae742d57f67c3d9a075319d00835c1542a 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/0016-Implement-ItemFactory-getMonsterEgg.patch → patches/api/0017-Implement-ItemFactory-getMonsterEgg.patch
View File

@@ -1,4 +1,4 @@
From ba7c31d363c124d1d76e449314cea73c71eaf513 Mon Sep 17 00:00:00 2001
From 5ecbac582fc2724107823f64b9adf673bdf3d84b 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/0017-Implement-PlayerSetSpawnerTypeWithEggEvent.patch → patches/api/0018-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
View File

@@ -1,4 +1,4 @@
From 1706141ee6b09fd3eacc90cd54ce8e10f9bc2b7b Mon Sep 17 00:00:00 2001
From 873158f78a95d7943a75f989a9f35dd8ec9831df 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/0018-Add-MonsterEggSpawnEvent.patch → patches/api/0019-Add-MonsterEggSpawnEvent.patch
View File

@@ -1,4 +1,4 @@
From 42efc2192856cf55d70e06391ac7f8fadf19681a Mon Sep 17 00:00:00 2001
From 78387652cf81f45c5f036d405da4daf466b1c63e 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/0019-Add-ThrownEggHatchEvent.patch → patches/api/0020-Add-ThrownEggHatchEvent.patch
View File

@@ -1,4 +1,4 @@
From 11affff10e4891f58f728891f8fdbcf29de19984 Mon Sep 17 00:00:00 2001
From fbb8402a553e112483f966d23b5066dc844dcfb3 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

6
patches/api/0020-Add-moon-phase-API.patch → patches/api/0021-Add-moon-phase-API.patch
View File

@@ -1,4 +1,4 @@
From 0b2ca9d055cbef330876bd0a759210ce7fd9b907 Mon Sep 17 00:00:00 2001
From 21773eb994120e80f72be1ed9d0a51523149b022 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
@@ -52,10 +52,10 @@ index 000000000..f5ad98c62
+ }
+}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 5047be15f..80d63e250 100644
index d9df7509a..d8178abfc 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3117,6 +3117,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3145,6 +3145,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public List<Raid> getRaids();

2
patches/api/0021-Add-API-for-Villager-resetOffers.patch → patches/api/0022-Add-API-for-Villager-resetOffers.patch
View File

@@ -1,4 +1,4 @@
From c4edd7018545faf35f370d4e8fe4f08ecb2baced Mon Sep 17 00:00:00 2001
From 57837a0e93830ce84c108064a1457cb59a56e385 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()

2
patches/api/0022-Expose-getItemStack-for-Trident.patch → patches/api/0023-Expose-getItemStack-for-Trident.patch
View File

@@ -1,4 +1,4 @@
From 0b7223ebf7e15b584fc72ec60da3ca841f90ed08 Mon Sep 17 00:00:00 2001
From b51632e4cebc06f041b40c0612164edc4eccaaf6 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/0023-Add-more-llama-API.patch → patches/api/0024-Add-more-llama-API.patch
View File

@@ -1,4 +1,4 @@
From b3769f637f3dc7e629337a2d1fc24b68d37069d0 Mon Sep 17 00:00:00 2001
From dfa71eca3789c870c339374b97e07dde48bd57ef 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/0024-Add-more-evoker-API.patch → patches/api/0025-Add-more-evoker-API.patch
View File

@@ -1,4 +1,4 @@
From 8b6dbecee0d1542ac21cc0e0b7cb0972459ad31c Mon Sep 17 00:00:00 2001
From c2c0ee0dfa314e6df207e32e2bfd9516e9efa0f6 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

6
patches/api/0025-Add-getPlacementBlockData-to-World.patch → patches/api/0026-Add-getPlacementBlockData-to-World.patch
View File

@@ -1,4 +1,4 @@
From 751e2690ac68caf38a98e10dba2fd5638798c468 Mon Sep 17 00:00:00 2001
From c5c975aca49194cc02c4af567d9b73a8edcc6f22 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
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
1 file changed, 10 insertions(+)
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 80d63e250..3a0be1004 100644
index d8178abfc..b17a03334 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3125,6 +3125,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3153,6 +3153,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
@NotNull
net.pl3x.purpur.MoonPhase getMoonPhase();

2
patches/api/0026-Add-playPickupItemAnimation-to-LivingEntity.patch → patches/api/0027-Add-playPickupItemAnimation-to-LivingEntity.patch
View File

@@ -1,4 +1,4 @@
From c6a7136fcdf483a98edb1d05c4f04622d4f57c87 Mon Sep 17 00:00:00 2001
From 46686f8401311206e87ecd14fef0bd3db10fda27 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/0027-Add-getPlayer-to-SkeletonHorseTrapEvent.patch → patches/api/0028-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
View File

@@ -1,4 +1,4 @@
From 562ac86ea29bd27b5fc5d752b6420f3453417d62 Mon Sep 17 00:00:00 2001
From 58841d3d8e5e181681cabd0855899db6ad1dc73f 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/0028-Add-LootableInventoryFirstFillEvent.patch → patches/api/0029-Add-LootableInventoryFirstFillEvent.patch
View File

@@ -1,4 +1,4 @@
From ddf19ccd8ab11161730a8343d8d3b7d519645581 Mon Sep 17 00:00:00 2001
From f4f5c5f77c403730091b31b16aa5420b0186377a 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/0029-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch → patches/api/0030-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch
View File

@@ -1,4 +1,4 @@
From cac280553cbb6a3332741a1eb53118a46eecee90 Mon Sep 17 00:00:00 2001
From fdba4b920a64e6c43993c7afa7a75c2edc13bade 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/0030-Implement-EntityMoveEvent.patch → patches/api/0031-Implement-EntityMoveEvent.patch
View File

@@ -1,4 +1,4 @@
From 534c94b62bf879c90aeecd784759b4e4564b884e Mon Sep 17 00:00:00 2001
From c34b526bbe4747bcfaef76680f94101a76a6bfe0 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

10280
patches/server/0002-Tuinity-Server-Patches.patch Normal file
View File

File diff suppressed because it is too large Load Diff

53
patches/server/0002-Purpur-config-files.patch → patches/server/0003-Purpur-config-files.patch
View File

@@ -1,4 +1,4 @@
From e99b757757c6fa75be9da4b9cf7c66deeaf13b7a Mon Sep 17 00:00:00 2001
From c9be48cc2164c8c8aa6d1e8c0003c48dcc2b5f0e 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
@@ -6,21 +6,21 @@ Subject: [PATCH] Purpur config files
---
.../com/destroystokyo/paper/PaperConfig.java | 2 +
.../net/minecraft/server/DedicatedServer.java | 9 +
src/main/java/net/minecraft/server/World.java | 3 +
src/main/java/net/minecraft/server/World.java | 2 +
src/main/java/net/pl3x/purpur/Metrics.java | 598 ++++++++++++++++++
.../java/net/pl3x/purpur/PurpurCommand.java | 66 ++
.../java/net/pl3x/purpur/PurpurConfig.java | 135 ++++
.../net/pl3x/purpur/PurpurWorldConfig.java | 67 ++
.../org/bukkit/craftbukkit/CraftServer.java | 11 +
.../java/org/bukkit/craftbukkit/Main.java | 8 +
9 files changed, 899 insertions(+)
9 files changed, 898 insertions(+)
create mode 100644 src/main/java/net/pl3x/purpur/Metrics.java
create mode 100644 src/main/java/net/pl3x/purpur/PurpurCommand.java
create mode 100644 src/main/java/net/pl3x/purpur/PurpurConfig.java
create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 1d7d1ffbf7..d886f1d145 100644
index 1d7d1ffbf..d886f1d14 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -96,10 +96,12 @@ public class PaperConfig {
@@ -37,7 +37,7 @@ index 1d7d1ffbf7..d886f1d145 100644
static void readConfig(Class<?> clazz, Object instance) {
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 349a0ea213..d70c8cab2b 100644
index ede436939..8c7156bb5 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
@@ -55,31 +55,30 @@ index 349a0ea213..d70c8cab2b 100644
+ // Purpur end
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
// Paper end
com.tuinity.tuinity.config.TuinityConfig.init((File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index baad985178..89090b12d2 100644
index c0c83d433..ba1dab794 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -80,6 +80,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
@@ -81,6 +81,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
public final com.tuinity.tuinity.config.TuinityConfig.WorldConnfig tuinityConfig; // Tuinity - Server Config
+ public final net.pl3x.purpur.PurpurWorldConfig purpurConfig; // Purpur
+
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
public static BlockPosition lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter;
@@ -129,6 +131,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
@@ -132,6 +133,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper
this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConnfig(worlddata.getName()); // Tuinity - Server Config
+ this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig(worlddata.getName(), this.paperConfig, this.spigotConfig); // Purpur
this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/Metrics.java b/src/main/java/net/pl3x/purpur/Metrics.java
new file mode 100644
index 0000000000..246eb8140f
index 000000000..246eb8140
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/Metrics.java
@@ -0,0 +1,598 @@
@@ -683,7 +682,7 @@ index 0000000000..246eb8140f
+}
diff --git a/src/main/java/net/pl3x/purpur/PurpurCommand.java b/src/main/java/net/pl3x/purpur/PurpurCommand.java
new file mode 100644
index 0000000000..f8cf4ad234
index 000000000..f8cf4ad23
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurCommand.java
@@ -0,0 +1,66 @@
@@ -755,7 +754,7 @@ index 0000000000..f8cf4ad234
+}
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 0000000000..706d787579
index 000000000..706d78757
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,135 @@
@@ -896,7 +895,7 @@ index 0000000000..706d787579
+}
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 0000000000..eda37fa43f
index 000000000..eda37fa43
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -0,0 +1,67 @@
@@ -968,26 +967,26 @@ index 0000000000..eda37fa43f
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index fc074a66c9..df4fb5947a 100644
index 23c3a69fa..b64413084 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -796,6 +796,7 @@ public final class CraftServer implements Server {
@@ -797,6 +797,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config
+ net.pl3x.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
for (WorldServer world : console.getWorlds()) {
world.worldData.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -812,6 +813,7 @@ public final class CraftServer implements Server {
}
@@ -814,6 +815,7 @@ public final class CraftServer implements Server {
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
world.tuinityConfig.init(); // Tuinity - Server Config
+ world.purpurConfig.init(); // Purpur
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -830,6 +832,7 @@ public final class CraftServer implements Server {
@@ -832,6 +834,7 @@ public final class CraftServer implements Server {
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -995,7 +994,7 @@ index fc074a66c9..df4fb5947a 100644
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2060,6 +2063,14 @@ public final class CraftServer implements Server {
@@ -2065,6 +2068,14 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}
@@ -1011,12 +1010,12 @@ index fc074a66c9..df4fb5947a 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 374e0450a2..b5bc4e2097 100644
index 2666940e8..7fc56f67f 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -138,6 +138,14 @@ public class Main {
@@ -145,6 +145,14 @@ public class Main {
.describedAs("Yml file");
// Paper end
/* Conctete End - Server Config */
+ // Purpur Start
+ acceptsAll(asList("purpur", "purpur-settings"), "File for purpur settings")

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

@@ -1,4 +1,4 @@
From a8c2e4c0b159d27d014a1b64ce56f11e3b184014 Mon Sep 17 00:00:00 2001
From b5058389746648812a8af122af30dae32048f40f 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
@@ -90,7 +90,7 @@ Subject: [PATCH] decompile-fixes
83 files changed, 222 insertions(+), 228 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungle.java b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
index de831ed87e..9c38f8907a 100644
index de831ed87..9c38f8907 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 {
@@ -107,7 +107,7 @@ index de831ed87e..9c38f8907a 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 5ae19373d6..2a6dafccdd 100644
index 5ae19373d..2a6dafccd 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 {
@@ -124,7 +124,7 @@ index 5ae19373d6..2a6dafccdd 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 2627404141..f4e9345aeb 100644
index 262740414..f4e9345ae 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 {
@@ -141,7 +141,7 @@ index 2627404141..f4e9345aeb 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 a42098da5c..58c30f6523 100644
index a42098da5..58c30f652 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 {
@@ -156,7 +156,7 @@ index a42098da5c..58c30f6523 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 27fa238013..9437438c82 100644
index 27fa23801..9437438c8 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 {
@@ -171,7 +171,7 @@ index 27fa238013..9437438c82 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 51b1d39f53..3e5c23d31e 100644
index 51b1d39f5..3e5c23d31 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 {
@@ -186,7 +186,7 @@ index 51b1d39f53..3e5c23d31e 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 b74f23cff6..d5eb5c91c4 100644
index b74f23cff..d5eb5c91c 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 {
@@ -201,7 +201,7 @@ index b74f23cff6..d5eb5c91c4 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 17fe3818dd..e805f9568e 100644
index 17fe3818d..e805f9568 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 {
@@ -216,7 +216,7 @@ index 17fe3818dd..e805f9568e 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 2c230be98f..1b92f4567d 100644
index 2c230be98..1b92f4567 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 {
@@ -233,7 +233,7 @@ index 2c230be98f..1b92f4567d 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 d96e820e07..b9a5cb63a4 100644
index d96e820e0..b9a5cb63a 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 {
@@ -261,7 +261,7 @@ index d96e820e07..b9a5cb63a4 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 c7ed2e134a..571c3d139d 100644
index c7ed2e134..571c3d139 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 {
@@ -287,7 +287,7 @@ index c7ed2e134a..571c3d139d 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 c766dedfa9..88400e77bf 100644
index c766dedfa..88400e77b 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 {
@@ -304,7 +304,7 @@ index c766dedfa9..88400e77bf 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 187f11f584..8a8fc7dbd2 100644
index 187f11f58..8a8fc7dbd 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 {
@@ -319,7 +319,7 @@ index 187f11f584..8a8fc7dbd2 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 97c56fb803..327e6847f0 100644
index 97c56fb80..327e6847f 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 {
@@ -334,7 +334,7 @@ index 97c56fb803..327e6847f0 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 bea1293144..651d44cb37 100644
index bea129314..651d44cb3 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 {
@@ -362,7 +362,7 @@ index bea1293144..651d44cb37 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 7a8784f18a..257732dad7 100644
index 7a8784f18..257732dad 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 {
@@ -383,7 +383,7 @@ index 7a8784f18a..257732dad7 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 9f5e9abc41..3752fc4509 100644
index 9f5e9abc4..3752fc450 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 {
@@ -400,7 +400,7 @@ index 9f5e9abc41..3752fc4509 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 f79e438dc4..1a0b569322 100644
index f79e438dc..1a0b56932 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 {
@@ -415,7 +415,7 @@ index f79e438dc4..1a0b569322 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 58a6125289..8e19e06889 100644
index 58a612528..8e19e0688 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 {
@@ -430,7 +430,7 @@ index 58a6125289..8e19e06889 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 cd18533bb0..69d4880c74 100644
index cd18533bb..69d4880c7 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 {
@@ -445,7 +445,7 @@ index cd18533bb0..69d4880c74 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 2c7f5940a4..7661d53161 100644
index 2c7f5940a..7661d5316 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 {
@@ -460,7 +460,7 @@ index 2c7f5940a4..7661d53161 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 6e33c23632..05418f8fa1 100644
index 6e33c2363..05418f8fa 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 {
@@ -475,7 +475,7 @@ index 6e33c23632..05418f8fa1 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 c6ac9506a7..1d3f624323 100644
index c6ac9506a..1d3f62432 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 {
@@ -503,7 +503,7 @@ index c6ac9506a7..1d3f624323 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 570a1f66f3..e849b411c6 100644
index 570a1f66f..e849b411c 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 {
@@ -520,7 +520,7 @@ index 570a1f66f3..e849b411c6 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 8179e1c603..f7dea38eb3 100644
index 8179e1c60..f7dea38eb 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 {
@@ -537,7 +537,7 @@ index 8179e1c603..f7dea38eb3 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 852c4bd9ab..67d120bef2 100644
index 852c4bd9a..67d120bef 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 {
@@ -556,7 +556,7 @@ index 852c4bd9ab..67d120bef2 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 3d649c6004..2772bc6dac 100644
index 3d649c600..2772bc6da 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 {
@@ -573,7 +573,7 @@ index 3d649c6004..2772bc6dac 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 915f20042b..4be53fc0f6 100644
index 915f20042..4be53fc0f 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 {
@@ -586,7 +586,7 @@ index 915f20042b..4be53fc0f6 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 f9ca6b889a..888dfcd8d4 100644
index f9ca6b889..888dfcd8d 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 {
@@ -624,7 +624,7 @@ index f9ca6b889a..888dfcd8d4 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 d5033de8aa..ad9b4efe09 100644
index d5033de8a..ad9b4efe0 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 {
@@ -639,7 +639,7 @@ index d5033de8aa..ad9b4efe09 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 054b0e0ab1..71606b0a71 100644
index 054b0e0ab..71606b0a7 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 {
@@ -660,7 +660,7 @@ index 054b0e0ab1..71606b0a71 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 44c410f75c..984f94bb59 100644
index 44c410f75..984f94bb5 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 {
@@ -683,7 +683,7 @@ index 44c410f75c..984f94bb59 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 2f893ce918..95e5019968 100644
index 2f893ce91..95e501996 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 {
@@ -700,7 +700,7 @@ index 2f893ce918..95e5019968 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 4858617859..e624f9764f 100644
index 485861785..e624f9764 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 {
@@ -715,7 +715,7 @@ index 4858617859..e624f9764f 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 a957f6124b..1fe9c840a7 100644
index a957f6124..1fe9c840a 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 {
@@ -730,7 +730,7 @@ index a957f6124b..1fe9c840a7 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 7b9bc967a9..e2970ab00e 100644
index 7b9bc967a..e2970ab00 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 {
@@ -747,7 +747,7 @@ index 7b9bc967a9..e2970ab00e 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 02246950d0..ffe6b4344e 100644
index 02246950d..ffe6b4344 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 {
@@ -762,7 +762,7 @@ index 02246950d0..ffe6b4344e 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 e6d4a2c397..b23c43305b 100644
index e6d4a2c39..b23c43305 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 {
@@ -781,7 +781,7 @@ index e6d4a2c397..b23c43305b 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 f2dc5d1b5c..efcb11bbe8 100644
index f2dc5d1b5..efcb11bbe 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 {
@@ -798,7 +798,7 @@ index f2dc5d1b5c..efcb11bbe8 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 f6ec90c2d0..328e939a6f 100644
index f6ec90c2d..328e939a6 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 {
@@ -813,7 +813,7 @@ index f6ec90c2d0..328e939a6f 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 e9ad930d88..36bea710a0 100644
index e9ad930d8..36bea710a 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 {
@@ -828,7 +828,7 @@ index e9ad930d88..36bea710a0 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 cdc182c229..22474d682a 100644
index cdc182c22..22474d682 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 {
@@ -843,7 +843,7 @@ index cdc182c229..22474d682a 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 95e602a95f..65d606d51c 100644
index 95e602a95..65d606d51 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 {
@@ -858,7 +858,7 @@ index 95e602a95f..65d606d51c 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 57ef10afb0..5ecec62f18 100644
index 57ef10afb..5ecec62f1 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 {
@@ -873,7 +873,7 @@ index 57ef10afb0..5ecec62f18 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 b9f81a044f..14d4bd312e 100644
index b9f81a044..14d4bd312 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 {
@@ -888,7 +888,7 @@ index b9f81a044f..14d4bd312e 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 3ce8d3cef5..b5dab9d2aa 100644
index 3ce8d3cef..b5dab9d2a 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 {
@@ -903,7 +903,7 @@ index 3ce8d3cef5..b5dab9d2aa 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 88b7b37467..d05cc38b5e 100644
index 88b7b3746..d05cc38b5 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 {
@@ -918,7 +918,7 @@ index 88b7b37467..d05cc38b5e 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 7254bcf3e5..21a77ee812 100644
index 7254bcf3e..21a77ee81 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 {
@@ -933,7 +933,7 @@ index 7254bcf3e5..21a77ee812 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 58bc1f2343..0302efbdc7 100644
index 58bc1f234..0302efbdc 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 {
@@ -948,7 +948,7 @@ index 58bc1f2343..0302efbdc7 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 cb620014b7..51f92584b8 100644
index cb620014b..51f92584b 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 {
@@ -963,7 +963,7 @@ index cb620014b7..51f92584b8 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 fd7e991062..ad9628b2aa 100644
index fd7e99106..ad9628b2a 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 {
@@ -989,7 +989,7 @@ index fd7e991062..ad9628b2aa 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 efbb36d016..ff6090e3c1 100644
index efbb36d01..ff6090e3c 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 {
@@ -1008,7 +1008,7 @@ index efbb36d016..ff6090e3c1 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 7804a4e329..a28222eb1d 100644
index 7804a4e32..a28222eb1 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 {
@@ -1023,7 +1023,7 @@ index 7804a4e329..a28222eb1d 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 6522c80214..b84b868b1a 100644
index 6522c8021..b84b868b1 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 {
@@ -1045,7 +1045,7 @@ index 6522c80214..b84b868b1a 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 30d6802242..16bcf9bff0 100644
index 30d680224..16bcf9bff 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 {
@@ -1068,7 +1068,7 @@ index 30d6802242..16bcf9bff0 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 5c9ab0864e..9fa84c87fa 100644
index 5c9ab0864..9fa84c87f 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 {
@@ -1091,7 +1091,7 @@ index 5c9ab0864e..9fa84c87fa 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 e023898b38..c12a890165 100644
index e023898b3..c12a89016 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 {
@@ -1110,7 +1110,7 @@ index e023898b38..c12a890165 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 8a0da661fb..db8b20a6c7 100644
index 8a0da661f..db8b20a6c 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 {
@@ -1125,7 +1125,7 @@ index 8a0da661fb..db8b20a6c7 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 1d2a37a41e..2826c510d8 100644
index 1d2a37a41..2826c510d 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 {
@@ -1140,7 +1140,7 @@ index 1d2a37a41e..2826c510d8 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 91e2b59037..e544a8f6b9 100644
index 91e2b5903..e544a8f6b 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 {
@@ -1155,7 +1155,7 @@ index 91e2b59037..e544a8f6b9 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 501c36649e..34660f9f84 100644
index 501c36649..34660f9f8 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 {
@@ -1170,7 +1170,7 @@ index 501c36649e..34660f9f84 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 62c1cfaef9..8815c95900 100644
index 62c1cfaef..8815c9590 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 {
@@ -1201,7 +1201,7 @@ index 62c1cfaef9..8815c95900 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 29e448f5ad..02584897e9 100644
index 29e448f5a..02584897e 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 {
@@ -1225,7 +1225,7 @@ index 29e448f5ad..02584897e9 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 1352daa258..d85b01b956 100644
index 1352daa25..d85b01b95 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 {
@@ -1238,7 +1238,7 @@ index 1352daa258..d85b01b956 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 5cd569dcdd..ae6e6ca896 100644
index 5cd569dcd..ae6e6ca89 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 {
@@ -1257,7 +1257,7 @@ index 5cd569dcdd..ae6e6ca896 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 e182f04008..4e19fe5ae9 100644
index e182f0400..4e19fe5ae 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 {
@@ -1272,7 +1272,7 @@ index e182f04008..4e19fe5ae9 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 75d46c61dc..05e833ffed 100644
index 75d46c61d..05e833ffe 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 {
@@ -1287,7 +1287,7 @@ index 75d46c61dc..05e833ffed 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 26fda2cf69..22e9789a36 100644
index 26fda2cf6..22e9789a3 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 {
@@ -1300,7 +1300,7 @@ index 26fda2cf69..22e9789a36 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 c065128649..a26d56aa45 100644
index c06512864..a26d56aa4 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 {
@@ -1313,7 +1313,7 @@ index c065128649..a26d56aa45 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 90e79b2918..e47add3e43 100644
index 90e79b291..e47add3e4 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 {
@@ -1331,7 +1331,7 @@ index 90e79b2918..e47add3e43 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
index c7d5317cc0..ec92a84579 100644
index c7d5317cc..ec92a8457 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 {
@@ -1344,7 +1344,7 @@ index c7d5317cc0..ec92a84579 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 87fd7e1467..c9ba334535 100644
index 87fd7e146..c9ba33453 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 {
@@ -1356,7 +1356,7 @@ index 87fd7e1467..c9ba334535 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
index 3f8e18a2c7..11dc5f6374 100644
index 3f8e18a2c..11dc5f637 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 {
@@ -1375,7 +1375,7 @@ index 3f8e18a2c7..11dc5f6374 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 dd7916c090..e4dc7d198c 100644
index dd7916c09..e4dc7d198 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 {
@@ -1404,7 +1404,7 @@ index dd7916c090..e4dc7d198c 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/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java
index 5b1d2c7f50..da6a3fa2c8 100644
index 5b1d2c7f5..da6a3fa2c 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 {
@@ -1417,7 +1417,7 @@ index 5b1d2c7f50..da6a3fa2c8 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
index 57af3835ee..b3bdc194ab 100644
index 57af3835e..b3bdc194a 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 {
@@ -1430,7 +1430,7 @@ index 57af3835ee..b3bdc194ab 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/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
index b34695f2d0..e4bd2796a4 100644
index b34695f2d..e4bd2796a 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 {
@@ -1443,7 +1443,7 @@ index b34695f2d0..e4bd2796a4 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
index 886268b09e..b030fe9577 100644
index 886268b09..b030fe957 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 {
@@ -1456,7 +1456,7 @@ index 886268b09e..b030fe9577 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 d332907b3b..b853fd0d9b 100644
index d332907b3..b853fd0d9 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 {
@@ -1473,7 +1473,7 @@ index d332907b3b..b853fd0d9b 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
index 1402087612..94e57a2d85 100644
index 140208761..94e57a2d8 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 {
@@ -1488,7 +1488,7 @@ index 1402087612..94e57a2d85 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 a8ef98981d..d5ffdc110d 100644
index a8ef98981..d5ffdc110 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;
@@ -1512,7 +1512,7 @@ index a8ef98981d..d5ffdc110d 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 7b6b1ad17b..1432d3f6bf 100644
index 7b6b1ad17..1432d3f6b 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 {
@@ -1532,7 +1532,7 @@ index 7b6b1ad17b..1432d3f6bf 100644
this.targetSelector.a(3, this.bA);
}
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
index de8f1874af..73402f2b5a 100644
index de8f1874a..73402f2b5 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,

4
patches/server/0004-Host-our-own-timings.patch → patches/server/0005-Host-our-own-timings.patch
View File

@@ -1,4 +1,4 @@
From c5700f8e63cbfcf0d035a986966f7f850c9026a9 Mon Sep 17 00:00:00 2001
From 7433fa1e4eb6c458bdb7d057400e95f681331a91 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 706d787579..f234832e6f 100644
index 706d78757..f234832e6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -132,4 +132,8 @@ public class PurpurConfig {

210
patches/server/0005-Ridables.patch → patches/server/0006-Ridables.patch
View File

@@ -1,4 +1,4 @@
From 0b558dadf8a216b1eea6c4835b85634df09d6c63 Mon Sep 17 00:00:00 2001
From 8db2c188c7732d45bad5b3613d00e978cb08a634 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
@@ -105,7 +105,7 @@ Subject: [PATCH] Ridables
create mode 100644 src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
diff --git a/src/main/java/net/minecraft/server/ControllerLookDolphin.java b/src/main/java/net/minecraft/server/ControllerLookDolphin.java
index 1d9ba04daa..2bade947ee 100644
index 1d9ba04da..2bade947e 100644
--- a/src/main/java/net/minecraft/server/ControllerLookDolphin.java
+++ b/src/main/java/net/minecraft/server/ControllerLookDolphin.java
@@ -1,6 +1,6 @@
@@ -126,7 +126,7 @@ index 1d9ba04daa..2bade947ee 100644
this.d = false;
this.a.aK = this.a(this.a.aK, this.h() + 20.0F, this.b);
diff --git a/src/main/java/net/minecraft/server/ControllerMove.java b/src/main/java/net/minecraft/server/ControllerMove.java
index a5c4cbb67f..efe6afde9b 100644
index a5c4cbb67..efe6afde9 100644
--- a/src/main/java/net/minecraft/server/ControllerMove.java
+++ b/src/main/java/net/minecraft/server/ControllerMove.java
@@ -6,9 +6,9 @@ public class ControllerMove {
@@ -143,7 +143,7 @@ index a5c4cbb67f..efe6afde9b 100644
public ControllerMove(EntityInsentient entityinsentient) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 8974c16bf9..1d5cbbf97d 100644
index 23e91183e..d87bfc98e 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -78,7 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -182,7 +182,7 @@ index 8974c16bf9..1d5cbbf97d 100644
private float headHeight;
// CraftBukkit start
public boolean persist = true;
@@ -1285,6 +1285,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1337,6 +1337,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.inLava;
}
@@ -190,7 +190,7 @@ index 8974c16bf9..1d5cbbf97d 100644
public void a(float f, Vec3D vec3d) {
Vec3D vec3d1 = a(vec3d, f, this.yaw);
@@ -2112,7 +2113,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2165,7 +2166,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
} else {
this.passengers.add(entity);
}
@@ -205,7 +205,7 @@ index 8974c16bf9..1d5cbbf97d 100644
}
return true; // CraftBukkit
}
@@ -2147,6 +2154,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2200,6 +2207,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -218,7 +218,7 @@ index 8974c16bf9..1d5cbbf97d 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2533,6 +2546,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2586,6 +2599,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setHeadRotation(float f) {}
@@ -226,7 +226,7 @@ index 8974c16bf9..1d5cbbf97d 100644
public void l(float f) {}
public boolean bA() {
@@ -3378,4 +3392,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3431,4 +3445,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
void accept(Entity entity, double d0, double d1, double d2);
}
@@ -271,7 +271,7 @@ index 8974c16bf9..1d5cbbf97d 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
index 3d27f0964a..822316a65f 100644
index 3d27f0964..822316a65 100644
--- a/src/main/java/net/minecraft/server/EntityAgeable.java
+++ b/src/main/java/net/minecraft/server/EntityAgeable.java
@@ -86,7 +86,7 @@ public abstract class EntityAgeable extends EntityCreature {
@@ -284,7 +284,7 @@ index 3d27f0964a..822316a65f 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
index 34239160be..dfc2ce9729 100644
index 34239160b..dfc2ce972 100644
--- a/src/main/java/net/minecraft/server/EntityBat.java
+++ b/src/main/java/net/minecraft/server/EntityBat.java
@@ -14,9 +14,44 @@ public class EntityBat extends EntityAmbient {
@@ -371,7 +371,7 @@ index 34239160be..dfc2ce9729 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
index c7d79efdf6..7e4aad7716 100644
index c7d79efdf..7e4aad771 100644
--- a/src/main/java/net/minecraft/server/EntityBee.java
+++ b/src/main/java/net/minecraft/server/EntityBee.java
@@ -36,9 +36,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
@@ -552,7 +552,7 @@ index c7d79efdf6..7e4aad7716 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java
index da6a3fa2c8..1e220131ca 100644
index da6a3fa2c..1e220131c 100644
--- a/src/main/java/net/minecraft/server/EntityBlaze.java
+++ b/src/main/java/net/minecraft/server/EntityBlaze.java
@@ -10,6 +10,7 @@ public class EntityBlaze extends EntityMonster {
@@ -638,7 +638,7 @@ index da6a3fa2c8..1e220131ca 100644
if (this.c <= 0) {
this.c = 100;
diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
index b3bdc194ab..8b9222d778 100644
index b3bdc194a..8b9222d77 100644
--- a/src/main/java/net/minecraft/server/EntityCat.java
+++ b/src/main/java/net/minecraft/server/EntityCat.java
@@ -42,6 +42,23 @@ public class EntityCat extends EntityTameableAnimal {
@@ -732,7 +732,7 @@ index b3bdc194ab..8b9222d778 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityCaveSpider.java b/src/main/java/net/minecraft/server/EntityCaveSpider.java
index 23ced2c7bb..5b86b36f6a 100644
index 23ced2c7b..5b86b36f6 100644
--- a/src/main/java/net/minecraft/server/EntityCaveSpider.java
+++ b/src/main/java/net/minecraft/server/EntityCaveSpider.java
@@ -8,6 +8,23 @@ public class EntityCaveSpider extends EntitySpider {
@@ -760,7 +760,7 @@ index 23ced2c7bb..5b86b36f6a 100644
protected void initAttributes() {
super.initAttributes();
diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
index 65795fc896..5505b7ee94 100644
index 65795fc89..5505b7ee9 100644
--- a/src/main/java/net/minecraft/server/EntityChicken.java
+++ b/src/main/java/net/minecraft/server/EntityChicken.java
@@ -17,9 +17,27 @@ public class EntityChicken extends EntityAnimal {
@@ -800,7 +800,7 @@ index 65795fc896..5505b7ee94 100644
this.forceDrops = true; // CraftBukkit
this.a((IMaterial) Items.EGG);
diff --git a/src/main/java/net/minecraft/server/EntityCod.java b/src/main/java/net/minecraft/server/EntityCod.java
index 1e3782122a..0153a821ee 100644
index 1e3782122..0153a821e 100644
--- a/src/main/java/net/minecraft/server/EntityCod.java
+++ b/src/main/java/net/minecraft/server/EntityCod.java
@@ -6,6 +6,23 @@ public class EntityCod extends EntityFishSchool {
@@ -828,7 +828,7 @@ index 1e3782122a..0153a821ee 100644
protected ItemStack l() {
return new ItemStack(Items.COD_BUCKET);
diff --git a/src/main/java/net/minecraft/server/EntityComplexPart.java b/src/main/java/net/minecraft/server/EntityComplexPart.java
index a0b35c8699..144e89f224 100644
index a0b35c869..144e89f22 100644
--- a/src/main/java/net/minecraft/server/EntityComplexPart.java
+++ b/src/main/java/net/minecraft/server/EntityComplexPart.java
@@ -47,4 +47,11 @@ public class EntityComplexPart extends Entity {
@@ -844,7 +844,7 @@ index a0b35c8699..144e89f224 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
index 2c8bbf20ae..723a9fa1ee 100644
index 2c8bbf20a..723a9fa1e 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -11,9 +11,27 @@ public class EntityCow extends EntityAnimal {
@@ -876,7 +876,7 @@ index 2c8bbf20ae..723a9fa1ee 100644
this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.25D, RecipeItemStack.a(Items.WHEAT), false));
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
index 45dfc8104a..48fd8e716b 100644
index 45dfc8104..48fd8e716 100644
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -23,16 +23,35 @@ public class EntityCreeper extends EntityMonster {
@@ -992,7 +992,7 @@ index 45dfc8104a..48fd8e716b 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java
index ce78586ea0..e5c914eb14 100644
index ce78586ea..e5c914eb1 100644
--- a/src/main/java/net/minecraft/server/EntityDolphin.java
+++ b/src/main/java/net/minecraft/server/EntityDolphin.java
@@ -23,6 +23,23 @@ public class EntityDolphin extends EntityWaterAnimal {
@@ -1085,7 +1085,7 @@ index ce78586ea0..e5c914eb14 100644
this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
}
diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
index 77885f67ff..63f5969b10 100644
index 77885f67f..63f5969b1 100644
--- a/src/main/java/net/minecraft/server/EntityDrowned.java
+++ b/src/main/java/net/minecraft/server/EntityDrowned.java
@@ -19,6 +19,23 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@@ -1148,7 +1148,7 @@ index 77885f67ff..63f5969b10 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index af10fc36e0..e08b731d2c 100644
index bf14d33c0..1b523b0da 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -46,6 +46,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -1305,7 +1305,7 @@ index af10fc36e0..e08b731d2c 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
index 212636dcb2..de30ce483f 100644
index 212636dcb..de30ce483 100644
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -27,9 +27,27 @@ public class EntityEnderman extends EntityMonster {
@@ -1404,7 +1404,7 @@ index 212636dcb2..de30ce483f 100644
if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1, blockposition1)) {
// CraftBukkit start - Place event
diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
index e4bd2796a4..5eaf1920b2 100644
index e4bd2796a..5eaf1920b 100644
--- a/src/main/java/net/minecraft/server/EntityEndermite.java
+++ b/src/main/java/net/minecraft/server/EntityEndermite.java
@@ -12,13 +12,32 @@ public class EntityEndermite extends EntityMonster {
@@ -1441,7 +1441,7 @@ index e4bd2796a4..5eaf1920b2 100644
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
}
diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
index b030fe9577..179a261296 100644
index b030fe957..179a26129 100644
--- a/src/main/java/net/minecraft/server/EntityEvoker.java
+++ b/src/main/java/net/minecraft/server/EntityEvoker.java
@@ -12,10 +12,28 @@ public class EntityEvoker extends EntityIllagerWizard {
@@ -1506,7 +1506,7 @@ index b030fe9577..179a261296 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
index b853fd0d9b..b8d786fad5 100644
index b853fd0d9..b8d786fad 100644
--- a/src/main/java/net/minecraft/server/EntityFish.java
+++ b/src/main/java/net/minecraft/server/EntityFish.java
@@ -72,9 +72,10 @@ public abstract class EntityFish extends EntityWaterAnimal {
@@ -1560,7 +1560,7 @@ index b853fd0d9b..b8d786fad5 100644
this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
}
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
index 82a32d5dbf..4f53090d3d 100644
index 82a32d5db..4f53090d3 100644
--- a/src/main/java/net/minecraft/server/EntityFox.java
+++ b/src/main/java/net/minecraft/server/EntityFox.java
@@ -55,6 +55,23 @@ public class EntityFox extends EntityAnimal {
@@ -1698,7 +1698,7 @@ index 82a32d5dbf..4f53090d3d 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java
index e1c2540d14..85e6c195f3 100644
index e1c2540d1..85e6c195f 100644
--- a/src/main/java/net/minecraft/server/EntityGhast.java
+++ b/src/main/java/net/minecraft/server/EntityGhast.java
@@ -14,11 +14,47 @@ public class EntityGhast extends EntityFlying implements IMonster {
@@ -1777,7 +1777,7 @@ index e1c2540d14..85e6c195f3 100644
if (this.j-- <= 0) {
this.j += this.i.getRandom().nextInt(5) + 2;
diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
index d9e5eaad12..ff8a41a539 100644
index d9e5eaad1..ff8a41a53 100644
--- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
+++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
@@ -4,8 +4,33 @@ public class EntityGiantZombie extends EntityMonster {
@@ -1815,7 +1815,7 @@ index d9e5eaad12..ff8a41a539 100644
protected float b(EntityPose entitypose, EntitySize entitysize) {
return 10.440001F;
diff --git a/src/main/java/net/minecraft/server/EntityGuardian.java b/src/main/java/net/minecraft/server/EntityGuardian.java
index e69cb334fb..97040872bc 100644
index e69cb334f..97040872b 100644
--- a/src/main/java/net/minecraft/server/EntityGuardian.java
+++ b/src/main/java/net/minecraft/server/EntityGuardian.java
@@ -24,15 +24,39 @@ public class EntityGuardian extends EntityMonster {
@@ -1916,7 +1916,7 @@ index e69cb334fb..97040872bc 100644
Vec3D vec3d = new Vec3D(this.b - this.i.locX(), this.c - this.i.locY(), this.d - this.i.locZ());
double d0 = vec3d.f();
diff --git a/src/main/java/net/minecraft/server/EntityGuardianElder.java b/src/main/java/net/minecraft/server/EntityGuardianElder.java
index 7484bfeea0..f231340d90 100644
index 7484bfeea..f231340d9 100644
--- a/src/main/java/net/minecraft/server/EntityGuardianElder.java
+++ b/src/main/java/net/minecraft/server/EntityGuardianElder.java
@@ -16,6 +16,23 @@ public class EntityGuardianElder extends EntityGuardian {
@@ -1944,7 +1944,7 @@ index 7484bfeea0..f231340d90 100644
public void initAttributes() {
super.initAttributes();
diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
index a6fb4ba5b9..98b1e93759 100644
index a6fb4ba5b..98b1e9375 100644
--- a/src/main/java/net/minecraft/server/EntityHorse.java
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
@@ -19,6 +19,13 @@ public class EntityHorse extends EntityHorseAbstract {
@@ -1962,7 +1962,7 @@ index a6fb4ba5b9..98b1e93759 100644
protected void initDatawatcher() {
super.initDatawatcher();
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index c56efe035a..e7ba83f32a 100644
index c56efe035..e7ba83f32 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -38,12 +38,39 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -2015,7 +2015,7 @@ index c56efe035a..e7ba83f32a 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
index 9a52decdca..64d80081f7 100644
index 9a52decdc..64d80081f 100644
--- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java
+++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
@@ -6,6 +6,13 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract {
@@ -2033,7 +2033,7 @@ index 9a52decdca..64d80081f7 100644
protected SoundEffect getSoundAmbient() {
super.getSoundAmbient();
diff --git a/src/main/java/net/minecraft/server/EntityHorseMule.java b/src/main/java/net/minecraft/server/EntityHorseMule.java
index 4dd4d91eba..a9f26efe66 100644
index 4dd4d91eb..a9f26efe6 100644
--- a/src/main/java/net/minecraft/server/EntityHorseMule.java
+++ b/src/main/java/net/minecraft/server/EntityHorseMule.java
@@ -6,6 +6,13 @@ public class EntityHorseMule extends EntityHorseChestedAbstract {
@@ -2051,7 +2051,7 @@ index 4dd4d91eba..a9f26efe66 100644
protected SoundEffect getSoundAmbient() {
super.getSoundAmbient();
diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
index 290cb9337c..7bf76e5a0b 100644
index 290cb9337..7bf76e5a0 100644
--- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
+++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
@@ -12,6 +12,18 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -2092,7 +2092,7 @@ index 290cb9337c..7bf76e5a0b 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
index 5782a25ecd..c87fc523f1 100644
index 5782a25ec..c87fc523f 100644
--- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
+++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
@@ -8,6 +8,18 @@ public class EntityHorseZombie extends EntityHorseAbstract {
@@ -2122,7 +2122,7 @@ index 5782a25ecd..c87fc523f1 100644
+ protected void ez() { if (world.purpurConfig.zombieHorseCanSwim) goalSelector.a(0, new PathfinderGoalFloat(this)); } // Purpur
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 584166f225..de22cad764 100644
index 584166f22..de22cad76 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -374,9 +374,21 @@ public abstract class EntityHuman extends EntityLiving {
@@ -2149,7 +2149,7 @@ index 584166f225..de22cad764 100644
this.setSneaking(false);
} else {
diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
index 81b7cd06f2..3e6722cfce 100644
index 81b7cd06f..3e6722cfc 100644
--- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
+++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
@@ -19,10 +19,28 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -2190,7 +2190,7 @@ index 81b7cd06f2..3e6722cfce 100644
this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300));
this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 1991cee43d..28218f048d 100644
index 27ef47600..240bbee36 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -28,7 +28,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -2232,7 +2232,7 @@ index 1991cee43d..28218f048d 100644
super.o(f);
this.r(f);
}
@@ -1082,7 +1081,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1089,7 +1088,7 @@ public abstract class EntityInsentient extends EntityLiving {
}
protected boolean a(EntityHuman entityhuman, EnumHand enumhand) {
@@ -2241,7 +2241,7 @@ index 1991cee43d..28218f048d 100644
}
public boolean ec() {
@@ -1381,4 +1380,39 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1388,4 +1387,39 @@ public abstract class EntityInsentient extends EntityLiving {
public boolean a(Item item) {
return this.getItemInMainHand().getItem() == item || this.getItemInOffHand().getItem() == item;
}
@@ -2282,7 +2282,7 @@ index 1991cee43d..28218f048d 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
index 2f764776b2..46e4574e55 100644
index 2f764776b..46e4574e5 100644
--- a/src/main/java/net/minecraft/server/EntityIronGolem.java
+++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
@@ -17,8 +17,26 @@ public class EntityIronGolem extends EntityGolem {
@@ -2337,7 +2337,7 @@ index 2f764776b2..46e4574e55 100644
float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ad474500e2..17ff8a9fc3 100644
index ad474500e..17ff8a9fc 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -92,9 +92,9 @@ public abstract class EntityLiving extends Entity {
@@ -2401,7 +2401,7 @@ index ad474500e2..17ff8a9fc3 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
index 193dbfc5f6..5b87b245f7 100644
index 193dbfc5f..5b87b245f 100644
--- a/src/main/java/net/minecraft/server/EntityLlama.java
+++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -16,7 +16,36 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -2495,7 +2495,7 @@ index 193dbfc5f6..5b87b245f7 100644
return i == -1 ? null : EnumColor.fromColorIndex(i);
diff --git a/src/main/java/net/minecraft/server/EntityLlamaTrader.java b/src/main/java/net/minecraft/server/EntityLlamaTrader.java
index 4cebd67e85..283c1ac946 100644
index 4cebd67e8..283c1ac94 100644
--- a/src/main/java/net/minecraft/server/EntityLlamaTrader.java
+++ b/src/main/java/net/minecraft/server/EntityLlamaTrader.java
@@ -11,6 +11,13 @@ public class EntityLlamaTrader extends EntityLlama {
@@ -2526,7 +2526,7 @@ index 4cebd67e85..283c1ac946 100644
@Override
public GroupDataEntity prepare(GeneratorAccess generatoraccess, DifficultyDamageScaler difficultydamagescaler, EnumMobSpawn enummobspawn, @Nullable GroupDataEntity groupdataentity, @Nullable NBTTagCompound nbttagcompound) {
diff --git a/src/main/java/net/minecraft/server/EntityMagmaCube.java b/src/main/java/net/minecraft/server/EntityMagmaCube.java
index 1fdc248ba8..a5a36af217 100644
index 1fdc248ba..a5a36af21 100644
--- a/src/main/java/net/minecraft/server/EntityMagmaCube.java
+++ b/src/main/java/net/minecraft/server/EntityMagmaCube.java
@@ -8,6 +8,23 @@ public class EntityMagmaCube extends EntitySlime {
@@ -2554,7 +2554,7 @@ index 1fdc248ba8..a5a36af217 100644
protected void initAttributes() {
super.initAttributes();
diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
index 3706c31aad..b20f4afd3f 100644
index 3706c31aa..b20f4afd3 100644
--- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
+++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
@@ -20,6 +20,23 @@ public class EntityMushroomCow extends EntityCow {
@@ -2582,7 +2582,7 @@ index 3706c31aad..b20f4afd3f 100644
public float a(BlockPosition blockposition, IWorldReader iworldreader) {
return iworldreader.getType(blockposition.down()).getBlock() == Blocks.MYCELIUM ? 10.0F : iworldreader.w(blockposition) - 0.5F;
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
index d9a7b8ac1e..8fdf348573 100644
index d9a7b8ac1..8fdf34857 100644
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -16,6 +16,23 @@ public class EntityOcelot extends EntityAnimal {
@@ -2625,7 +2625,7 @@ index d9a7b8ac1e..8fdf348573 100644
this.targetSelector.a(1, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, false, false, EntityTurtle.bw));
}
diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
index f50ed19080..87ed9a8ca0 100644
index f50ed1908..87ed9a8ca 100644
--- a/src/main/java/net/minecraft/server/EntityPanda.java
+++ b/src/main/java/net/minecraft/server/EntityPanda.java
@@ -46,6 +46,23 @@ public class EntityPanda extends EntityAnimal {
@@ -2771,7 +2771,7 @@ index f50ed19080..87ed9a8ca0 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
index 94e57a2d85..7ba2f3a351 100644
index 94e57a2d8..7ba2f3a35 100644
--- a/src/main/java/net/minecraft/server/EntityParrot.java
+++ b/src/main/java/net/minecraft/server/EntityParrot.java
@@ -62,12 +62,83 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -2872,7 +2872,7 @@ index 94e57a2d85..7ba2f3a351 100644
this.goalSelector.a(2, this.goalSit);
this.goalSelector.a(2, new PathfinderGoalFollowOwner(this, 1.0D, 5.0F, 1.0F, true));
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index 90eeddb1af..c3a5e24617 100644
index 90eeddb1a..c3a5e2461 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -22,6 +22,40 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -3028,7 +3028,7 @@ index 90eeddb1af..c3a5e24617 100644
EntityPhantom.this.yaw += 180.0F;
this.j = 0.1F;
diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
index 8d277566e9..e6a7f8ef37 100644
index 8d277566e..e6a7f8ef3 100644
--- a/src/main/java/net/minecraft/server/EntityPig.java
+++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -19,9 +19,27 @@ public class EntityPig extends EntityAnimal {
@@ -3099,7 +3099,7 @@ index 8d277566e9..e6a7f8ef37 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
index 9dd028b558..fb9ef88ea3 100644
index 9dd028b55..fb9ef88ea 100644
--- a/src/main/java/net/minecraft/server/EntityPigZombie.java
+++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
@@ -17,6 +17,23 @@ public class EntityPigZombie extends EntityZombie {
@@ -3127,7 +3127,7 @@ index 9dd028b558..fb9ef88ea3 100644
public void setLastDamager(@Nullable EntityLiving entityliving) {
super.setLastDamager(entityliving);
diff --git a/src/main/java/net/minecraft/server/EntityPillager.java b/src/main/java/net/minecraft/server/EntityPillager.java
index 0357c9da93..98a657cece 100644
index 0357c9da9..98a657cec 100644
--- a/src/main/java/net/minecraft/server/EntityPillager.java
+++ b/src/main/java/net/minecraft/server/EntityPillager.java
@@ -13,15 +13,34 @@ public class EntityPillager extends EntityIllagerAbstract implements ICrossbow,
@@ -3166,7 +3166,7 @@ index 0357c9da93..98a657cece 100644
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
index f8e29a02d3..0a3906bde0 100644
index f8e29a02d..0a3906bde 100644
--- a/src/main/java/net/minecraft/server/EntityPolarBear.java
+++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
@@ -17,6 +17,23 @@ public class EntityPolarBear extends EntityAnimal {
@@ -3258,7 +3258,7 @@ index f8e29a02d3..0a3906bde0 100644
public d() {
diff --git a/src/main/java/net/minecraft/server/EntityPufferFish.java b/src/main/java/net/minecraft/server/EntityPufferFish.java
index 98af9a2235..d0e3e251e1 100644
index 98af9a223..d0e3e251e 100644
--- a/src/main/java/net/minecraft/server/EntityPufferFish.java
+++ b/src/main/java/net/minecraft/server/EntityPufferFish.java
@@ -17,6 +17,23 @@ public class EntityPufferFish extends EntityFish {
@@ -3295,7 +3295,7 @@ index 98af9a2235..d0e3e251e1 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
index 2ed2d0b6bb..9040ab1c54 100644
index 2ed2d0b6b..9040ab1c5 100644
--- a/src/main/java/net/minecraft/server/EntityRabbit.java
+++ b/src/main/java/net/minecraft/server/EntityRabbit.java
@@ -26,9 +26,27 @@ public class EntityRabbit extends EntityAnimal {
@@ -3450,7 +3450,7 @@ index 2ed2d0b6bb..9040ab1c54 100644
this.d = flag;
}
diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java
index fd25ce1026..98d182a4ce 100644
index fd25ce102..98d182a4c 100644
--- a/src/main/java/net/minecraft/server/EntityRavager.java
+++ b/src/main/java/net/minecraft/server/EntityRavager.java
@@ -20,14 +20,33 @@ public class EntityRavager extends EntityRaider {
@@ -3488,7 +3488,7 @@ index fd25ce1026..98d182a4ce 100644
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(4, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true));
diff --git a/src/main/java/net/minecraft/server/EntitySalmon.java b/src/main/java/net/minecraft/server/EntitySalmon.java
index 6be29f3078..189515b0ff 100644
index 6be29f307..189515b0f 100644
--- a/src/main/java/net/minecraft/server/EntitySalmon.java
+++ b/src/main/java/net/minecraft/server/EntitySalmon.java
@@ -6,6 +6,23 @@ public class EntitySalmon extends EntityFishSchool {
@@ -3516,7 +3516,7 @@ index 6be29f3078..189515b0ff 100644
public int es() {
return 5;
diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
index d5ffdc110d..d4f2642d3d 100644
index d5ffdc110..d4f2642d3 100644
--- a/src/main/java/net/minecraft/server/EntitySheep.java
+++ b/src/main/java/net/minecraft/server/EntitySheep.java
@@ -55,10 +55,28 @@ public class EntitySheep extends EntityAnimal {
@@ -3549,7 +3549,7 @@ index d5ffdc110d..d4f2642d3d 100644
this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.1D, RecipeItemStack.a(Items.WHEAT), false));
diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java
index 0d2ceff6f2..46379588c1 100644
index 0d2ceff6f..46379588c 100644
--- a/src/main/java/net/minecraft/server/EntityShulker.java
+++ b/src/main/java/net/minecraft/server/EntityShulker.java
@@ -32,6 +32,23 @@ public class EntityShulker extends EntityGolem implements IMonster {
@@ -3599,7 +3599,7 @@ index 0d2ceff6f2..46379588c1 100644
@Override
public boolean a() {
diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
index 08c2a22f7a..dff20567b3 100644
index 08c2a22f7..dff20567b 100644
--- a/src/main/java/net/minecraft/server/EntitySilverfish.java
+++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
@@ -11,13 +11,32 @@ public class EntitySilverfish extends EntityMonster {
@@ -3644,7 +3644,7 @@ index 08c2a22f7a..dff20567b3 100644
public void g() {
diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java
index 0e78d5c62c..8e6efeb7b7 100644
index 0e78d5c62..8e6efeb7b 100644
--- a/src/main/java/net/minecraft/server/EntitySkeleton.java
+++ b/src/main/java/net/minecraft/server/EntitySkeleton.java
@@ -6,6 +6,23 @@ public class EntitySkeleton extends EntitySkeletonAbstract {
@@ -3672,7 +3672,7 @@ index 0e78d5c62c..8e6efeb7b7 100644
protected SoundEffect getSoundAmbient() {
return SoundEffects.ENTITY_SKELETON_AMBIENT;
diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
index 3c95c0428b..8bc4e85156 100644
index 3c95c0428..8bc4e8515 100644
--- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
+++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
@@ -28,12 +28,14 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -3691,7 +3691,7 @@ index 3c95c0428b..8bc4e85156 100644
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true));
diff --git a/src/main/java/net/minecraft/server/EntitySkeletonStray.java b/src/main/java/net/minecraft/server/EntitySkeletonStray.java
index 2eb53864f2..a930fb8401 100644
index 2eb53864f..a930fb840 100644
--- a/src/main/java/net/minecraft/server/EntitySkeletonStray.java
+++ b/src/main/java/net/minecraft/server/EntitySkeletonStray.java
@@ -8,6 +8,23 @@ public class EntitySkeletonStray extends EntitySkeletonAbstract {
@@ -3719,7 +3719,7 @@ index 2eb53864f2..a930fb8401 100644
return c(entitytypes, generatoraccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || generatoraccess.f(blockposition));
}
diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
index 98e042424c..8aa0a6699f 100644
index 98e042424..8aa0a6699 100644
--- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java
+++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
@@ -9,6 +9,23 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract {
@@ -3747,7 +3747,7 @@ index 98e042424c..8aa0a6699f 100644
protected SoundEffect getSoundAmbient() {
return SoundEffects.ENTITY_WITHER_SKELETON_AMBIENT;
diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
index 2efc18df94..c15f7d9b24 100644
index 2efc18df9..c15f7d9b2 100644
--- a/src/main/java/net/minecraft/server/EntitySlime.java
+++ b/src/main/java/net/minecraft/server/EntitySlime.java
@@ -32,12 +32,31 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -3783,7 +3783,7 @@ index 2efc18df94..c15f7d9b24 100644
return Math.abs(entityliving.locY() - this.locY()) <= 4.0D;
}));
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index 07ca1a4987..941873513f 100644
index 07ca1a498..941873513 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -14,12 +14,31 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {
@@ -3845,7 +3845,7 @@ index 07ca1a4987..941873513f 100644
}
diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
index d02db56595..d3708a7b0e 100644
index d02db5659..d3708a7b0 100644
--- a/src/main/java/net/minecraft/server/EntitySpider.java
+++ b/src/main/java/net/minecraft/server/EntitySpider.java
@@ -11,14 +11,33 @@ public class EntitySpider extends EntityMonster {
@@ -3883,7 +3883,7 @@ index d02db56595..d3708a7b0e 100644
this.targetSelector.a(2, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityHuman.class));
this.targetSelector.a(3, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityIronGolem.class));
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
index 92efe4e7f5..b967135ac3 100644
index 92efe4e7f..b967135ac 100644
--- a/src/main/java/net/minecraft/server/EntitySquid.java
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -25,10 +25,28 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -3992,7 +3992,7 @@ index 92efe4e7f5..b967135ac3 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityTameableAnimal.java b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
index 9b2eea71cc..d55c6cb339 100644
index 9b2eea71c..d55c6cb33 100644
--- a/src/main/java/net/minecraft/server/EntityTameableAnimal.java
+++ b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
@@ -135,6 +135,7 @@ public abstract class EntityTameableAnimal extends EntityAnimal {
@@ -4004,7 +4004,7 @@ index 9b2eea71cc..d55c6cb339 100644
return entityliving == this.getOwner();
}
diff --git a/src/main/java/net/minecraft/server/EntityTropicalFish.java b/src/main/java/net/minecraft/server/EntityTropicalFish.java
index ef8f373bea..992978463d 100644
index ef8f373be..992978463 100644
--- a/src/main/java/net/minecraft/server/EntityTropicalFish.java
+++ b/src/main/java/net/minecraft/server/EntityTropicalFish.java
@@ -19,6 +19,23 @@ public class EntityTropicalFish extends EntityFishSchool {
@@ -4032,7 +4032,7 @@ index ef8f373bea..992978463d 100644
protected void initDatawatcher() {
super.initDatawatcher();
diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
index b24a5100b4..4695492068 100644
index b24a5100b..469549206 100644
--- a/src/main/java/net/minecraft/server/EntityTurtle.java
+++ b/src/main/java/net/minecraft/server/EntityTurtle.java
@@ -27,6 +27,23 @@ public class EntityTurtle extends EntityAnimal {
@@ -4180,7 +4180,7 @@ index b24a5100b4..4695492068 100644
if (this.h == ControllerMove.Operation.MOVE_TO && !this.i.getNavigation().m()) {
double d0 = this.b - this.i.locX();
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index 4100e367a4..a0d932c403 100644
index 4100e367a..a0d932c40 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -259,6 +259,12 @@ public class EntityTypes<T extends Entity> {
@@ -4197,7 +4197,7 @@ index 4100e367a4..a0d932c403 100644
if (this.bg == null) {
this.bg = SystemUtils.a("entity", IRegistry.ENTITY_TYPE.getKey(this));
diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
index cf274666c7..d890f7bdfa 100644
index cf274666c..d890f7bdf 100644
--- a/src/main/java/net/minecraft/server/EntityVex.java
+++ b/src/main/java/net/minecraft/server/EntityVex.java
@@ -19,6 +19,50 @@ public class EntityVex extends EntityMonster {
@@ -4307,7 +4307,7 @@ index cf274666c7..d890f7bdfa 100644
Vec3D vec3d = new Vec3D(this.b - EntityVex.this.locX(), this.c - EntityVex.this.locY(), this.d - EntityVex.this.locZ());
double d0 = vec3d.f();
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 6e0020ae0b..3eaac031fb 100644
index 6e0020ae0..3eaac031f 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -68,6 +68,28 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -4340,7 +4340,7 @@ index 6e0020ae0b..3eaac031fb 100644
public BehaviorController<EntityVillager> getBehaviorController() {
return (BehaviorController<EntityVillager>) super.getBehaviorController(); // CraftBukkit - decompile error
diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
index 2ad8dba5c0..4e9c5e84a9 100644
index 2ad8dba5c..4e9c5e84a 100644
--- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
+++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
@@ -20,6 +20,23 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -4376,7 +4376,7 @@ index 2ad8dba5c0..4e9c5e84a9 100644
this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityZombie.class, 8.0F, 0.5D, 0.5D));
this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityEvoker.class, 12.0F, 0.5D, 0.5D));
diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
index c974c02e92..6ba920134a 100644
index c974c02e9..6ba920134 100644
--- a/src/main/java/net/minecraft/server/EntityVindicator.java
+++ b/src/main/java/net/minecraft/server/EntityVindicator.java
@@ -17,14 +17,33 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -4414,7 +4414,7 @@ index c974c02e92..6ba920134a 100644
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true));
diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
index 1432d3f6bf..447387bd78 100644
index 1432d3f6b..447387bd7 100644
--- a/src/main/java/net/minecraft/server/EntityWitch.java
+++ b/src/main/java/net/minecraft/server/EntityWitch.java
@@ -24,6 +24,23 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -4457,7 +4457,7 @@ index 1432d3f6bf..447387bd78 100644
this.targetSelector.a(2, this.bz);
this.targetSelector.a(3, this.bA);
diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
index 8977c3516b..293afeb23b 100644
index bace6cf36..cb83130bf 100644
--- a/src/main/java/net/minecraft/server/EntityWither.java
+++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -18,7 +18,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -4586,7 +4586,7 @@ index 8977c3516b..293afeb23b 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
index eec1e26b6e..47f0b2df6c 100644
index eec1e26b6..47f0b2df6 100644
--- a/src/main/java/net/minecraft/server/EntityWolf.java
+++ b/src/main/java/net/minecraft/server/EntityWolf.java
@@ -30,10 +30,28 @@ public class EntityWolf extends EntityTameableAnimal {
@@ -4760,7 +4760,7 @@ index eec1e26b6e..47f0b2df6c 100644
private final EntityWolf j;
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 8635d4f40c..e9e2be88e3 100644
index 8635d4f40..e9e2be88e 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -44,11 +44,30 @@ public class EntityZombie extends EntityMonster {
@@ -4795,7 +4795,7 @@ index 8635d4f40c..e9e2be88e3 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
index da8446d05d..db252ba4e0 100644
index da8446d05..db252ba4e 100644
--- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
+++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
@@ -8,6 +8,23 @@ public class EntityZombieHusk extends EntityZombie {
@@ -4823,7 +4823,7 @@ index da8446d05d..db252ba4e0 100644
return c(entitytypes, generatoraccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || generatoraccess.f(blockposition));
}
diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
index 8082fa617a..ebbfcb75a4 100644
index 8082fa617..ebbfcb75a 100644
--- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
+++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
@@ -25,6 +25,23 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
@@ -4851,7 +4851,7 @@ index 8082fa617a..ebbfcb75a4 100644
protected void initDatawatcher() {
super.initDatawatcher();
diff --git a/src/main/java/net/minecraft/server/FoodInfo.java b/src/main/java/net/minecraft/server/FoodInfo.java
index b35fe21a6d..5b0f35c730 100644
index b35fe21a6..5b0f35c73 100644
--- a/src/main/java/net/minecraft/server/FoodInfo.java
+++ b/src/main/java/net/minecraft/server/FoodInfo.java
@@ -30,6 +30,7 @@ public class FoodInfo {
@@ -4863,7 +4863,7 @@ index b35fe21a6d..5b0f35c730 100644
return this.c;
}
diff --git a/src/main/java/net/minecraft/server/ItemDye.java b/src/main/java/net/minecraft/server/ItemDye.java
index da49f6e5ae..7b5d602649 100644
index da49f6e5a..7b5d60264 100644
--- a/src/main/java/net/minecraft/server/ItemDye.java
+++ b/src/main/java/net/minecraft/server/ItemDye.java
@@ -42,6 +42,7 @@ public class ItemDye extends Item {
@@ -4875,19 +4875,19 @@ index da49f6e5ae..7b5d602649 100644
return this.b;
}
diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
index bdb90a3466..e059930ba7 100644
index 738c51070..2fddbb3ef 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoal.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
@@ -27,6 +27,7 @@ public abstract class PathfinderGoal {
@@ -28,6 +28,7 @@ public abstract class PathfinderGoal {
public void e() {}
+ public void setTypes(EnumSet<PathfinderGoal.Type> types) { this.a(types); } // Purpur - OBFHELPER
public void a(EnumSet<PathfinderGoal.Type> enumset) {
this.a.clear();
this.a.addAll(enumset);
// Tuinity start - reduce garbage on heap
this.goalTypes.clear();
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java b/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
index e07c7674a5..3c077b6870 100644
index e07c7674a..3c077b687 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
@@ -4,8 +4,8 @@ import java.util.EnumSet;
@@ -4910,7 +4910,7 @@ index e07c7674a5..3c077b6870 100644
this.a.a(-1);
} else if (this.a.h((Entity) this.b) > 49.0D) {
diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java
index 0c7f094e54..212af252be 100644
index 0c7f094e5..212af252b 100644
--- a/src/main/java/net/minecraft/server/Vec3D.java
+++ b/src/main/java/net/minecraft/server/Vec3D.java
@@ -89,6 +89,7 @@ public class Vec3D implements IPosition {
@@ -4922,10 +4922,10 @@ index 0c7f094e54..212af252be 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 89090b12d2..7db28d954f 100644
index ba1dab794..47a8e1ed7 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1583,4 +1583,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1597,4 +1597,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@Override public BiomeManager d() {
return this.biomeManager;
}
@@ -4937,7 +4937,7 @@ index 89090b12d2..7db28d954f 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index eda37fa43f..ad96353afd 100644
index eda37fa43..ad96353af 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -64,4 +64,589 @@ public class PurpurWorldConfig {
@@ -5532,7 +5532,7 @@ index eda37fa43f..ad96353afd 100644
}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
new file mode 100644
index 0000000000..828e1b8730
index 000000000..828e1b873
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
@@ -0,0 +1,75 @@
@@ -5613,7 +5613,7 @@ index 0000000000..828e1b8730
+}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
new file mode 100644
index 0000000000..0a5d6d46c2
index 000000000..0a5d6d46c
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
@@ -0,0 +1,86 @@
@@ -5705,7 +5705,7 @@ index 0000000000..0a5d6d46c2
+}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
new file mode 100644
index 0000000000..3491250704
index 000000000..349125070
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -0,0 +1,53 @@
@@ -5764,7 +5764,7 @@ index 0000000000..3491250704
+}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java
new file mode 100644
index 0000000000..f753759361
index 000000000..f75375936
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java
@@ -0,0 +1,61 @@
@@ -5831,7 +5831,7 @@ index 0000000000..f753759361
+}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
new file mode 100644
index 0000000000..e75e580670
index 000000000..e75e58067
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
@@ -0,0 +1,43 @@
@@ -5880,7 +5880,7 @@ index 0000000000..e75e580670
+}
diff --git a/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
new file mode 100644
index 0000000000..6e50344c07
index 000000000..6e50344c0
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
@@ -0,0 +1,21 @@
@@ -5906,10 +5906,10 @@ index 0000000000..6e50344c07
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index dfa15372b8..350aa67549 100644
index 949acb1d3..a85ad3c51 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1057,4 +1057,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1069,4 +1069,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return getHandle().spawnReason;
}
// Paper end

10
patches/server/0006-Logger-settings-suppressing-pointless-logs.patch → patches/server/0007-Logger-settings-suppressing-pointless-logs.patch
View File

@@ -1,4 +1,4 @@
From 66c0fc05bde3188495b1ace6d9a2199a0e826a78 Mon Sep 17 00:00:00 2001
From ed5d2229897c2b4516f626848f7fcc51512a2d01 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)
@@ -11,7 +11,7 @@ Subject: [PATCH] Logger settings (suppressing pointless logs)
4 files changed, 12 insertions(+)
diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java
index 469e293c25..ca58302cf7 100644
index 469e293c2..ca58302cf 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 {
@@ -23,7 +23,7 @@ index 469e293c25..ca58302cf7 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 73402f2b5a..1c2320cc54 100644
index 73402f2b5..1c2320cc5 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,
@@ -35,7 +35,7 @@ index 73402f2b5a..1c2320cc54 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 f234832e6f..345404c3a1 100644
index f234832e6..345404c3a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -133,6 +133,15 @@ public class PurpurConfig {
@@ -55,7 +55,7 @@ index f234832e6f..345404c3a1 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 049e9f98de..1d179cd5bc 100644
index 049e9f98d..1d179cd5b 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 {

6
patches/server/0007-Disable-outdated-build-check.patch → patches/server/0008-Disable-outdated-build-check.patch
View File

@@ -1,4 +1,4 @@
From 848c48d41b15400434c52100ba4131958c492fd8 Mon Sep 17 00:00:00 2001
From a1854a2210b80a98f0d1102c468cae4b067077bc 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,10 +8,10 @@ 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 b5bc4e2097..97b2482b1c 100644
index 7fc56f67f..d1af8e9a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -220,7 +220,7 @@ public class Main {
@@ -227,7 +227,7 @@ public class Main {
System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
}

8
patches/server/0008-Add-obfhelpers-for-plugin-use.patch → patches/server/0009-Add-obfhelpers-for-plugin-use.patch
View File

@@ -1,4 +1,4 @@
From 139a881b8386dec67899350ed0292331af74cff1 Mon Sep 17 00:00:00 2001
From 8177a50b1227b0115e62de1caa68cbcd7d8ff643 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 fb97c51bb1..50ed4001d1 100644
index fb97c51bb..50ed4001d 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 fb97c51bb1..50ed4001d1 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 d6e43313bf..4730c2beb7 100644
index d6e43313b..4730c2beb 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -595,6 +595,7 @@ public final class ItemStack {
@@ -42,7 +42,7 @@ index d6e43313bf..4730c2beb7 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 bea4a0b808..c6481c7ff1 100644
index bea4a0b80..c6481c7ff 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/0009-Silk-touch-spawners.patch → patches/server/0010-Silk-touch-spawners.patch
View File

@@ -1,4 +1,4 @@
From c0eac066531dd3f227492fa408aefd8ccba51265 Mon Sep 17 00:00:00 2001
From e31cbd8c44876a916fbe6e769768a588edcba923 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 e40375b67a..b29ed1cfa7 100644
index e40375b67..b29ed1cfa 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -494,6 +494,7 @@ public class Block implements IMaterial {
@@ -22,7 +22,7 @@ index e40375b67a..b29ed1cfa7 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 5296fdf168..69d04f6cbf 100644
index 5296fdf16..69d04f6cb 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 5296fdf168..69d04f6cbf 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 a0d932c403..0dd9897b99 100644
index a0d932c40..0dd9897b9 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> {

12
patches/server/0010-Give-giants-AI.patch → patches/server/0011-Give-giants-AI.patch
View File

@@ -1,4 +1,4 @@
From 48932d2775e583fbe530c08caa92140790663005 Mon Sep 17 00:00:00 2001
From dace65f4318c5f01cbec9bedb20ff439dd433269 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Give giants AI
3 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
index ff8a41a539..4296aaa074 100644
index ff8a41a53..4296aaa07 100644
--- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
+++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
@@ -23,6 +23,45 @@ public class EntityGiantZombie extends EntityMonster {
@@ -78,10 +78,10 @@ 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 240bbee36..3ef4f8db4 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 {
@@ -874,6 +874,7 @@ public abstract class EntityInsentient extends EntityLiving {
return f;
}
@@ -89,7 +89,7 @@ index 28218f048d..00cbd99914 100644
protected void a(DifficultyDamageScaler difficultydamagescaler) {
if (this.random.nextFloat() < 0.15F * difficultydamagescaler.d()) {
int i = this.random.nextInt(2);
@@ -974,6 +975,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -981,6 +982,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 ad96353afd..22a8f2da3f 100644
index ad96353af..22a8f2da3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -249,12 +249,22 @@ public class PurpurWorldConfig {

6
patches/server/0011-Illusioners-AI-settings.patch → patches/server/0012-Illusioners-AI-settings.patch
View File

@@ -1,4 +1,4 @@
From 23698d7f8263ffaa041bb09ec3b4f05492b73ac8 Mon Sep 17 00:00:00 2001
From 486038e64497bd1f139a23d2bdc0bc2145bdcb0e 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Illusioners AI settings
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
index 3e6722cfce..13545a8efe 100644
index 3e6722cfc..13545a8ef 100644
--- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
+++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
@@ -58,9 +58,9 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -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 22a8f2da3f..ce17384c1d 100644
index 22a8f2da3..ce17384c1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -293,10 +293,16 @@ public class PurpurWorldConfig {

8
patches/server/0012-Zombie-horse-naturally-spawn.patch → patches/server/0013-Zombie-horse-naturally-spawn.patch
View File

@@ -1,4 +1,4 @@
From bab70b8e1d50854da7fceb4680e07f77abc33957 Mon Sep 17 00:00:00 2001
From 94274740a40d6930ee04f196419209289e18992c 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
@@ -9,10 +9,10 @@ Subject: [PATCH] Zombie horse naturally spawn
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index c74b85917a..874b8c1292 100644
index 214b555e7..633d67b66 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -554,12 +554,18 @@ public class WorldServer extends World {
@@ -922,12 +922,18 @@ public class WorldServer extends World {
boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
if (flag1) {
@@ -38,7 +38,7 @@ index c74b85917a..874b8c1292 100644
this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ce17384c1d..300622e50d 100644
index ce17384c1..300622e50 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -643,9 +643,11 @@ public class PurpurWorldConfig {

6
patches/server/0013-Charged-creeper-naturally-spawn.patch → patches/server/0014-Charged-creeper-naturally-spawn.patch
View File

@@ -1,4 +1,4 @@
From 1601399a690a0b237de4a0b0b30053b20071ff24 Mon Sep 17 00:00:00 2001
From 72722ee8720eb09f4d504a8f360350406c0f0314 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Charged creeper naturally spawn
2 files changed, 13 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
index 48fd8e716b..ce366f401f 100644
index 48fd8e716..ce366f401 100644
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -87,6 +87,17 @@ public class EntityCreeper extends EntityMonster {
@@ -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 bf43a2d0dd..30b36d06b4 100644
index 300622e50..cc2bddd94 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 {

6
patches/server/0014-Rabbit-naturally-spawn-toast-and-killer.patch → patches/server/0015-Rabbit-naturally-spawn-toast-and-killer.patch
View File

@@ -1,4 +1,4 @@
From cd5f56e7f811705eda41cfa9418075fbef81f6b9 Mon Sep 17 00:00:00 2001
From e87ff84c6adb7dab20e66a16de4ff8bea997c582 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Rabbit naturally spawn toast and killer
2 files changed, 18 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
index 9040ab1c54..0232226f06 100644
index 9040ab1c5..0232226f0 100644
--- a/src/main/java/net/minecraft/server/EntityRabbit.java
+++ b/src/main/java/net/minecraft/server/EntityRabbit.java
@@ -364,6 +364,10 @@ public class EntityRabbit extends EntityAnimal {
@@ -41,7 +41,7 @@ index 9040ab1c54..0232226f06 100644
int i = this.random.nextInt(100);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index cc2bddd94c..ce677915ca 100644
index cc2bddd94..ce677915c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -426,10 +426,14 @@ public class PurpurWorldConfig {

6
patches/server/0015-Cat-spawning-options.patch → patches/server/0016-Cat-spawning-options.patch
View File

@@ -1,4 +1,4 @@
From 6e41fe963253b6d045654567fcce31494f2f2c5b Mon Sep 17 00:00:00 2001
From 44037b56639b1700d3743cab9f1d0e3e1f2b54b4 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Cat spawning options
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java
index 6024478dc0..4b55c07d41 100644
index 6024478dc..4b55c07d4 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerCat.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java
@@ -15,7 +15,7 @@ public class MobSpawnerCat {
@@ -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 9d7b25dd95..a1f0e659c2 100644
index ce677915c..9b60d17bd 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 {

4
patches/server/0016-Fix-non-black-cat-types-spawning-in-swamp-huts.patch → patches/server/0017-Fix-non-black-cat-types-spawning-in-swamp-huts.patch
View File

@@ -1,4 +1,4 @@
From abcff4bf9521d3fbfbf2964ce7525e24867455d0 Mon Sep 17 00:00:00 2001
From 7467fdc9633183e91a0df264025d83bb8904ad7a 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Fix non black cat types spawning in swamp huts
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java
index 4b55c07d41..fa2222355f 100644
index 4b55c07d4..fa2222355 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerCat.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java
@@ -84,8 +84,9 @@ public class MobSpawnerCat {

14
patches/server/0017-Cows-eat-mushrooms.patch → patches/server/0018-Cows-eat-mushrooms.patch
View File

@@ -1,4 +1,4 @@
From dcbc6628adfb40507e4ab140b0884d24fc5929d7 Mon Sep 17 00:00:00 2001
From 88b381b673aaea1833e1ee600fe714d168aff42d 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,10 +11,10 @@ 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 1d5cbbf97d..9e985e278d 100644
index d87bfc98e..3d03e199c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1037,6 +1037,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1089,6 +1089,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
@@ -22,7 +22,7 @@ index 1d5cbbf97d..9e985e278d 100644
public void a(SoundEffect soundeffect, float f, float f1) {
if (!this.isSilent()) {
this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), soundeffect, this.getSoundCategory(), f, f1);
@@ -2573,6 +2574,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2626,6 +2627,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.invulnerable = flag;
}
@@ -31,7 +31,7 @@ index 1d5cbbf97d..9e985e278d 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 723a9fa1ee..f56fd7c012 100644
index 723a9fa1e..f56fd7c01 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 723a9fa1ee..f56fd7c012 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 17ff8a9fc3..6ca11091c9 100644
index 17ff8a9fc..6ca11091c 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2812,8 +2812,9 @@ public abstract class EntityLiving extends Entity {
@@ -140,7 +140,7 @@ index 17ff8a9fc3..6ca11091c9 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9b60d17bdf..661dcce493 100644
index 9b60d17bd..661dcce49 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/0018-Fix-cow-rotation-when-shearing-mooshroom.patch → patches/server/0019-Fix-cow-rotation-when-shearing-mooshroom.patch
View File

@@ -1,4 +1,4 @@
From f1ca8988de7da56abd872768dc43c0bc1ebdd69c Mon Sep 17 00:00:00 2001
From e9387426755d77b81b56818592f53b00c01e3a31 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 b20f4afd3f..02d76a6c61 100644
index b20f4afd3..02d76a6c6 100644
--- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
+++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
@@ -118,7 +118,13 @@ public class EntityMushroomCow extends EntityCow {

6
patches/server/0019-Pigs-give-saddle-back.patch → patches/server/0020-Pigs-give-saddle-back.patch
View File

@@ -1,4 +1,4 @@
From c5a46d69b1c6920226e6902b42d811ef21b7e00e Mon Sep 17 00:00:00 2001
From d8620f5ada8be71628b2ef0398d06e5c220ef425 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Pigs give saddle back
2 files changed, 14 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
index e6a7f8ef37..d78666dbb2 100644
index e6a7f8ef3..d78666dbb 100644
--- a/src/main/java/net/minecraft/server/EntityPig.java
+++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -135,6 +135,18 @@ public class EntityPig extends EntityAnimal {
@@ -32,7 +32,7 @@ index e6a7f8ef37..d78666dbb2 100644
return true;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 661dcce493..cc8e832b33 100644
index 661dcce49..cc8e832b3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -399,9 +399,11 @@ public class PurpurWorldConfig {

6
patches/server/0020-Phantoms-do-not-spawn-on-creative-players.patch → patches/server/0021-Phantoms-do-not-spawn-on-creative-players.patch
View File

@@ -1,4 +1,4 @@
From b60dd5ad200ff38a8d11ff37c44983d4d1712ec4 Mon Sep 17 00:00:00 2001
From fc44f4c1004b78d3af6a818a523426bd38d64386 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 18 May 2019 16:59:52 -0500
Subject: [PATCH] Phantoms do not spawn on creative players
@@ -9,7 +9,7 @@ Subject: [PATCH] Phantoms do not spawn on creative players
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
index f488c22ed6..748983da29 100644
index f488c22ed..748983da2 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
@@ -31,7 +31,7 @@ public class MobSpawnerPhantom {
@@ -22,7 +22,7 @@ index f488c22ed6..748983da29 100644
if (!worldserver.worldProvider.f() || blockposition.getY() >= worldserver.getSeaLevel() && worldserver.f(blockposition)) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index cc8e832b33..392936c34d 100644
index cc8e832b3..392936c34 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -390,11 +390,13 @@ public class PurpurWorldConfig {

8
patches/server/0021-Phantoms-only-attack-insomniacs.patch → patches/server/0022-Phantoms-only-attack-insomniacs.patch
View File

@@ -1,4 +1,4 @@
From 87ed6c2409996ba8b536d52939672bcfb819c025 Mon Sep 17 00:00:00 2001
From 1d5f101cc9db5a5e9a9d67499ec03bbe1f5fd783 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 29 Nov 2019 20:33:41 -0600
Subject: [PATCH] Phantoms only attack insomniacs
@@ -10,7 +10,7 @@ Subject: [PATCH] Phantoms only attack insomniacs
3 files changed, 4 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index c3a5e24617..6d2984c8d5 100644
index c3a5e2461..6d2984c8d 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -272,6 +272,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -22,7 +22,7 @@ index c3a5e24617..6d2984c8d5 100644
return true;
}
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index a2d1ef3602..e1fdee2794 100644
index a2d1ef360..e1fdee279 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -23,6 +23,7 @@ public final class IEntitySelector {
@@ -34,7 +34,7 @@ index a2d1ef3602..e1fdee2794 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/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 392936c34d..5bb1b90b31 100644
index 392936c34..5bb1b90b3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -391,12 +391,14 @@ public class PurpurWorldConfig {

18
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 7783da8e5a5043d63dcee189634cf6c6d7b67ad2 Mon Sep 17 00:00:00 2001
From 170c795de8b12a2cbd865b3b82ac17c5e6757d2c 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, 228 insertions(+), 11 deletions(-)
diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java
index 816d301f1c..0971f25b56 100644
index 816d301f1..0971f25b5 100644
--- a/src/main/java/net/minecraft/server/DamageSource.java
+++ b/src/main/java/net/minecraft/server/DamageSource.java
@@ -81,6 +81,7 @@ public class DamageSource {
@@ -25,10 +25,10 @@ index 816d301f1c..0971f25b56 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 9e985e278d..4400aa5066 100644
index 3d03e199c..43d73385e 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1381,6 +1381,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1434,6 +1434,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return d3 * d3 + d4 * d4 + d5 * d5;
}
@@ -36,7 +36,7 @@ index 9e985e278d..4400aa5066 100644
public double h(Entity entity) {
return this.c(entity.getPositionVector());
}
@@ -1904,14 +1905,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1957,14 +1958,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(new ItemStack(imaterial), (float) i);
}
@@ -55,7 +55,7 @@ index 9e985e278d..4400aa5066 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 a57d0089d8..02952c3af8 100644
index a57d0089d..02952c3af 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 a57d0089d8..02952c3af8 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 6d2984c8d5..3b9cd169bd 100644
index 6d2984c8d..3b9cd169b 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;
@@ -352,7 +352,7 @@ index 6d2984c8d5..3b9cd169bd 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 4157e50e4d..774ec96f0a 100644
index c522a7c2a..9622615b5 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 {
@@ -364,7 +364,7 @@ index 4157e50e4d..774ec96f0a 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 5bb1b90b31..076e747c5b 100644
index 5bb1b90b3..076e747c5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -392,6 +392,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 446282b053ebf574679f4b024aa6584e56c11366 Mon Sep 17 00:00:00 2001
From b67ac6a5408ded34e7f49be34a3424a7f6db0331 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 941873513f..efc2205f7c 100644
index 941873513..efc2205f7 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -8,6 +8,7 @@ import org.bukkit.event.player.PlayerShearEntityEvent;
@@ -47,7 +47,7 @@ index 941873513f..efc2205f7c 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 076e747c5b..18a5127441 100644
index 076e747c5..18a512744 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -530,11 +530,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 2bc7821475b7bc3712e0fbbf8c1990563f76ce76 Mon Sep 17 00:00:00 2001
From 399f1b7da931b2870effe967a6e5af6a450a5461 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 218c04245b..48398aa9f0 100644
index 218c04245..48398aa9f 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 218c04245b..48398aa9f0 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 f0d14d34ed..d69baa858c 100644
index 18a512744..77070e618 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -200,11 +200,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 e28713985f2973e247ecd50ed0b4579cd377be50 Mon Sep 17 00:00:00 2001
From 06178ee91b82fc4d0c96ce70a40fbddb9f644608 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 e08b731d2c..baab056eff 100644
index 1b523b0da..fcfa4715c 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 e08b731d2c..baab056eff 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 77070e618a..cd4b4ee293 100644
index 77070e618..cd4b4ee29 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -201,12 +201,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 5845b735be637122e2230d0bfb4c74face2313e9 Mon Sep 17 00:00:00 2001
From b430451cc77cb298176ce6b63bbb1c952b6af4e7 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 8a31054a1d..d20849ce2b 100644
index 8a31054a1..d20849ce2 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 8a31054a1d..d20849ce2b 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 0e9a90b70f..099d98e04c 100644
index 0e9a90b70..099d98e04 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 0e9a90b70f..099d98e04c 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 5ed5276348..79398d8326 100644
index cd4b4ee29..4609c3c8b 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 4030a6afc57c458c5e3a9e39113be15932c0095c Mon Sep 17 00:00:00 2001
From c5acbc2e14ec1b99970f9787658a08c88bb11aaf 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 4bb21c48bd..30f16db02c 100644
index 4bb21c48b..30f16db02 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-Add-turtle-egg-block-options-fixes-MC-168772.patch → patches/server/0029-Add-turtle-egg-block-options-fixes-MC-168772.patch
View File

@@ -1,4 +1,4 @@
From 34e5e0a8a1d20e4564e2e8c7000628d780e476fc Mon Sep 17 00:00:00 2001
From cfa9bf07f2f960838299f5ea9db29fa3e397430f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 22:15:46 -0500
Subject: [PATCH] Add turtle egg block options - fixes MC-168772
@@ -9,7 +9,7 @@ Subject: [PATCH] Add turtle egg block options - fixes MC-168772
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
index cb36334e41..aa83ef1699 100644
index cb36334e4..aa83ef169 100644
--- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
+++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
@@ -157,6 +157,23 @@ public class BlockTurtleEgg extends Block {
@@ -38,7 +38,7 @@ index cb36334e41..aa83ef1699 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 79398d8326..ef94b84233 100644
index 4609c3c8b..e2604d54b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -70,6 +70,15 @@ public class PurpurWorldConfig {

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

@@ -1,4 +1,4 @@
From 66cfde050669201c4f05b1779f259e8cec8cf3c3 Mon Sep 17 00:00:00 2001
From 389fb5986fcd93d1b4ffca65e00d40379d6a7402 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 46e4574e55..5414d6975f 100644
index 46e4574e5..5414d6975 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 46e4574e55..5414d6975f 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 e2604d54bd..55c026d730 100644
index e2604d54b..55c026d73 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -336,10 +336,12 @@ public class PurpurWorldConfig {

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

@@ -1,4 +1,4 @@
From fa2c330c03e96fa2d1e05a054d5c08870c5a616c Mon Sep 17 00:00:00 2001
From 382783f9a102182aa6b090afe57b5d09e3e63415 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 b6561f2c79..f2ab3ee011 100644
index b6561f2c7..f2ab3ee01 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 b6561f2c79..f2ab3ee011 100644
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0191015b99..346ab82e62 100644
index 55c026d73..85eaf1a7a 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 {

12
patches/server/0031-Controllable-Minecarts.patch → patches/server/0032-Controllable-Minecarts.patch
View File

@@ -1,4 +1,4 @@
From a802cc61ded1e0c5ff014385d480e53eae832b46 Mon Sep 17 00:00:00 2001
From 930e24e2321f18937f9b6fe97d2bfec91a26bc96 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,10 +11,10 @@ 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 a9b1ce4165..44ae05b8a2 100644
index 43d73385e..4333ca032 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1282,6 +1282,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1334,6 +1334,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.inLava = true;
}
@@ -23,7 +23,7 @@ index a9b1ce4165..44ae05b8a2 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 665bbe07fa..1f3e5bd288 100644
index 665bbe07f..1f3e5bd28 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 665bbe07fa..1f3e5bd288 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 b73e317fbb..e1337a9c04 100644
index b73e317fb..e1337a9c0 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 b73e317fbb..e1337a9c04 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 346ab82e62..63afc5d98e 100644
index 85eaf1a7a..dfa631803 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,10 +1,16 @@

12
patches/server/0032-Signs-allow-color-codes.patch → patches/server/0033-Signs-allow-color-codes.patch
View File

@@ -1,4 +1,4 @@
From 0573f00a8deb9cfa86e7829724a934c87be06f53 Mon Sep 17 00:00:00 2001
From b887b068bf905cd438ade68ed492bc960ab9cc65 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
@@ -11,10 +11,10 @@ Subject: [PATCH] Signs allow color codes
4 files changed, 25 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index e7bfbc3307..a2f239b49e 100644
index 937e513d8..ef26e66d7 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1126,6 +1126,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1160,6 +1160,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public void openSign(TileEntitySign tileentitysign) {
tileentitysign.a((EntityHuman) this);
@@ -23,7 +23,7 @@ index e7bfbc3307..a2f239b49e 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index c6bd623921..5aada89c24 100644
index 7929fcc80..895e34ed3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2580,6 +2580,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -42,7 +42,7 @@ index c6bd623921..5aada89c24 100644
}
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
index 099d98e04c..19d76c8cce 100644
index 099d98e04..19d76c8cc 100644
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -89,6 +89,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -67,7 +67,7 @@ index 099d98e04c..19d76c8cce 100644
@Override
public PacketPlayOutTileEntityData getUpdatePacket() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index dfa6318039..7395abfb6f 100644
index dfa631803..7395abfb6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -76,8 +76,10 @@ public class PurpurWorldConfig {

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

@@ -1,4 +1,4 @@
From 6a80be34ff831aa6b1be2bcd36c04db2de5612eb Mon Sep 17 00:00:00 2001
From 4e45ec9fa8ffe2a833f7fd36ecb85a06c8e1d3c4 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 6303be944c..65f8d803b8 100644
index 6303be944..65f8d803b 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 6303be944c..65f8d803b8 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 6ca11091c9..2128e968ae 100644
index 6ca11091c..2128e968a 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2772,10 +2772,19 @@ public abstract class EntityLiving extends Entity {
@@ -52,7 +52,7 @@ index 6ca11091c9..2128e968ae 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
index 2f9a73ea33..2398499bcb 100644
index 2f9a73ea3..2398499bc 100644
--- a/src/main/java/net/minecraft/server/EntityPotion.java
+++ b/src/main/java/net/minecraft/server/EntityPotion.java
@@ -91,6 +91,7 @@ public class EntityPotion extends EntityProjectile {
@@ -96,7 +96,7 @@ index 2f9a73ea33..2398499bcb 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 a1580b8c6d..618ca2d763 100644
index a1580b8c6..618ca2d76 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 a1580b8c6d..618ca2d763 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7891812a87..6797fb54c6 100644
index 7395abfb6..fc98e8249 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/0034-Disable-loot-drops-on-death-by-cramming.patch → patches/server/0035-Disable-loot-drops-on-death-by-cramming.patch
View File

@@ -1,4 +1,4 @@
From 11226b90ae4e81d1f27689e2bf39d0926ff114f6 Mon Sep 17 00:00:00 2001
From 006310f268f3ecf5e62facd7dbb39244c08be5c3 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 2128e968ae..76a925f7aa 100644
index 2128e968a..76a925f7a 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 2128e968ae..76a925f7aa 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 6797fb54c6..25c9706d1a 100644
index fc98e8249..7cd02e6b2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -121,6 +121,7 @@ public class PurpurWorldConfig {

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

@@ -1,4 +1,4 @@
From b0c6a40063636aff9d0deb18cf4142727ac5ebd2 Mon Sep 17 00:00:00 2001
From c15b54306d8910756947ed6fa737338b3796ce6d 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 b29ed1cfa7..d7911c3421 100644
index b29ed1cfa..d7911c342 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -387,7 +387,7 @@ public class Block implements IMaterial {
@@ -23,7 +23,7 @@ index b29ed1cfa7..d7911c3421 100644
}
diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
index 65f8d803b8..3b95dfaaae 100644
index 65f8d803b..3b95dfaaa 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 65f8d803b8..3b95dfaaae 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 25c9706d1a..470f398478 100644
index 7cd02e6b2..bfd9babf2 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/0036-Campfires-should-fall-with-gravity.patch → patches/server/0037-Campfires-should-fall-with-gravity.patch
View File

@@ -1,4 +1,4 @@
From 51d55e9350762ab11070979a556eefbfcf94f46a Mon Sep 17 00:00:00 2001
From d29c8ceeb26584c7f0b072ddf4ece5eb62c3b79f 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 3b95dfaaae..418fa6d1fe 100644
index 3b95dfaaa..418fa6d1f 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 3b95dfaaae..418fa6d1fe 100644
if (flag) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 470f398478..dbc73dd078 100644
index bfd9babf2..5e57646ce 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 {

18
patches/server/0037-Dont-send-useless-entity-packets.patch → patches/server/0038-Dont-send-useless-entity-packets.patch
View File

@@ -1,4 +1,4 @@
From baa43955c1ca2d1a5addc5a7f38bac2cb049d4aa Mon Sep 17 00:00:00 2001
From 04d58cc1908e9823eba1e48bfa52683d9e650a02 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,10 +10,10 @@ 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 3a88c9a670..1f7c8f7da0 100644
index b4d3c4a4f..1dc29d7cd 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -162,6 +162,7 @@ public class EntityTrackerEntry {
@@ -168,6 +168,7 @@ public class EntityTrackerEntry {
this.o = 0;
packet1 = new PacketPlayOutEntityTeleport(this.tracker);
}
@@ -21,7 +21,7 @@ index 3a88c9a670..1f7c8f7da0 100644
}
if ((this.e || this.tracker.impulse || this.tracker instanceof EntityLiving && ((EntityLiving) this.tracker).isGliding()) && this.tickCounter > 0) {
@@ -248,6 +249,22 @@ public class EntityTrackerEntry {
@@ -254,6 +255,22 @@ public class EntityTrackerEntry {
}
@@ -41,11 +41,11 @@ index 3a88c9a670..1f7c8f7da0 100644
+ }
+ // Purpur end
+
public void a(EntityPlayer entityplayer) {
this.tracker.c(entityplayer);
entityplayer.c(this.tracker);
// Tuinity end - optimise entity tracking
// TODO make use of this in second pass rewrite
final void resetState() {
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
index e5da2b19c1..5b1d959354 100644
index e5da2b19c..5b1d95935 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 e5da2b19c1..5b1d959354 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 345404c3a1..e219312168 100644
index 345404c3a..e21931216 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -142,6 +142,11 @@ public class PurpurConfig {

20
patches/server/0038-Fix-item-position-desync-MC-4.patch → patches/server/0039-Fix-item-position-desync-MC-4.patch
View File

@@ -1,4 +1,4 @@
From 16b5c15553521b079de24a9baa3f093582c145e1 Mon Sep 17 00:00:00 2001
From a0d90424c8242684df2b1754d0b3708a5ef20115 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 6 Jul 2019 21:12:58 -0500
Subject: [PATCH] Fix item position desync (MC-4)
@@ -10,24 +10,24 @@ Subject: [PATCH] Fix item position desync (MC-4)
3 files changed, 10 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index 1f7c8f7da0..5dd4d392a6 100644
index 1dc29d7cd..bb0b7b98e 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -124,6 +124,12 @@ public class EntityTrackerEntry {
++this.o;
i = MathHelper.d(this.tracker.yaw * 256.0F / 360.0F);
j = MathHelper.d(this.tracker.pitch * 256.0F / 360.0F);
@@ -130,6 +130,12 @@ public class EntityTrackerEntry {
double vec3d_dy = this.tracker.locY() - 2.44140625E-4D*(this.yLoc);
double vec3d_dz = this.tracker.locZ() - 2.44140625E-4D*(this.zLoc);
boolean flag1 = (vec3d_dx * vec3d_dx + vec3d_dy * vec3d_dy + vec3d_dz * vec3d_dz) >= 7.62939453125E-6D;
+ // Purpur start - fixes MC-4
+ if (net.pl3x.purpur.PurpurConfig.fixItemPositionDesync && this.tracker instanceof EntityItem) {
+ Vec3D loc = PacketPlayOutEntity.decrypt(PacketPlayOutEntity.encrypt(tracker.locX()), PacketPlayOutEntity.encrypt(tracker.locY()), PacketPlayOutEntity.encrypt(tracker.locZ()));
+ tracker.setPosition(loc.getX(), loc.getY(), loc.getZ());
+ }
+ // Purpur end
Vec3D vec3d = this.tracker.getPositionVector().d(PacketPlayOutEntity.a(this.xLoc, this.yLoc, this.zLoc));
boolean flag1 = vec3d.g() >= 7.62939453125E-6D;
Packet<?> packet1 = null;
boolean flag2 = flag1 || this.tickCounter % 60 == 0;
boolean flag3 = Math.abs(i - this.yRot) >= 1 || Math.abs(j - this.xRot) >= 1;
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
index 5b1d959354..0010448e3a 100644
index 5b1d95935..0010448e3 100644
--- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
+++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
@@ -14,10 +14,12 @@ public class PacketPlayOutEntity implements Packet<PacketListenerPlayOut> {
@@ -44,7 +44,7 @@ index 5b1d959354..0010448e3a 100644
return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index e219312168..3670b4d48d 100644
index e21931216..3670b4d48 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -143,8 +143,10 @@ public class PurpurConfig {

10
patches/server/0039-Rate-limit-incoming-packets-from-players.patch → patches/server/0040-Rate-limit-incoming-packets-from-players.patch
View File

@@ -1,4 +1,4 @@
From 215d2fce2b35b309e539bae93e9604d8611e91df Mon Sep 17 00:00:00 2001
From 1fa6081a9f5c7bf0fc63a0530d266b7783e53727 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 7 Feb 2020 09:45:09 -0600
Subject: [PATCH] Rate limit incoming packets from players
@@ -12,7 +12,7 @@ Subject: [PATCH] Rate limit incoming packets from players
create mode 100644 src/main/java/net/pl3x/purpur/network/PacketLimiter.java
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 96a785af27..803ede8e33 100644
index 211a6d720..a1304240d 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -150,6 +150,13 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -30,7 +30,7 @@ index 96a785af27..803ede8e33 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index fee512a479..e8851ffde6 100644
index 895e34ed3..67afa457e 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -140,6 +140,62 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -97,7 +97,7 @@ index fee512a479..e8851ffde6 100644
public void tick() {
this.syncPosition();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 3670b4d48d..e1a1ef860a 100644
index 3670b4d48..e1a1ef860 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -142,6 +142,18 @@ public class PurpurConfig {
@@ -121,7 +121,7 @@ index 3670b4d48d..e1a1ef860a 100644
private static void dontSendUselessEntityPackets() {
diff --git a/src/main/java/net/pl3x/purpur/network/PacketLimiter.java b/src/main/java/net/pl3x/purpur/network/PacketLimiter.java
new file mode 100644
index 0000000000..e51e7eb9d0
index 000000000..e51e7eb9d
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/network/PacketLimiter.java
@@ -0,0 +1,147 @@

6
patches/server/0040-Fix-pig-zombies-MC-56653.patch → patches/server/0041-Fix-pig-zombies-MC-56653.patch
View File

@@ -1,4 +1,4 @@
From a4092de3ceeea3058b6eda5812b86ccec2944ab1 Mon Sep 17 00:00:00 2001
From 88f641f1609d6a628ae49a40cbdc250ff5c4c500 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 9 Jul 2019 20:56:47 -0500
Subject: [PATCH] Fix pig zombies (MC-56653)
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix pig zombies (MC-56653)
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
index fb9ef88ea3..227fff3f1d 100644
index fb9ef88ea..227fff3f1 100644
--- a/src/main/java/net/minecraft/server/EntityPigZombie.java
+++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
@@ -155,6 +155,7 @@ public class EntityPigZombie extends EntityZombie {
@@ -43,7 +43,7 @@ index fb9ef88ea3..227fff3f1d 100644
public PathfinderGoalAnger(EntityPigZombie entitypigzombie) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5e57646ce9..2bbbf30c0d 100644
index 5e57646ce..2bbbf30c0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -771,10 +771,12 @@ public class PurpurWorldConfig {

53
patches/server/0041-Implement-AFK-API.patch → patches/server/0042-Implement-AFK-API.patch
View File

@@ -1,10 +1,9 @@
From 08797ff8d48c0268a102240df3ca28ca6a631741 Mon Sep 17 00:00:00 2001
From 5dafe5578138aec3c228bcf45894de8c01ba1518 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
---
.../java/net/minecraft/server/Entity.java | 1 +
.../net/minecraft/server/EntityHuman.java | 9 ++++
.../net/minecraft/server/EntityPlayer.java | 43 +++++++++++++++++++
.../net/minecraft/server/IEntityAccess.java | 34 ++++++---------
@@ -14,22 +13,10 @@ Subject: [PATCH] Implement AFK API
.../net/pl3x/purpur/PurpurWorldConfig.java | 15 +++++++
.../craftbukkit/entity/CraftPlayer.java | 17 ++++++++
.../java/org/spigotmc/ActivationRange.java | 1 +
10 files changed, 112 insertions(+), 24 deletions(-)
9 files changed, 111 insertions(+), 24 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b8959e005f..d38bbf6a4e 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1374,6 +1374,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return MathHelper.c(f * f + f1 * f1 + f2 * f2);
}
+ public double getDistanceSq(double x, double y, double z) { return g(x, y, z); } // Purpur - OBFHELPER
public double g(double d0, double d1, double d2) {
double d3 = this.locX() - d0;
double d4 = this.locY() - d1;
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index de22cad764..9d26bd1e4c 100644
index de22cad76..9d26bd1e4 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -49,10 +36,10 @@ index de22cad764..9d26bd1e4c 100644
super(EntityTypes.PLAYER, world);
this.bV = ItemStack.a;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index a2f239b49e..1b5140a357 100644
index ef26e66d7..bc1d429b1 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1617,8 +1617,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1651,8 +1651,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() {
this.cj = SystemUtils.getMonotonicMillis();
@@ -105,10 +92,10 @@ index a2f239b49e..1b5140a357 100644
return this.serverStatisticManager;
}
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 774ec96f0a..5ef8816340 100644
index 9622615b5..e0d011a2d 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -116,28 +116,18 @@ public interface IEntityAccess {
@@ -121,28 +121,18 @@ public interface IEntityAccess {
return entityhuman;
}
@@ -139,7 +126,7 @@ index 774ec96f0a..5ef8816340 100644
+ double distanceSq = distance * distance;
+ for (EntityHuman player : getPlayers()) {
+ if (IEntitySelector.notSpectator().test(player) && IEntitySelector.isLivingAlive().test(player) && IEntitySelector.notAfk.test(player)) {
+ if (distance < 0.0D || player.getDistanceSq(x, y, z) < distanceSq) {
+ if (distance < 0.0D || player.getDistanceSquared(x, y, z) < distanceSq) {
+ return true;
+ }
+ }
@@ -150,7 +137,7 @@ index 774ec96f0a..5ef8816340 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index e1fdee2794..4665671ef6 100644
index e1fdee279..4665671ef 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -170,7 +157,7 @@ index e1fdee2794..4665671ef6 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 e8851ffde6..d897c7fd41 100644
index 67afa457e..2659da188 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -279,6 +279,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -205,10 +192,10 @@ index e8851ffde6..d897c7fd41 100644
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 874b8c1292..567b297e05 100644
index 633d67b66..37b5a1193 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -376,7 +376,7 @@ public class WorldServer extends World {
@@ -745,7 +745,7 @@ public class WorldServer extends World {
}
if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> {
@@ -217,7 +204,7 @@ index 874b8c1292..567b297e05 100644
})) {
// CraftBukkit start
long l = this.worldData.getDayTime() + 24000L;
@@ -682,7 +682,7 @@ public class WorldServer extends World {
@@ -1050,7 +1050,7 @@ public class WorldServer extends World {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -227,7 +214,7 @@ index 874b8c1292..567b297e05 100644
} else if (entityplayer.isSleeping()) {
++j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2bbbf30c0d..95f1dcf0d7 100644
index 2bbbf30c0..95f1dcf0d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -147,6 +147,21 @@ public class PurpurWorldConfig {
@@ -253,10 +240,10 @@ index 2bbbf30c0d..95f1dcf0d7 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 60f62f19cb..fa9fc940a2 100644
index 516a01648..7451e120c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2092,4 +2092,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2125,4 +2125,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return spigot;
}
// Spigot end
@@ -279,12 +266,12 @@ index 60f62f19cb..fa9fc940a2 100644
+ // Purpur end
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 6e165a1649..da5fef091a 100644
index e160f03c1..11fb14612 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -137,6 +137,7 @@ public class ActivationRange
{
@@ -142,6 +142,7 @@ public class ActivationRange
final int maxRange = Math.min( ( ( player instanceof net.minecraft.server.EntityPlayer ? ((net.minecraft.server.EntityPlayer)player).getEffectiveViewDistance(((WorldServer)world).getChunkProvider().playerChunkMap) : world.spigotConfig.viewDistance ) << 4 ) - 8, maxRangeTemp );
// Tuinity end - per player view distance
player.activatedTick = MinecraftServer.currentTick;
+ if (!player.world.purpurConfig.idleTimeoutTickNearbyEntities && player.isAfk()) continue; // Purpur
maxBB = player.getBoundingBox().grow( maxRange, 256, maxRange );

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

@@ -1,4 +1,4 @@
From 75163c84fc9ebd175e40ca3db216df6451337c6d Mon Sep 17 00:00:00 2001
From 44821e8ea31928825b1838dbaea68402eadeb72c 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 6b255e09ac..e1d3894ab7 100644
index 6b255e09a..e1d3894ab 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 6b255e09ac..e1d3894ab7 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 c53b07adf6..a723f12a5e 100644
index 95f1dcf0d..3dbcd3f0e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -126,6 +126,7 @@ public class PurpurWorldConfig {

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

@@ -1,4 +1,4 @@
From 5d3d733f0fdc2047aa72a6db54db409ffa78b134 Mon Sep 17 00:00:00 2001
From d57dfeff220bc423b561e2a9f988d93a720422ff 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 d96c03a1a1..da1cfc1d3f 100644
index d96c03a1a..da1cfc1d3 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 d96c03a1a1..da1cfc1d3f 100644
}
@Nullable
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
index 53c6c33892..0fae3693c9 100644
index 53c6c3389..0fae3693c 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 53c6c33892..0fae3693c9 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 4730c2beb7..4fe5038083 100644
index 4730c2beb..4fe503808 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -369,10 +369,19 @@ public final class ItemStack {
@@ -86,7 +86,7 @@ index 4730c2beb7..4fe5038083 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 a723f12a5e..128eaa4acf 100644
index 3dbcd3f0e..8e6e141dc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -127,6 +127,7 @@ public class PurpurWorldConfig {

8
patches/server/0044-Tulips-change-fox-type.patch → patches/server/0045-Tulips-change-fox-type.patch
View File

@@ -1,4 +1,4 @@
From f49c1a0afc7778f660356433f1d890396bddb1ce Mon Sep 17 00:00:00 2001
From dcc9885517dca7260166f656eca7af48df798a95 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 4f53090d3d..13afd7bcde 100644
index 4f53090d3..13afd7bcd 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 4f53090d3d..13afd7bcde 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 54670f64cf..9c9b93f280 100644
index 54670f64c..9c9b93f28 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 54670f64cf..9c9b93f280 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 128eaa4acf..4685b6a2a3 100644
index 8e6e141dc..fd3e92560 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -342,10 +342,12 @@ public class PurpurWorldConfig {

6
patches/server/0045-Implement-a-hard-limit-for-pillager-outpost-spawns.patch → patches/server/0046-Implement-a-hard-limit-for-pillager-outpost-spawns.patch
View File

@@ -1,4 +1,4 @@
From 267577cd6fc0399ed8ddaafc5718594c7f32d5a5 Mon Sep 17 00:00:00 2001
From 1fae90679d926875eeb625ac04e4eb7375b79906 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] Implement a hard limit for pillager outpost spawns
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement a hard limit for pillager outpost spawns
2 files changed, 3 insertions(+)
diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
index 70f43c5159..baca8f7054 100644
index 70f43c515..baca8f705 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
@@ -21,7 +21,7 @@ index 70f43c5159..baca8f7054 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fd3e92560e..3a44e6e441 100644
index fd3e92560..3a44e6e44 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -528,10 +528,12 @@ public class PurpurWorldConfig {

44
patches/server/0046-Make-the-GUI-better.patch → patches/server/0047-Make-the-GUI-better.patch
View File

@@ -1,4 +1,4 @@
From a39e044411eb677142186d538c0dad7f518b84d2 Mon Sep 17 00:00:00 2001
From 335d8b0af490d19df395bcee5ead408a0261ba98 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 d70c8cab2b..61ccb6079e 100644
index 8c7156bb5..5337c0be0 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -51,7 +51,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -52,7 +52,7 @@ index d70c8cab2b..61ccb6079e 100644
// CraftBukkit start - Signature changed
public DedicatedServer(joptsimple.OptionSet options, DedicatedServerSettings dedicatedserversettings, DataFixer datafixer, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory, String s) {
@@ -420,7 +420,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -421,7 +421,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@Override
public void exit() {
if (this.p != null) {
@@ -61,7 +61,7 @@ index d70c8cab2b..61ccb6079e 100644
}
if (this.remoteControlListener != null) {
@@ -519,7 +519,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -520,7 +520,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
public void bc() {
if (this.p == null) {
@@ -71,10 +71,10 @@ index d70c8cab2b..61ccb6079e 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b31a9ac78c..f939f56d96 100644
index af5dd9f2d..f2a8af48d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1291,6 +1291,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1289,6 +1289,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
return true;
}
@@ -84,7 +84,7 @@ index b31a9ac78c..f939f56d96 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 0000000000..973b5efef5
index 000000000..973b5efef
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/ServerGUI.java
@@ -0,0 +1,123 @@
@@ -213,7 +213,7 @@ index 0000000000..973b5efef5
+}
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 0000000000..55feec811f
index 000000000..55feec811
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java
@@ -0,0 +1,81 @@
@@ -300,7 +300,7 @@ index 0000000000..55feec811f
+}
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 0000000000..fb017a0708
index 000000000..fb017a070
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java
@@ -0,0 +1,128 @@
@@ -434,7 +434,7 @@ index 0000000000..fb017a0708
+}
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 0000000000..4e0b80fddb
index 000000000..4e0b80fdd
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/DetailsListSelectionModel.java
@@ -0,0 +1,21 @@
@@ -461,7 +461,7 @@ index 0000000000..4e0b80fddb
+}
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 0000000000..a4983863cb
index 000000000..a4983863c
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
@@ -0,0 +1,42 @@
@@ -509,7 +509,7 @@ index 0000000000..a4983863cb
+}
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 0000000000..00f79e4336
index 000000000..00f79e433
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
@@ -0,0 +1,54 @@
@@ -569,7 +569,7 @@ index 0000000000..00f79e4336
+}
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 0000000000..2fdb9bdd0d
index 000000000..2fdb9bdd0
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphColor.java
@@ -0,0 +1,44 @@
@@ -619,7 +619,7 @@ index 0000000000..2fdb9bdd0d
+}
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 0000000000..85babad9cd
index 000000000..85babad9c
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphData.java
@@ -0,0 +1,47 @@
@@ -672,7 +672,7 @@ index 0000000000..85babad9cd
+}
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 0000000000..f2f3dd2c16
index 000000000..f2f3dd2c1
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/graph/RAMGraph.java
@@ -0,0 +1,138 @@
@@ -816,7 +816,7 @@ index 0000000000..f2f3dd2c16
+}
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 0000000000..17e75a2070
index 000000000..17e75a207
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/playerlist/JPlayerList.java
@@ -0,0 +1,57 @@
@@ -879,7 +879,7 @@ index 0000000000..17e75a2070
+}
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 0000000000..2f02e9adc7
index 000000000..2f02e9adc
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListCellRenderer.java
@@ -0,0 +1,22 @@
@@ -907,7 +907,7 @@ index 0000000000..2f02e9adc7
+}
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 0000000000..edbf454163
index 000000000..edbf45416
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListModel.java
@@ -0,0 +1,47 @@
@@ -960,7 +960,7 @@ index 0000000000..edbf454163
+}
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 0000000000..13a5eb3ad3
index 000000000..13a5eb3ad
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListMouseAdapter.java
@@ -0,0 +1,32 @@
@@ -998,7 +998,7 @@ index 0000000000..13a5eb3ad3
+}
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 0000000000..973c8ddf93
index 000000000..973c8ddf9
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/util/GUIColor.java
@@ -0,0 +1,54 @@
@@ -1058,7 +1058,7 @@ index 0000000000..973c8ddf93
+}
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 0000000000..4b340b88a2
index 000000000..4b340b88a
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
@@ -0,0 +1,86 @@
@@ -1149,7 +1149,7 @@ index 0000000000..4b340b88a2
+
+}
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index a9bb987652..4be7613d0f 100644
index a9bb98765..4be7613d0 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -1,8 +1,17 @@

6
patches/server/0047-Players-should-not-cram-to-death.patch → patches/server/0048-Players-should-not-cram-to-death.patch
View File

@@ -1,4 +1,4 @@
From 89ad75d591ff610897e8473cb51db36c1dd793a5 Mon Sep 17 00:00:00 2001
From 31322d7a3ae3d5b942d637d08b7525e914a8b538 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
@@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 1b5140a357..66ac64d1fc 100644
index bc1d429b1..cbc6f7d58 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1100,7 +1100,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1134,7 +1134,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isInvulnerable(DamageSource damagesource) {

12
patches/server/0048-Add-EntityPortalReadyEvent.patch → patches/server/0049-Add-EntityPortalReadyEvent.patch
View File

@@ -1,4 +1,4 @@
From 30f6de2f967a3536824c0ea811a24b3bc0cd22f9 Mon Sep 17 00:00:00 2001
From e3cc214fd4a87ff6ad0d69f3e6a34ac6bcdec07b 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
index 09c7c13183..6880cdd7f9 100644
index 09c7c1318..6880cdd7f 100644
--- a/src/main/java/net/minecraft/server/BlockPortal.java
+++ b/src/main/java/net/minecraft/server/BlockPortal.java
@@ -54,6 +54,7 @@ public class BlockPortal extends Block {
@@ -86,7 +86,7 @@ index 09c7c13183..6880cdd7f9 100644
break;
// CraftBukkit start - add the block to our list
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index d38bbf6a4e..3ba936b101 100644
index 4333ca032..0c0af2dd3 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -168,9 +168,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -102,7 +102,7 @@ index d38bbf6a4e..3ba936b101 100644
private boolean invulnerable;
protected UUID uniqueID;
protected String am;
@@ -2215,6 +2215,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2267,6 +2267,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.world.getMethodProfiler().enter("portal");
this.ag = i;
this.portalCooldown = this.ba();
@@ -111,7 +111,7 @@ index d38bbf6a4e..3ba936b101 100644
if (this instanceof EntityPlayer) {
((EntityPlayer) this).a(this.world.worldProvider.getDimensionManager().getType() == DimensionManager.NETHER ? DimensionManager.OVERWORLD : DimensionManager.NETHER, PlayerTeleportEvent.TeleportCause.NETHER_PORTAL);
diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
index f84dd6d9be..f50e9670bc 100644
index f84dd6d9b..f50e9670b 100644
--- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
@@ -11,6 +11,7 @@ public class PortalTravelAgent {
@@ -141,7 +141,7 @@ index f84dd6d9be..f50e9670bc 100644
}
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 567b297e05..456c835c87 100644
index 37b5a1193..2b4f2fbae 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -65,7 +65,7 @@ public class WorldServer extends World {

14
patches/server/0049-Implement-elytra-settings.patch → patches/server/0050-Implement-elytra-settings.patch
View File

@@ -1,4 +1,4 @@
From 00bdc0552b6bf5cdeb9b8f5a215c231b9807b701 Mon Sep 17 00:00:00 2001
From 68290a5eb64583ce63b208aa47e55f044b6a2c00 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 76a925f7aa..d64e026288 100644
index 76a925f7a..d64e02628 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2645,9 +2645,16 @@ public abstract class EntityLiving extends Entity {
@@ -37,7 +37,7 @@ index 76a925f7aa..d64e026288 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 bd524a35bb..c0e8cd0cdc 100644
index bd524a35b..c0e8cd0cd 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 bd524a35bb..c0e8cd0cdc 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 4fe5038083..7b7a0a7cb1 100644
index 4fe503808..7b7a0a7cb 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -401,7 +401,7 @@ public final class ItemStack {
@@ -82,7 +82,7 @@ index 4fe5038083..7b7a0a7cb1 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 f571a1586d..c26300eacd 100644
index f571a1586..c26300eac 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 f571a1586d..c26300eacd 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 212af252be..fbc30e6ece 100644
index 212af252b..fbc30e6ec 100644
--- a/src/main/java/net/minecraft/server/Vec3D.java
+++ b/src/main/java/net/minecraft/server/Vec3D.java
@@ -98,6 +98,7 @@ public class Vec3D implements IPosition {
@@ -115,7 +115,7 @@ index 212af252be..fbc30e6ece 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 c957c1cca9..ee60773313 100644
index 3a44e6e44..7cfc757db 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -151,6 +151,19 @@ public class PurpurWorldConfig {

8
patches/server/0050-Add-tick-times-API.patch → patches/server/0051-Add-tick-times-API.patch
View File

@@ -1,4 +1,4 @@
From 908ee9bfb75cd649b85e73df73211c38a4d86265 Mon Sep 17 00:00:00 2001
From 004331f50a3cc77a2d50470add031656636aa32b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:24 -0600
Subject: [PATCH] Add tick times API
@@ -9,10 +9,10 @@ Subject: [PATCH] Add tick times API
2 files changed, 28 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index df4fb5947a..206fd848ad 100644
index b64413084..85c7fc177 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2197,4 +2197,21 @@ public final class CraftServer implements Server {
@@ -2202,4 +2202,21 @@ public final class CraftServer implements Server {
return net.minecraft.server.MinecraftServer.currentTick;
}
// Paper end
@@ -35,7 +35,7 @@ index df4fb5947a..206fd848ad 100644
+ // Purpur end
}
diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
index 6d21c32692..b889c32a1a 100644
index 6d21c3269..b889c32a1 100644
--- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
@@ -6,6 +6,7 @@ import org.bukkit.command.CommandSender;

8
patches/server/0051-Add-blacklist-option-for-grindstone.patch → patches/server/0052-Add-blacklist-option-for-grindstone.patch
View File

@@ -1,4 +1,4 @@
From 40a523b50e42446858954931c6dadf1e4067931e Mon Sep 17 00:00:00 2001
From 95d6bded04a9fdf673641171cccb6fd814628094 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 ed88e208d0..fcfb4abdc2 100644
index ed88e208d..fcfb4abdc 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 ed88e208d0..fcfb4abdc2 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 7b7a0a7cb1..6b45bc17cf 100644
index 7b7a0a7cb..6b45bc17c 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -541,6 +541,12 @@ public final class ItemStack {
@@ -68,7 +68,7 @@ index 7b7a0a7cb1..6b45bc17cf 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 ee60773313..424e48110c 100644
index 7cfc757db..2795957dc 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;

10
patches/server/0052-Implement-lagging-threshold.patch → patches/server/0053-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From 74c2f29ddf70e71277aa95135e589402b348c8f8 Mon Sep 17 00:00:00 2001
From 0233b14a5cb692e047870000eaba4701e309d311 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, 12 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f939f56d96..c16e1ae9d8 100644
index f2a8af48d..625227f07 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -178,6 +178,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -30,7 +30,7 @@ index f939f56d96..c16e1ae9d8 100644
}
// Spigot end
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index e1a1ef860a..2537a5add3 100644
index e1a1ef860..2537a5add 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -142,6 +142,11 @@ public class PurpurConfig {
@@ -46,10 +46,10 @@ index e1a1ef860a..2537a5add3 100644
public static double packetRateLimitInterval = 10.0; // seconds
public static String packetRateLimitKickMessage = "Sent too many packets";
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 206fd848ad..c5fbe8ac79 100644
index 85c7fc177..2b5ae8c86 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2213,5 +2213,10 @@ public final class CraftServer implements Server {
@@ -2218,5 +2218,10 @@ public final class CraftServer implements Server {
}
return ((double) total / (double) tickTimes.length) * 1.0E-6D;
}

6
patches/server/0053-Implement-configurable-villager-brain-ticks.patch → patches/server/0054-Implement-configurable-villager-brain-ticks.patch
View File

@@ -1,4 +1,4 @@
From e8b8d05c0c1bda6f3525006fa18169caa0cf39f9 Mon Sep 17 00:00:00 2001
From 4b772d3055c650a2607543f8ff0f3356ab968ce9 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement configurable villager brain ticks
2 files changed, 10 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 3eaac031fb..65cd5f53c1 100644
index 3eaac031f..65cd5f53c 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -53,6 +53,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -40,7 +40,7 @@ index 3eaac031fb..65cd5f53c1 100644
this.world.getMethodProfiler().exit();
if (!this.et() && this.bB > 0) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2795957dce..28dfefc0e1 100644
index 2795957dc..28dfefc0e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -736,10 +736,14 @@ public class PurpurWorldConfig {

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

@@ -1,4 +1,4 @@
From 7891bd01bbfcefa04cabdbb1ccde85a889dc510e Mon Sep 17 00:00:00 2001
From b107a2d8a0ff726f04d303e60fd8349fe9764c3d 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 e9e2be88e3..1e60cc399b 100644
index e9e2be88e..1e60cc399 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 e9e2be88e3..1e60cc399b 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 28dfefc0e1..666de04a8f 100644
index 28dfefc0e..666de04a8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -805,10 +805,12 @@ public class PurpurWorldConfig {

6
patches/server/0055-Implement-bamboo-growth-settings.patch → patches/server/0056-Implement-bamboo-growth-settings.patch
View File

@@ -1,4 +1,4 @@
From 08b73e31c94a441370f090bf3c6c9269147ef8fd Mon Sep 17 00:00:00 2001
From bd8c20ce4a44d00b799343ec8485e487536f8978 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 02c548dd9c..016ceebb9d 100644
index 02c548dd9..016ceebb9 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 02c548dd9c..016ceebb9d 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 21f5ecd31c..d39fc8d5d6 100644
index 666de04a8..814ff5935 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 {

24
patches/server/0056-Ladders-should-not-bypass-cramming-gamerule.patch → patches/server/0057-Ladders-should-not-bypass-cramming-gamerule.patch
View File

@@ -1,4 +1,4 @@
From b5d7052ab123bc6abae003ba91ccced2db9cdf8d Mon Sep 17 00:00:00 2001
From 0b1c3f64cab2b1d30e0413e92d74ab61fde82074 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] Ladders should not bypass cramming gamerule
@@ -17,10 +17,10 @@ Subject: [PATCH] Ladders should not bypass cramming gamerule
10 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3ba936b101..e6575076dd 100644
index 0c0af2dd3..147e30aa2 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1509,6 +1509,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1561,6 +1561,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean isCollidable() {
@@ -34,7 +34,7 @@ index 3ba936b101..e6575076dd 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 8ad131e4fc..dfe8c57cef 100644
index 8ad131e4f..dfe8c57ce 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 8ad131e4fc..dfe8c57cef 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
index dfc2ce9729..440c21355c 100644
index dfc2ce972..440c21355 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 dfc2ce9729..440c21355c 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index fdf306e80a..563fc8ced0 100644
index fdf306e80..563fc8ced 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 fdf306e80a..563fc8ced0 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index e7ba83f32a..55e18e4c7a 100644
index e7ba83f32..55e18e4c7 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -188,7 +188,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -86,7 +86,7 @@ index e7ba83f32a..55e18e4c7a 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index d64e026288..cd45260396 100644
index d64e02628..cd4526039 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2673,7 +2673,7 @@ public abstract class EntityLiving extends Entity {
@@ -112,7 +112,7 @@ index d64e026288..cd45260396 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 1f3e5bd288..ae4758f251 100644
index 1f3e5bd28..ae4758f25 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 1f3e5bd288..ae4758f251 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
index 7ba2f3a351..dd2cd7b219 100644
index 7ba2f3a35..dd2cd7b21 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 7ba2f3a351..dd2cd7b219 100644
}
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 4665671ef6..037f14e010 100644
index 4665671ef..037f14e01 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -36,6 +36,12 @@ public final class IEntitySelector {
@@ -155,7 +155,7 @@ index 4665671ef6..037f14e010 100644
ScoreboardTeamBase.EnumTeamPush scoreboardteambase_enumteampush = scoreboardteambase == null ? ScoreboardTeamBase.EnumTeamPush.ALWAYS : scoreboardteambase.getCollisionRule();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 814ff59352..9319c3b74b 100644
index 814ff5935..9319c3b74 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -145,6 +145,7 @@ public class PurpurWorldConfig {

8
patches/server/0057-Option-for-slimes-not-pushable.patch → patches/server/0058-Option-for-slimes-not-pushable.patch
View File

@@ -1,4 +1,4 @@
From e03f5100d573368bdeba6c40edb2d7fad720aba8 Mon Sep 17 00:00:00 2001
From 894c6ad002780f2aff249b709dccbdd389d528c4 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 b29525c40d..1e72b3bbc5 100644
index b29525c40..1e72b3bbc 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 b29525c40d..1e72b3bbc5 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 01f32659d9..52ab86f0b1 100644
index 01f32659d..52ab86f0b 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 01f32659d9..52ab86f0b1 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 2537a5add3..7be2e01814 100644
index 2537a5add..7be2e0181 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -166,6 +166,11 @@ public class PurpurConfig {

8
patches/server/0058-Bring-back-server-name.patch → patches/server/0059-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From 38b419067964c8cb3dfe698e5ad0d863db601e2b Mon Sep 17 00:00:00 2001
From e8b75fc5bfd3619380d62b876fc5c8da828f37ba 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 0c3ec83570..309f5562b8 100644
index 0c3ec8357..309f5562b 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,10 +21,10 @@ index 0c3ec83570..309f5562b8 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 c5fbe8ac79..7ace042391 100644
index 2b5ae8c86..0c63f5ed7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2199,6 +2199,11 @@ public final class CraftServer implements Server {
@@ -2204,6 +2204,11 @@ public final class CraftServer implements Server {
// Paper end
// Purpur start

10
patches/server/0059-Dispenser-curse-of-binding-protection.patch → patches/server/0060-Dispenser-curse-of-binding-protection.patch
View File

@@ -1,4 +1,4 @@
From 8db49149f35821ecdfc39ca4f227c0a94b19eed8 Mon Sep 17 00:00:00 2001
From 3d8ae1d3425c6aec44d0b03825a01e278e949cb0 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,10 +10,10 @@ 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 00cbd99914..66b4831949 100644
index 3ef4f8db4..742745cb4 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 {
@@ -920,6 +920,13 @@ public abstract class EntityInsentient extends EntityLiving {
}
@@ -28,7 +28,7 @@ index 00cbd99914..66b4831949 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 df8c42bfbd..a4b3d0c298 100644
index df8c42bfb..a4b3d0c29 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 df8c42bfbd..a4b3d0c298 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 cfe3db96c1..4c74b6c3fd 100644
index 9319c3b74..1637f66ae 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/0060-Implement-LivingEntity-safeFallDistance.patch → patches/server/0061-Implement-LivingEntity-safeFallDistance.patch
View File

@@ -1,4 +1,4 @@
From f265f5fcbd3be4d54f36a83d6dee335b46c00eab Mon Sep 17 00:00:00 2001
From 562293d312599c5bbfd434145d14f3059b8ded9e 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 d132a6105f..0b200c7253 100644
index 4296aaa07..a2e3e6001 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 d132a6105f..0b200c7253 100644
// Purpur start
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index 55e18e4c7a..b14f67b3a3 100644
index 55e18e4c7..b14f67b3a 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -229,7 +229,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -38,7 +38,7 @@ index 55e18e4c7a..b14f67b3a3 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 cd45260396..60e2b4268c 100644
index cd4526039..60e2b4268 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 cd45260396..60e2b4268c 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 8ffa3cb059..3dd0faea79 100644
index 8ffa3cb05..3dd0faea7 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/0061-Add-option-for-boats-to-eject-players-on-land.patch → patches/server/0062-Add-option-for-boats-to-eject-players-on-land.patch
View File

@@ -1,4 +1,4 @@
From 4fca9e137ea82930246d81634213f0e00c208986 Mon Sep 17 00:00:00 2001
From 44b0e303a2e619c3302ecc4b39bfb40982b5b678 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 563fc8ced0..479ed7c7bc 100644
index 563fc8ced..479ed7c7b 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 563fc8ced0..479ed7c7bc 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 4c74b6c3fd..43591dfe34 100644
index 1637f66ae..028a169cb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -143,6 +143,7 @@ public class PurpurWorldConfig {

14
patches/server/0062-Advancement-API-Additions.patch → patches/server/0063-Advancement-API-Additions.patch
View File

@@ -1,4 +1,4 @@
From a397b58fa02a7d6e42dd83a330361c130dec1acd Mon Sep 17 00:00:00 2001
From bd3f839e3d15c467397c5cf3e4ae3eecee89b9ed 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 4b85551faf..4cba4187a0 100644
index 4b85551fa..4cba4187a 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 4b85551faf..4cba4187a0 100644
}
diff --git a/src/main/java/net/minecraft/server/AdvancementDisplay.java b/src/main/java/net/minecraft/server/AdvancementDisplay.java
index e8172d56fe..976c85ef1b 100644
index e8172d56f..976c85ef1 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 e8172d56fe..976c85ef1b 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 a9c49a4348..551a845476 100644
index a9c49a434..551a84547 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 a9c49a4348..551a845476 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 4fe7324475..6e5d81daf1 100644
index 4fe732447..6e5d81daf 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 4fe7324475..6e5d81daf1 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 a5aadf2850..b0a7092d62 100644
index a5aadf285..b0a7092d6 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 a5aadf2850..b0a7092d62 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 0000000000..1cbb1e67b6
index 000000000..1cbb1e67b
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
@@ -0,0 +1,47 @@

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

@@ -1,4 +1,4 @@
From fc311d45a83de90aeded3dd043860a677587538a Mon Sep 17 00:00:00 2001
From ba6ccc8a8825ea4bdf169eb9ec8ff4d0a8b372a5 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 dfe8c57cef..0f6870a45c 100644
index dfe8c57ce..0f6870a45 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 dfe8c57cef..0f6870a45c 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 43591dfe34..a8e59d3372 100644
index 028a169cb..9c21d196e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -143,6 +143,7 @@ public class PurpurWorldConfig {

6
patches/server/0064-Implement-ItemFactory-getMonsterEgg.patch → patches/server/0065-Implement-ItemFactory-getMonsterEgg.patch
View File

@@ -1,4 +1,4 @@
From d7ae72310a8542289a170ae214d41863de44145e Mon Sep 17 00:00:00 2001
From a715a9f0efee8196461f2e6ff34fc6cc75cdacb0 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 24af4c11d6..8ef2c32236 100644
index 24af4c11d..8ef2c3223 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 24af4c11d6..8ef2c32236 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 23d7756456..29161032c3 100644
index 23d775645..29161032c 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/0065-Alternative-Keepalive-Handling.patch → patches/server/0066-Alternative-Keepalive-Handling.patch
View File

@@ -1,4 +1,4 @@
From 54394aaf6481dad9ccbb1b5453a436a1c1897a3c Mon Sep 17 00:00:00 2001
From 76726919a5d08da468c119b8fbd7d57d3594aaed 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 8e93f1540b..470f92c4fb 100644
index 8e93f1540..470f92c4f 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 8e93f1540b..470f92c4fb 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 2f2e248c02..20cdd09f19 100644
index 2659da188..65b9b93a6 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -74,6 +74,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -74,7 +74,7 @@ index 2f2e248c02..20cdd09f19 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 7be2e01814..3cd53cc3aa 100644
index 7be2e0181..3cd53cc3a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -159,6 +159,11 @@ public class PurpurConfig {

4
patches/server/0066-Implement-PlayerSetSpawnerTypeWithEggEvent.patch → patches/server/0067-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
View File

@@ -1,4 +1,4 @@
From d44791bc613fb816e7281679baa1b8212ddb2633 Mon Sep 17 00:00:00 2001
From f579c8d8dda326df2e0322499c7c9b666c6330b0 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 8ef2c32236..237fdeda5c 100644
index 8ef2c3223..237fdeda5 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/0067-Add-MonsterEggSpawnEvent.patch → patches/server/0068-Add-MonsterEggSpawnEvent.patch
View File

@@ -1,4 +1,4 @@
From d430fd17c8c4bae401dcf65bab6489dbdeadc00c Mon Sep 17 00:00:00 2001
From d3d17b117f62a2d8cbdae963403702d0767f1372 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 03:20:59 -0500
Subject: [PATCH] Add MonsterEggSpawnEvent
@@ -8,7 +8,7 @@ Subject: [PATCH] Add MonsterEggSpawnEvent
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index 0dd9897b99..149e253360 100644
index 0dd9897b9..149e25336 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -163,19 +163,45 @@ public class EntityTypes<T extends Entity> {

6
patches/server/0068-Add-moon-phase-API.patch → patches/server/0069-Add-moon-phase-API.patch
View File

@@ -1,4 +1,4 @@
From ecd4e43ed26b46d3e5ad0d0f8440448ade679178 Mon Sep 17 00:00:00 2001
From 706905bb67539f5dc51111a9688c60a90e97244e 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,10 +8,10 @@ Subject: [PATCH] Add moon phase API
1 file changed, 7 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a14b8cb988..4ee61f33f1 100644
index 7aed24c8f..a1df723f5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2412,6 +2412,13 @@ public class CraftWorld implements World {
@@ -2414,6 +2414,13 @@ public class CraftWorld implements World {
return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList());
}

12
patches/server/0069-Add-getPlacementBlockData-to-World.patch → patches/server/0070-Add-getPlacementBlockData-to-World.patch
View File

@@ -1,4 +1,4 @@
From bf226ca766f2c2fb37346ed08b02b7ab67493d0a Mon Sep 17 00:00:00 2001
From c9babcc04ee6caa1219d17d434dbf7a50fed5047 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 69d04f6cbf..901d45f284 100644
index 69d04f6cb..901d45f28 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 69d04f6cbf..901d45f284 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 0000000000..7dc68ffe92
index 000000000..7dc68ffe9
--- /dev/null
+++ b/src/main/java/net/minecraft/server/ItemSpawner.java
@@ -0,0 +1,23 @@
@@ -53,7 +53,7 @@ index 0000000000..7dc68ffe92
+ }
+}
diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java
index 9c9b93f280..74a722cce5 100644
index 9c9b93f28..74a722cce 100644
--- a/src/main/java/net/minecraft/server/Items.java
+++ b/src/main/java/net/minecraft/server/Items.java
@@ -155,7 +155,7 @@ public class Items {
@@ -66,10 +66,10 @@ index 9c9b93f280..74a722cce5 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 4ee61f33f1..ec552adfdd 100644
index a1df723f5..5eb805837 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2417,6 +2417,11 @@ public class CraftWorld implements World {
@@ -2419,6 +2419,11 @@ public class CraftWorld implements World {
public net.pl3x.purpur.MoonPhase getMoonPhase() {
return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L);
}

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