From 7baf5fa4849b969856ceae6cdcff70eed3e893ed Mon Sep 17 00:00:00 2001 From: sk89q Date: Mon, 11 Apr 2011 17:10:17 -0700 Subject: [PATCH] Made fauxSleeping persist on death and cross-world teleport. --- .../java/net/minecraft/server/ServerConfigurationManager.java | 3 ++- src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java index 76f101c118..20736dd004 100644 --- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java +++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java @@ -184,7 +184,8 @@ public class ServerConfigurationManager { entityplayer1.a = entityplayer.a; entityplayer1.displayName = entityplayer.displayName; // CraftBukkit entityplayer1.compassTarget = entityplayer.compassTarget; // CraftBukkit - + entityplayer1.fauxSleeping = entityplayer.fauxSleeping; // CraftBukkit + if (chunkcoordinates != null) { ChunkCoordinates chunkcoordinates1 = EntityHuman.a(entityplayer.world, chunkcoordinates); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index d66e4eb2d8..225196e884 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -166,6 +166,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { newEntity.locZ = location.getZ(); newEntity.displayName = entity.displayName; newEntity.compassTarget = entity.compassTarget; + newEntity.fauxSleeping = entity.fauxSleeping; newWorld.u.c((int) location.getBlockX() >> 4, (int) location.getBlockZ() >> 4); teleportSuccess = newEntity.a.teleport(location);