upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 00:07:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix migration error causing nether and end portals to not function properly.

Browse Source
This commit is contained in:
RealMangoRage authored and GitHub committed 2023-09-24 09:57:15 -07:00
1 parent 19bbb88e52
commit eefca22aa3
2 files changed
+6 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

patches/minecraft/net/minecraft/server/level/ServerPlayer.java.patch
+5 -7
View File
@@ -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<Level> 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));
patches/minecraft/net/minecraft/world/entity/Entity.java.patch
+1 -1
View File
@@ -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();