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

@@ -18,10 +18,10 @@ index a416766ababa6ec85d6d53e54042c87f82062a1f..aba483be8705ad41245604862cf403fd
j = this.levelData.getDayTime() + 24000L;
TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (j - j % 24000L) - this.getDayTime());
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 8519c8dbc648e3770bc06adafa2892eea5fd5aab..d657d9310db7646336c8fdb166ad4aed50733c30 100644
index 17093e3c696dc0f05735ed3514c37af9968083e2..fe46a714e5eaf260c39803b9e644f62a5f211dd2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -347,6 +347,7 @@ public class PurpurWorldConfig {
@@ -351,6 +351,7 @@ public class PurpurWorldConfig {
public boolean playerFixStuckPortal = false;
public boolean creativeOnePunch = false;
public boolean playerSleepNearMonsters = false;
@@ -29,7 +29,7 @@ index 8519c8dbc648e3770bc06adafa2892eea5fd5aab..d657d9310db7646336c8fdb166ad4aed
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -365,6 +366,7 @@ public class PurpurWorldConfig {
@@ -369,6 +370,7 @@ public class PurpurWorldConfig {
playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);
creativeOnePunch = getBoolean("gameplay-mechanics.player.one-punch-in-creative", creativeOnePunch);
playerSleepNearMonsters = getBoolean("gameplay-mechanics.player.sleep-ignore-nearby-mobs", playerSleepNearMonsters);