mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 17:37:42 +01:00
synchronize patches
This commit is contained in:
@@ -50,10 +50,10 @@ index 08935a1f2c4a3f43483719686e5baab5063cdfce..bfae3b94ab035e1c27c988cfcc3b449c
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
index 24d2790b9d4d83b2bcd102d16b138d83f7f982ed..609ddb73472ba1825a5896cdfa44cf18df98e234 100644
|
||||
index e93a619dcd06a2cb65c0d6c4bb4ef36a8d9dbeed..f00418ed387fc9ccfbfd4dea545529d742ea2d53 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
@@ -1570,6 +1570,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1575,6 +1575,7 @@ public class PurpurWorldConfig {
|
||||
public double parrotMaxY = 320D;
|
||||
public double parrotMaxHealth = 6.0D;
|
||||
public boolean parrotTakeDamageFromWater = false;
|
||||
@@ -61,7 +61,7 @@ index 24d2790b9d4d83b2bcd102d16b138d83f7f982ed..609ddb73472ba1825a5896cdfa44cf18
|
||||
private void parrotSettings() {
|
||||
parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
|
||||
parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
|
||||
@@ -1582,6 +1583,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1587,6 +1588,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);
|
||||
parrotTakeDamageFromWater = getBoolean("mobs.parrot.takes-damage-from-water", parrotTakeDamageFromWater);
|
||||
|
||||
Reference in New Issue
Block a user