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

@@ -23,10 +23,10 @@ index 177475facb1c269cd9b4a28e0aa18189baf1b909..4d283ffd0819a82616679dbdb70892e8
if (!this.isPassenger() && this.onGround() && !this.isInWater() && !this.isInPowderSnow) {
if (this.getShoulderEntityLeft().isEmpty()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c255fa7f1bc11a3bcd02b98a5464567c85325313..d7b9d515ec0103f12d33a60c98449c13a4744196 100644
index a236624e689ee6528f2dd6758dba3cfe56428dc6..9321cba5f280e30fdcf7399349b67bef94eb4f9b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -385,6 +385,7 @@ public class PurpurWorldConfig {
@@ -389,6 +389,7 @@ public class PurpurWorldConfig {
public double playerCriticalDamageMultiplier = 1.5D;
public int playerBurpDelay = 10;
public boolean playerBurpWhenFull = false;
@@ -34,7 +34,7 @@ index c255fa7f1bc11a3bcd02b98a5464567c85325313..d7b9d515ec0103f12d33a60c98449c13
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -407,6 +408,7 @@ public class PurpurWorldConfig {
@@ -411,6 +412,7 @@ public class PurpurWorldConfig {
playerCriticalDamageMultiplier = getDouble("gameplay-mechanics.player.critical-damage-multiplier", playerCriticalDamageMultiplier);
playerBurpDelay = getInt("gameplay-mechanics.player.burp-delay", playerBurpDelay);
playerBurpWhenFull = getBoolean("gameplay-mechanics.player.burp-when-full", playerBurpWhenFull);