make sniffer ridable

This commit is contained in:
granny
2023-03-18 21:29:23 -07:00
parent ab3bcc95b4
commit ea899cadeb
40 changed files with 264 additions and 229 deletions

View File

@@ -1220,7 +1220,7 @@ index 774da46962f70e73d31ea523eb5bfc286f38856d..d2324e2dbd72fcd5a8ab562bc3b6e530
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5925b4e4707818e70a94eb0e77327c6eaa669312..9402abb6f417dc25fe6549a22239962ccda2cd49 100644
index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5ea988c1e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -112,94 +112,181 @@ public class PurpurWorldConfig {
@@ -1895,7 +1895,7 @@ index 5925b4e4707818e70a94eb0e77327c6eaa669312..9402abb6f417dc25fe6549a22239962c
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -456,180 +797,350 @@ public class PurpurWorldConfig {
@@ -456,146 +797,288 @@ 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);
@@ -2183,6 +2183,9 @@ index 5925b4e4707818e70a94eb0e77327c6eaa669312..9402abb6f417dc25fe6549a22239962c
+ snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);
}
public boolean snifferRidable = false;
@@ -609,36 +1092,64 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public boolean squidControllable = true;
+ public double squidMaxHealth = 10.0D;
@@ -2246,7 +2249,7 @@ index 5925b4e4707818e70a94eb0e77327c6eaa669312..9402abb6f417dc25fe6549a22239962c
}
public boolean tadpoleRidable = false;
@@ -644,64 +1155,125 @@ public class PurpurWorldConfig {
@@ -653,64 +1164,125 @@ public class PurpurWorldConfig {
public boolean traderLlamaRidable = false;
public boolean traderLlamaRidableInWater = false;
public boolean traderLlamaControllable = true;
@@ -2372,7 +2375,7 @@ index 5925b4e4707818e70a94eb0e77327c6eaa669312..9402abb6f417dc25fe6549a22239962c
}
public boolean wardenRidable = false;
@@ -716,81 +1288,165 @@ public class PurpurWorldConfig {
@@ -725,81 +1297,165 @@ public class PurpurWorldConfig {
public boolean witchRidable = false;
public boolean witchRidableInWater = false;
public boolean witchControllable = true;