mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 02:17:42 +01:00
Updated Upstream (Paper & Airplane)
Upstream has released updates that appear to apply and compile correctly Paper Changes:06db5d08b0Updated Upstream (Bukkit/CraftBukkit) (#6589)810d200bb4Improve interact distance check (#6591) Airplane Changes:8207533bdfUpstream
This commit is contained in:
@@ -17,10 +17,10 @@ index 59033a5c28f672089fe3ad846775753ae90f9ad9..a575649cff83df5c0888ba48610ece08
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 7c8ae9626d9d61e561cbe0c54cfe971260dc3a69..10c6c8a053acf761e2645c86823d1e2eb7c13e13 100644
|
||||
index 48dac9dc0d27e9c90ae10e378c7be0101f5be9b1..980c9cae159e67374cc613e0b0e07f2c8eff3d45 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1191,6 +1191,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1197,6 +1197,7 @@ public class PurpurWorldConfig {
|
||||
public float phantomFlameDamage = 1.0F;
|
||||
public int phantomFlameFireTime = 8;
|
||||
public boolean phantomAllowGriefing = false;
|
||||
@@ -28,7 +28,7 @@ index 7c8ae9626d9d61e561cbe0c54cfe971260dc3a69..10c6c8a053acf761e2645c86823d1e2e
|
||||
public double phantomMaxHealth = 20.0D;
|
||||
public double phantomAttackedByCrystalRadius = 0.0D;
|
||||
public float phantomAttackedByCrystalDamage = 1.0F;
|
||||
@@ -1217,6 +1218,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1223,6 +1224,7 @@ public class PurpurWorldConfig {
|
||||
phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
|
||||
phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
|
||||
phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing);
|
||||
|
||||
Reference in New Issue
Block a user