entities with passengers can go through portals now, closes #1540

This commit is contained in:
granny
2024-06-25 01:21:03 -07:00
parent ad910f8210
commit 39617d5c9d
115 changed files with 613 additions and 609 deletions

View File

@@ -68,10 +68,10 @@ index 0d04a0107bd1a8a2b9aeb4be55025cd554e8fb79..a050d76233e179a1456b83ccc02bb9a5
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index fc0c635bcd787bd3105ca7f9b99fd295fa2969ce..c85019e1bbf2ce440e21f108c2751a715aca5c3a 100644
index 60496afdae66f0644dddce5891ed4c2c05eab093..bbdf167f158bfadeb3a940587495ea3538a49b13 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2012,6 +2012,11 @@ public class PurpurWorldConfig {
@@ -2016,6 +2016,11 @@ public class PurpurWorldConfig {
public double shulkerMaxHealth = 30.0D;
public double shulkerScale = 1.0D;
public boolean shulkerTakeDamageFromWater = false;
@@ -83,7 +83,7 @@ index fc0c635bcd787bd3105ca7f9b99fd295fa2969ce..c85019e1bbf2ce440e21f108c2751a71
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -2024,6 +2029,11 @@ public class PurpurWorldConfig {
@@ -2028,6 +2033,11 @@ public class PurpurWorldConfig {
shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth);
shulkerScale = Mth.clamp(getDouble("mobs.shulker.attributes.scale", shulkerScale), 0.0625D, Shulker.MAX_SCALE);
shulkerTakeDamageFromWater = getBoolean("mobs.shulker.takes-damage-from-water", shulkerTakeDamageFromWater);