9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-23 00:39:22 +00:00

Load portal destination chunk before entity teleport

This commit is contained in:
Martijn Muijsers
2022-12-25 16:57:10 +01:00
parent 1c9a7c84d5
commit a307b3e06f
22 changed files with 63 additions and 3 deletions

View File

@@ -0,0 +1,60 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martijn Muijsers <martijnmuijsers@live.nl>
Date: Sun, 25 Dec 2022 16:55:45 +0100
Subject: [PATCH] Load portal destination chunk before entity teleport
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
This patch is based on the following patch:
"Load chunks when entities go through an end portal"
By: PureGero <puregero@gmail.com>
As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index d05e5b9b4dec0779489856dab5e50b53ff698c38..2929669ae099482185f1abef60c569bf00b0597f 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3446,6 +3446,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
Entity entity = this.getType().create(worldserver);
if (entity != null) {
+ // Gale start - MultiPaper - load portal destination chunk before entity teleport
+ if (entity.level.galeConfig().gameplayMechanics.technical.loadPortalDestinationChunkBeforeEntityTeleport) {
+ BlockPos pos = new BlockPos(position);
+ worldserver.getChunkSource().addRegionTicket(TicketType.PORTAL, new ChunkPos(pos), 1, pos);
+ worldserver.getChunkAt(pos);
+ }
+ // Gale end - MultiPaper - load portal destination chunk before entity teleport
entity.restoreFrom(this);
entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - use EntityPortalExitEvent values
entity.setDeltaMovement(velocity); // Paper - use EntityPortalExitEvent values
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 53bc702695674ea969a3a0b7c7946e1d9b4a4f82..c45f4b9d06956a58b4e59afe70203ee8abbfccee 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -315,6 +315,23 @@ public class GaleWorldConfiguration extends ConfigurationPart {
}
+ public Technical technical;
+ public class Technical extends ConfigurationPart {
+
+ // Gale start - MultiPaper - load portal destination chunk before entity teleport
+ /**
+ * Whether to fully load chunks before teleporting an entity, when an entity enters a portal.
+ * This forces the entire server to wait for the chunk to be loaded.
+ * <ul>
+ * <li><i>Default</i>: false</li>
+ * <li><i>Vanilla</i>: false</li>
+ * </ul>
+ */
+ public boolean loadPortalDestinationChunkBeforeEntityTeleport = false;
+ // Gale end - MultiPaper - load portal destination chunk before entity teleport
+
+ }
+
@Override
public void postProcess() {
this.playerMaxInteractionDistanceSquared = this.playerMaxInteractionDistance * this.playerMaxInteractionDistance; // Gale - make max interaction distance configurable

View File

@@ -36,7 +36,7 @@ index 216929c838446c3c14d9b9906ffa625ef35fcbc8..29c7f53a4fa88a77c4076a6294e689e4
} else { } else {
this.wantedX = vec3.x; this.wantedX = vec3.x;
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 53bc702695674ea969a3a0b7c7946e1d9b4a4f82..885afe06ed3cc323325a63b82b587abb3883195a 100644 index c45f4b9d06956a58b4e59afe70203ee8abbfccee..b02eeb68002ed802714ade7a89fecc249d95375b 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -264,6 +264,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -264,6 +264,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {

View File

@@ -16,7 +16,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index d05e5b9b4dec0779489856dab5e50b53ff698c38..7a2c57900d6d651bc9e05073fffe1476f6032e80 100644 index 2929669ae099482185f1abef60c569bf00b0597f..26f06bf9b738938f47eb5707d843eec66d0edb3b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1983,8 +1983,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -1983,8 +1983,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

View File

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 7a2c57900d6d651bc9e05073fffe1476f6032e80..5f1cea3088cb48804c46d7aadf347a8481470933 100644 index 26f06bf9b738938f47eb5707d843eec66d0edb3b..271f818e2aff1e7527aad9417be848f2cfb89da6 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1187,9 +1187,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -1187,9 +1187,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {