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

@@ -32,10 +32,10 @@ index 74ab12e61eb81c64d1ab805a737318c84b17c84a..2574641ef0c3614a856e358e712d2b2e
// Purpur start
if (entity instanceof LivingEntity entityliving) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index fd5c5126e69a4ae55c15c2b28aaad7b73d8cf7c8..aab384cd322b7ba57b92b703db32849e46277fa7 100644
index b071599f0ac964fee1dd93e31ecaaee720b979ab..6ff8cd77eaadbaa59294029e6d04523f4aa13e53 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1269,6 +1269,7 @@ public class PurpurWorldConfig {
@@ -1271,6 +1271,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -43,7 +43,7 @@ index fd5c5126e69a4ae55c15c2b28aaad7b73d8cf7c8..aab384cd322b7ba57b92b703db32849e
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1286,6 +1287,7 @@ public class PurpurWorldConfig {
@@ -1288,6 +1289,7 @@ public class PurpurWorldConfig {
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
creeperAlwaysDropExp = getBoolean("mobs.creeper.always-drop-exp", creeperAlwaysDropExp);
@@ -51,7 +51,7 @@ index fd5c5126e69a4ae55c15c2b28aaad7b73d8cf7c8..aab384cd322b7ba57b92b703db32849e
}
public boolean dolphinRidable = false;
@@ -2072,6 +2074,7 @@ public class PurpurWorldConfig {
@@ -2074,6 +2076,7 @@ public class PurpurWorldConfig {
public boolean piglinTakeDamageFromWater = false;
public int piglinPortalSpawnModifier = 2000;
public boolean piglinAlwaysDropExp = false;
@@ -59,7 +59,7 @@ index fd5c5126e69a4ae55c15c2b28aaad7b73d8cf7c8..aab384cd322b7ba57b92b703db32849e
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -2086,6 +2089,7 @@ public class PurpurWorldConfig {
@@ -2088,6 +2091,7 @@ public class PurpurWorldConfig {
piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater);
piglinPortalSpawnModifier = getInt("mobs.piglin.portal-spawn-modifier", piglinPortalSpawnModifier);
piglinAlwaysDropExp = getBoolean("mobs.piglin.always-drop-exp", piglinAlwaysDropExp);
@@ -67,7 +67,7 @@ index fd5c5126e69a4ae55c15c2b28aaad7b73d8cf7c8..aab384cd322b7ba57b92b703db32849e
}
public boolean piglinBruteRidable = false;
@@ -2347,6 +2351,7 @@ public class PurpurWorldConfig {
@@ -2349,6 +2353,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -75,7 +75,7 @@ index fd5c5126e69a4ae55c15c2b28aaad7b73d8cf7c8..aab384cd322b7ba57b92b703db32849e
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2359,6 +2364,7 @@ public class PurpurWorldConfig {
@@ -2361,6 +2366,7 @@ public class PurpurWorldConfig {
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
@@ -83,7 +83,7 @@ index fd5c5126e69a4ae55c15c2b28aaad7b73d8cf7c8..aab384cd322b7ba57b92b703db32849e
}
public boolean skeletonHorseRidableInWater = true;
@@ -2893,6 +2899,7 @@ public class PurpurWorldConfig {
@@ -2895,6 +2901,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -91,7 +91,7 @@ index fd5c5126e69a4ae55c15c2b28aaad7b73d8cf7c8..aab384cd322b7ba57b92b703db32849e
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2911,6 +2918,7 @@ public class PurpurWorldConfig {
@@ -2913,6 +2920,7 @@ public class PurpurWorldConfig {
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);