synchronize patches

This commit is contained in:
granny
2023-06-09 05:07:46 -07:00
parent 9bed3af997
commit e4edcee766
113 changed files with 703 additions and 715 deletions

View File

@@ -58,10 +58,10 @@ index de0a015cc944c36358fc34a3142ecbf9d2a332b5..1431d7f295614641c1a5a5197f4bac3f
float f1 = Mth.cos(f) * 0.2F;
float f2 = -0.1F + this.squid.getRandom().nextFloat() * 0.2F;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7e42867fb666d8f4de17b2b50924eba6382be100..35a4cf5fd61beeed1f62fa6e1854492377b7569c 100644
index f08ce3435d293fbd39c6e6fa89607157d33f9812..37a7ceb49a00a086dadd27168726d690da3dc7c8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -901,10 +901,12 @@ public class PurpurWorldConfig {
@@ -906,10 +906,12 @@ public class PurpurWorldConfig {
public boolean glowSquidRidable = false;
public boolean glowSquidControllable = true;
public double glowSquidMaxHealth = 10.0D;
@@ -74,7 +74,7 @@ index 7e42867fb666d8f4de17b2b50924eba6382be100..35a4cf5fd61beeed1f62fa6e18544923
}
public boolean goatRidable = false;
@@ -1536,6 +1538,7 @@ public class PurpurWorldConfig {
@@ -1541,6 +1543,7 @@ public class PurpurWorldConfig {
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
@@ -82,7 +82,7 @@ index 7e42867fb666d8f4de17b2b50924eba6382be100..35a4cf5fd61beeed1f62fa6e18544923
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1547,6 +1550,7 @@ public class PurpurWorldConfig {
@@ -1552,6 +1555,7 @@ public class PurpurWorldConfig {
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);