More multiworld fixes

This commit is contained in:
Tahg
2011-05-31 13:04:52 -04:00
committed by Erik Broes
parent 62b5da4e3a
commit 8835cb905f
5 changed files with 393 additions and 12 deletions

View File

@@ -117,9 +117,8 @@ public class WorldServer extends World implements BlockChangeDelegate {
if (lightning.isCancelled()) {
return false;
}
this.server.serverConfigurationManager.a(entity.locX, entity.locY, entity.locZ, 512.0D, this.dimension, new Packet71Weather(entity));
// CraftBukkit end
this.server.serverConfigurationManager.a(entity.locX, entity.locY, entity.locZ, 512.0D, this.worldProvider.dimension, new Packet71Weather(entity));
return true;
} else {
return false;
@@ -129,7 +128,8 @@ public class WorldServer extends World implements BlockChangeDelegate {
public void a(Entity entity, byte b0) {
Packet38EntityStatus packet38entitystatus = new Packet38EntityStatus(entity.id, b0);
this.server.b(this.worldProvider.dimension).b(entity, packet38entitystatus);
// CraftBukkit
this.server.b(this.dimension).b(entity, packet38entitystatus);
}
public Explosion createExplosion(Entity entity, double d0, double d1, double d2, float f, boolean flag) {
@@ -139,15 +139,19 @@ public class WorldServer extends World implements BlockChangeDelegate {
if (explosion.wasCanceled) {
return explosion;
}
// CraftBukkit end
this.server.serverConfigurationManager.a(d0, d1, d2, 64.0D, this.worldProvider.dimension, new Packet60Explosion(d0, d1, d2, f, explosion.g));
// explosion.a = flag;
// explosion.a();
// explosion.a(false);
this.server.serverConfigurationManager.a(d0, d1, d2, 64.0D, this.dimension, new Packet60Explosion(d0, d1, d2, f, explosion.g));
// CraftBukkit end
return explosion;
}
public void d(int i, int j, int k, int l, int i1) {
super.d(i, j, k, l, i1);
this.server.serverConfigurationManager.a((double) i, (double) j, (double) k, 64.0D, this.worldProvider.dimension, new Packet54PlayNoteBlock(i, j, k, l, i1));
// CraftBukkit
this.server.serverConfigurationManager.a((double) i, (double) j, (double) k, 64.0D, this.dimension, new Packet54PlayNoteBlock(i, j, k, l, i1));
}
public void saveLevel() {