mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
synchronize patches
This commit is contained in:
@@ -17,10 +17,10 @@ index 08e9fd3581578195e5df079b086811c5964fd17a..7b2674233d0b8582243448c49d1c4727
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
index 63d27e2ee263fdc8b165526f04781a1cf3e60894..a82912b348921f55962b48d052a4e492c7fbb224 100644
|
||||
index 47e425967c120fa0abec8dacf4385ce3ad47f21e..9b398a73d093f83e437867119bbd77229080cfc3 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
@@ -609,6 +609,7 @@ public class PurpurWorldConfig {
|
||||
@@ -614,6 +614,7 @@ public class PurpurWorldConfig {
|
||||
public float dolphinSpitSpeed = 1.0F;
|
||||
public float dolphinSpitDamage = 2.0F;
|
||||
public double dolphinMaxHealth = 10.0D;
|
||||
@@ -28,7 +28,7 @@ index 63d27e2ee263fdc8b165526f04781a1cf3e60894..a82912b348921f55962b48d052a4e492
|
||||
private void dolphinSettings() {
|
||||
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
|
||||
dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
|
||||
@@ -621,6 +622,7 @@ public class PurpurWorldConfig {
|
||||
@@ -626,6 +627,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.dolphin.attributes.max_health", oldValue);
|
||||
}
|
||||
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);
|
||||
|
||||
Reference in New Issue
Block a user