Rebase on latest Purpur (#230)

This commit is contained in:
Encode42
2021-03-24 20:26:18 -04:00
committed by GitHub
parent 754948e524
commit b6235af624
94 changed files with 261 additions and 249 deletions

View File

@@ -31,10 +31,10 @@ index 5f8366beeaac7153a0421554f9bf91fbf265edca..7fca4d1713e8061d9de825cdae484012
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9c23c5939fcdecb7dbb86aa073582712a4f2230a..332da1c508b68b02988756fe00c34fd55ef84df5 100644
index cddab26ccdf6725538d93733774d472aaed0bc16..ff26d61385981c9bac3fd9ceeee76068824d10a7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1404,6 +1404,7 @@ public class PurpurWorldConfig {
@@ -1416,6 +1416,7 @@ public class PurpurWorldConfig {
public boolean ravagerRidableInWater = false;
public boolean ravagerBypassMobGriefing = false;
public double ravagerMaxHealth = 100.0D;
@@ -42,7 +42,7 @@ index 9c23c5939fcdecb7dbb86aa073582712a4f2230a..332da1c508b68b02988756fe00c34fd5
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1414,6 +1415,23 @@ public class PurpurWorldConfig {
@@ -1426,6 +1427,23 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);