add "use-dismounts-underwater-tag" to fix ridables in water

This commit is contained in:
granny
2023-03-22 02:41:50 -07:00
parent 7c449672c9
commit f7801bd51a
83 changed files with 1172 additions and 1168 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add enderman and creeper griefing controls
diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
index c368ac6f35ff4b309079b4895dcd3792f3b6b69e..ccdf278afc5eab5e05649d54ef30d1c27b8b9daa 100644
index 76d796600411144b73d1e7e67f70bb032055d02a..b25d3e25a6be150739aeed99b81e99e3c995dbae 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -361,7 +361,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -18,7 +18,7 @@ index c368ac6f35ff4b309079b4895dcd3792f3b6b69e..ccdf278afc5eab5e05649d54ef30d1c2
this.spawnLingeringCloud();
} else {
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index 6e93faa6debeba159664401a49ddd5ca159abf80..7e67e034cf8b4459f274975567b9c25d7349abf1 100644
index b7b2762ff6b01da9a3df0ab0add6d50efd76db8d..3e210f4113765e5e265d9b0cfbd911db6f586327 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -530,6 +530,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -38,10 +38,10 @@ index 6e93faa6debeba159664401a49ddd5ca159abf80..7e67e034cf8b4459f274975567b9c25d
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e17d6ef06c6125e88986aa01243a6b96360c8114..5bd1546082466cac963cce61c72d2698267f3554 100644
index 65ab2e13ac14ced0272748ff79cc249fdeef3c95..85945024793eebecaac97f76766b08c95bdd0f92 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -437,6 +437,7 @@ public class PurpurWorldConfig {
@@ -439,6 +439,7 @@ public class PurpurWorldConfig {
public boolean creeperControllable = true;
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
@@ -49,7 +49,7 @@ index e17d6ef06c6125e88986aa01243a6b96360c8114..5bd1546082466cac963cce61c72d2698
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -448,6 +449,7 @@ public class PurpurWorldConfig {
@@ -450,6 +451,7 @@ public class PurpurWorldConfig {
}
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
@@ -57,15 +57,15 @@ index e17d6ef06c6125e88986aa01243a6b96360c8114..5bd1546082466cac963cce61c72d2698
}
public boolean dolphinRidable = false;
@@ -554,6 +556,7 @@ public class PurpurWorldConfig {
public boolean endermanRidableInWater = false;
@@ -556,6 +558,7 @@ public class PurpurWorldConfig {
public boolean endermanRidableInWater = true;
public boolean endermanControllable = true;
public double endermanMaxHealth = 40.0D;
+ public boolean endermanAllowGriefing = true;
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -564,6 +567,7 @@ public class PurpurWorldConfig {
@@ -566,6 +569,7 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max_health", oldValue);
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);