From eefca22aa35ebf7ee2d027286ea110303accfdf5 Mon Sep 17 00:00:00 2001 From: RealMangoRage Date: Sun, 24 Sep 2023 09:57:15 -0700 Subject: [PATCH] Fix migration error causing nether and end portals to not function properly. --- .../minecraft/server/level/ServerPlayer.java.patch | 12 +++++------- .../net/minecraft/world/entity/Entity.java.patch | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/patches/minecraft/net/minecraft/server/level/ServerPlayer.java.patch b/patches/minecraft/net/minecraft/server/level/ServerPlayer.java.patch index c576db5552..5863adc10f 100644 --- a/patches/minecraft/net/minecraft/server/level/ServerPlayer.java.patch +++ b/patches/minecraft/net/minecraft/server/level/ServerPlayer.java.patch @@ -17,14 +17,13 @@ boolean flag = this.level().getGameRules().getBoolean(GameRules.RULE_SHOWDEATHMESSAGES); if (flag) { Component component = this.getCombatTracker().getDeathMessage(); -@@ -715,11 +_,13 @@ +@@ -715,11 +_,12 @@ } @Nullable - public Entity changeDimension(ServerLevel p_9180_) { + public Entity changeDimension(ServerLevel p_9180_, net.minecraftforge.common.util.ITeleporter teleporter) { -+ if (!net.minecraftforge.event.ForgeEventFactory.onTravelToDimension(this, p_9180_.dimension())) -+ return null; ++ if (net.minecraftforge.event.ForgeEventFactory.onTravelToDimension(this, p_9180_.dimension())) return null; this.isChangingDimension = true; ServerLevel serverlevel = this.serverLevel(); ResourceKey resourcekey = serverlevel.dimension(); @@ -171,12 +170,11 @@ } public void swing(InteractionHand p_9031_) { -@@ -1412,21 +_,23 @@ - this.stopRiding(); +@@ -1413,20 +_,23 @@ if (p_9000_ == this.level()) { this.connection.teleport(p_9001_, p_9002_, p_9003_, p_9004_, p_9005_); -- } else { -+ } else if (!net.minecraftforge.event.ForgeEventFactory.onTravelToDimension(this, p_9000_.dimension())) { + } else { ++ if (net.minecraftforge.event.ForgeEventFactory.onTravelToDimension(this, p_9000_.dimension())) return; ServerLevel serverlevel = this.serverLevel(); LevelData leveldata = p_9000_.getLevelData(); this.connection.send(new ClientboundRespawnPacket(this.createCommonSpawnInfo(p_9000_), (byte)3)); diff --git a/patches/minecraft/net/minecraft/world/entity/Entity.java.patch b/patches/minecraft/net/minecraft/world/entity/Entity.java.patch index a3ee71160e..d4bf822e4d 100644 --- a/patches/minecraft/net/minecraft/world/entity/Entity.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/Entity.java.patch @@ -351,7 +351,7 @@ + } + @Nullable + public Entity changeDimension(ServerLevel p_20118_, net.minecraftforge.common.util.ITeleporter teleporter) { -+ if (!net.minecraftforge.event.ForgeEventFactory.onTravelToDimension(this, p_20118_.dimension())) return null; ++ if (net.minecraftforge.event.ForgeEventFactory.onTravelToDimension(this, p_20118_.dimension())) return null; if (this.level() instanceof ServerLevel && !this.isRemoved()) { this.level().getProfiler().push("changeDimension"); this.unRide();