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

@@ -17,10 +17,10 @@ index 03ae6519a523ee73cce664d85074b5f9525de6d6..206be7e1fc85fed99118020490d8494d
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 702ed3dd224982989060295f3ca07a6459072c65..508166beeffe38f96e922ac523765a05a223a1e1 100644
index ecc07192df1b7c3e712d4ca415a13241b23dd94d..e5e44a03efdf4c3c7309b0572af275adf8243731 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1498,6 +1498,7 @@ public class PurpurWorldConfig {
@@ -1504,6 +1504,7 @@ public class PurpurWorldConfig {
public double horseMovementSpeedMax = 0.3375D;
public int horseBreedingTicks = 6000;
public boolean horseStandWithRider = true;
@@ -28,7 +28,7 @@ index 702ed3dd224982989060295f3ca07a6459072c65..508166beeffe38f96e922ac523765a05
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1515,6 +1516,7 @@ public class PurpurWorldConfig {
@@ -1521,6 +1522,7 @@ public class PurpurWorldConfig {
horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
horseBreedingTicks = getInt("mobs.horse.breeding-delay-ticks", horseBreedingTicks);
horseStandWithRider = getBoolean("mobs.horse.stand-with-rider", horseStandWithRider);