icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.15

Browse Source
This commit is contained in:
gnembon committed 2020-01-19 16:46:33 -04:00
2 parents 444521e1fa 2b4f907655
commit 66611d9a8f
1 file changed
+3 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/patches/EntityPlayerMPFake.java
+3 -2
View File
@@ -47,11 +47,12 @@ public class EntityPlayerMPFake extends ServerPlayerEntity
instance.dimension = dimension; instance.dimension = dimension;
old_world.removePlayer(instance); old_world.removePlayer(instance);
instance.removed = false; instance.removed = false;
worldIn.spawnEntity(instance); //worldIn.spawnEntity(instance);
instance.setWorld(worldIn); instance.setWorld(worldIn);
server.getPlayerManager().sendWorldInfo(instance, old_world); server.getPlayerManager().sendWorldInfo(instance, worldIn);
instance.networkHandler.requestTeleport(d0, d1, d2, (float) yaw, (float) pitch); instance.networkHandler.requestTeleport(d0, d1, d2, (float) yaw, (float) pitch);
instance.interactionManager.setWorld(worldIn); instance.interactionManager.setWorld(worldIn);
worldIn.method_18211(instance);
} }
instance.setHealth(20.0F); instance.setHealth(20.0F);
instance.removed = false; instance.removed = false;