Updated Upstream (Paper & Airplane)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
06db5d08b0 Updated Upstream (Bukkit/CraftBukkit) (#6589)
810d200bb4 Improve interact distance check (#6591)

Airplane Changes:
8207533bdf Upstream
This commit is contained in:
William Blake Galbreath
2021-09-12 22:23:58 -05:00
parent acf2f845e4
commit 8bd08ceeea
53 changed files with 239 additions and 198 deletions

View File

@@ -58,10 +58,10 @@ index c718697a9511ccf761467644967397b777446db9..66ecd29cc52483e0a79ec6c9c5dbf071
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ed03ed6a594c2b06f1f5db7cc0c2b537e7aece76..467cc1e7166875c929b4d39f7ed3d7c2f12991e6 100644
index 7614fd146a2191595478153a05493ef9bc8eb7eb..7f1914083d60c7e6eeb12c700004fc3f9846f039 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1151,7 +1151,14 @@ public class PurpurWorldConfig {
@@ -1157,7 +1157,14 @@ public class PurpurWorldConfig {
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
public int cowBreedingTicks = 6000;
@@ -76,7 +76,7 @@ index ed03ed6a594c2b06f1f5db7cc0c2b537e7aece76..467cc1e7166875c929b4d39f7ed3d7c2
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1162,6 +1169,8 @@ public class PurpurWorldConfig {
@@ -1168,6 +1175,8 @@ public class PurpurWorldConfig {
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
cowBreedingTicks = getInt("mobs.cow.breeding-delay-ticks", cowBreedingTicks);