From 03aa8d5f4b99ce21ef417f5e265cf29ab0ea1486 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Mon, 4 Apr 2022 15:38:42 +0800 Subject: [PATCH] Fix entity portal teleport not changing level --- .../arclight/common/mixin/core/world/entity/EntityMixin.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityMixin.java index 3d343930..707162d0 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityMixin.java @@ -26,7 +26,6 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvent; import net.minecraft.tags.FluidTags; -import net.minecraft.tags.Tag; import net.minecraft.tags.TagKey; import net.minecraft.util.Mth; import net.minecraft.world.damagesource.DamageSource; @@ -878,13 +877,13 @@ public abstract class EntityMixin implements InternalEntityBridge, EntityBridge, return null; } else { ServerLevel world = ((PortalInfoBridge) portalinfo).bridge$getWorld() == null ? server : ((PortalInfoBridge) portalinfo).bridge$getWorld(); - if (world == server) { + if (world == this.level) { this.moveTo(portalinfo.pos.x, portalinfo.pos.y, portalinfo.pos.z, portalinfo.yRot, this.getXRot()); this.setDeltaMovement(portalinfo.speed); return (Entity) (Object) this; } this.unRide(); - Entity transportedEntity = teleporter.placeEntity((Entity) (Object) this, (ServerLevel) this.level, server, this.getYRot(), spawnPortal -> { //Forge: Start vanilla logic + Entity transportedEntity = teleporter.placeEntity((Entity) (Object) this, (ServerLevel) this.level, world, this.getYRot(), spawnPortal -> { //Forge: Start vanilla logic this.level.getProfiler().popPush("reloading"); Entity entity = this.getType().create(world); if (entity != null) {