mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2025-12-29 11:39:10 +00:00
49 lines
3.1 KiB
Diff
49 lines
3.1 KiB
Diff
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 7fe7112145dbd46d851db3fc9ed183f5fdef24fe..286356ccb4f6938a857a58d4478f00aa84f00ee1 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -3603,6 +3603,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 = BlockPos.containing(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 4ac4350a6a03ed2542d50033822ed1f55248a1ce..a6949c198f9530eda5c38019cc978876538391f4 100644
|
|
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
|
@@ -127,6 +127,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
|
|
|
}
|
|
|
|
+ public Technical technical;
|
|
+ public class Technical extends ConfigurationPart {
|
|
+ public boolean loadPortalDestinationChunkBeforeEntityTeleport = false; // Gale - MultiPaper - load portal destination chunk before entity teleport
|
|
+ }
|
|
+
|
|
public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable
|
|
public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration
|
|
public boolean hideFlamesOnEntitiesWithFireResistance = false; // Gale - Slice - hide flames on entities with fire resistance
|