diff options
| author | sk89q <the.sk89q@gmail.com> | 2011-04-11 17:10:17 -0700 |
|---|---|---|
| committer | sk89q <the.sk89q@gmail.com> | 2011-04-11 17:10:17 -0700 |
| commit | 7baf5fa4849b969856ceae6cdcff70eed3e893ed (patch) | |
| tree | 4015b397db12fc4ef56bd027e7f9be58eeab7e21 /src/main/java | |
| parent | 8de85b8afbac46b845799dc75eaa54fd1c9fd66d (diff) | |
| download | craftbukkit-7baf5fa4849b969856ceae6cdcff70eed3e893ed.tar craftbukkit-7baf5fa4849b969856ceae6cdcff70eed3e893ed.tar.gz craftbukkit-7baf5fa4849b969856ceae6cdcff70eed3e893ed.tar.lz craftbukkit-7baf5fa4849b969856ceae6cdcff70eed3e893ed.tar.xz craftbukkit-7baf5fa4849b969856ceae6cdcff70eed3e893ed.zip | |
Made fauxSleeping persist on death and cross-world teleport.
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/net/minecraft/server/ServerConfigurationManager.java | 3 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java index 76f101c1..20736dd0 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 d66e4eb2..225196e8 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); |