diff options
| author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-05-26 22:15:27 +0100 |
|---|---|---|
| committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-05-27 00:11:45 +0100 |
| commit | 1784e42d5fe0ac465cda0fa5629ba06d16b90551 (patch) | |
| tree | 54db89450ca6378a6580aa8b4a286e0ef66cb614 /src/main/java/org | |
| parent | 036f49ddbfedd06306a6f9ea44de9dc6da72baf2 (diff) | |
| download | craftbukkit-1784e42d5fe0ac465cda0fa5629ba06d16b90551.tar craftbukkit-1784e42d5fe0ac465cda0fa5629ba06d16b90551.tar.gz craftbukkit-1784e42d5fe0ac465cda0fa5629ba06d16b90551.tar.lz craftbukkit-1784e42d5fe0ac465cda0fa5629ba06d16b90551.tar.xz craftbukkit-1784e42d5fe0ac465cda0fa5629ba06d16b90551.zip | |
Fixed a bunch of multiworld issues (entity tracking etc)
Diffstat (limited to 'src/main/java/org')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftServer.java | 7 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 7d0a9fc4..18f86c70 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -287,7 +287,7 @@ public final class CraftServer implements Server { } // See if the server can process this command - return console.consoleCommandHandler.handle(new ServerCommand(commandLine, new ServerCommandListener(sender))); + return console.consoleCommandHandler.handle(new ServerCommand(commandLine, (ICommandListener)new ServerCommandListener(sender))); } public void reload() { @@ -366,10 +366,11 @@ public final class CraftServer implements Server { converter.convert(name, new ConvertProgressUpdater(console)); } - WorldServer internal = new WorldServer(console, new ServerNBTManager(new File("."), name, true), name, environment.getId(), seed); + int dimension = environment.getId() + 200 + console.worlds.size(); + WorldServer internal = new WorldServer(console, new ServerNBTManager(new File("."), name, true), name, dimension, seed); internal.z = console.worlds.get(0).z; - internal.tracker = new EntityTracker(console, environment.getId()); + internal.tracker = new EntityTracker(console, dimension); internal.addIWorldAccess((IWorldAccess)new WorldManager(console, internal)); internal.spawnMonsters = 1; internal.setSpawnFlags(true, true); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 371b9ee4..ce9d1a19 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -173,11 +173,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { if (oldWorld != newWorld) { entity.dimension = newWorld.dimension; - entity.netServerHandler.sendPacket(new Packet9Respawn((byte) entity.dimension)); + entity.netServerHandler.sendPacket(new Packet9Respawn((byte) location.getWorld().getEnvironment().getId())); oldWorld.removeEntity(entity); entity.dead = false; + entity.setPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); if (entity.Q()) { + oldWorld.entityJoinedWorld(entity, false); newWorld.addEntity(entity); entity.setPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); newWorld.entityJoinedWorld(entity, false); |