Kotori0629/Arclight1.18
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mod portal entity teleport crash (#218 #233)

Browse Source
This commit is contained in:
IzzelAliz 2021-04-18 11:00:58 +08:00
parent 7443bdf012
commit 3e6fc00d78
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityMixin.java
View File

@ -814,11 +814,10 @@ public abstract class EntityMixin implements InternalEntityBridge, EntityBridge,
if (portalinfo == null) { if (portalinfo == null) {
return null; return null;
} else { } else {
server = ((PortalInfoBridge) portalinfo).bridge$getWorld(); ServerWorld world = ((PortalInfoBridge) portalinfo).bridge$getWorld() == null ? server : ((PortalInfoBridge) portalinfo).bridge$getWorld();
this.detach(); this.detach();
Entity transportedEntity = teleporter.placeEntity((Entity) (Object) this, (ServerWorld) this.world, server, this.rotationYaw, spawnPortal -> { //Forge: Start vanilla logic Entity transportedEntity = teleporter.placeEntity((Entity) (Object) this, (ServerWorld) this.world, server, this.rotationYaw, spawnPortal -> { //Forge: Start vanilla logic
this.world.getProfiler().endStartSection("reloading"); this.world.getProfiler().endStartSection("reloading");
ServerWorld world = ((PortalInfoBridge) portalinfo).bridge$getWorld();
Entity entity = this.getType().create(world); Entity entity = this.getType().create(world);
if (entity != null) { if (entity != null) {
entity.copyDataFromOld((Entity) (Object) this); entity.copyDataFromOld((Entity) (Object) this);
@ -836,7 +835,7 @@ public abstract class EntityMixin implements InternalEntityBridge, EntityBridge,
this.setDead(); this.setDead();
this.world.getProfiler().endSection(); this.world.getProfiler().endSection();
((ServerWorld) this.world).resetUpdateEntityTick(); ((ServerWorld) this.world).resetUpdateEntityTick();
server.resetUpdateEntityTick(); world.resetUpdateEntityTick();
this.world.getProfiler().endSection(); this.world.getProfiler().endSection();
return transportedEntity; return transportedEntity;
} }