mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-14 19:55:52 -07:00
Implemented 1.6!
This commit is contained in:
@@ -14,24 +14,25 @@ public class WorldServer extends World implements BlockChangeDelegate {
|
||||
|
||||
public ChunkProviderServer chunkProviderServer;
|
||||
public boolean weirdIsOpCache = false;
|
||||
public boolean y;
|
||||
public boolean E;
|
||||
public final MinecraftServer server; // CraftBukkit - private -> public final
|
||||
private EntityList A = new EntityList();
|
||||
private EntityList G = new EntityList();
|
||||
|
||||
public WorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, String s, int i, long j) {
|
||||
super(idatamanager, s, j, WorldProvider.a(i));
|
||||
this.server = minecraftserver;
|
||||
|
||||
// CraftBukkit start
|
||||
this.dimension = i;
|
||||
this.cserver = minecraftserver.server;
|
||||
this.world = new CraftWorld(this);
|
||||
this.manager = new PlayerManager(minecraftserver, this);
|
||||
this.pvpMode = minecraftserver.pvpMode;
|
||||
}
|
||||
|
||||
public PlayerManager manager;
|
||||
public final int dimension;
|
||||
private final CraftWorld world;
|
||||
private final CraftServer cserver;
|
||||
public EntityTracker tracker;
|
||||
|
||||
public CraftWorld getWorld() {
|
||||
return world;
|
||||
@@ -59,9 +60,9 @@ public class WorldServer extends World implements BlockChangeDelegate {
|
||||
}
|
||||
|
||||
protected IChunkProvider b() {
|
||||
IChunkLoader ichunkloader = this.r.a(this.worldProvider);
|
||||
IChunkLoader ichunkloader = this.w.a(this.worldProvider);
|
||||
|
||||
this.chunkProviderServer = new ChunkProviderServer(this, ichunkloader, this.worldProvider.c());
|
||||
this.chunkProviderServer = new ChunkProviderServer(this, ichunkloader, this.worldProvider.b());
|
||||
return this.chunkProviderServer;
|
||||
}
|
||||
|
||||
@@ -93,16 +94,16 @@ public class WorldServer extends World implements BlockChangeDelegate {
|
||||
|
||||
protected void c(Entity entity) {
|
||||
super.c(entity);
|
||||
this.A.a(entity.id, entity);
|
||||
this.G.a(entity.id, entity);
|
||||
}
|
||||
|
||||
protected void d(Entity entity) {
|
||||
super.d(entity);
|
||||
this.A.d(entity.id);
|
||||
this.G.d(entity.id);
|
||||
}
|
||||
|
||||
public Entity getEntity(int i) {
|
||||
return (Entity) this.A.a(i);
|
||||
return (Entity) this.G.a(i);
|
||||
}
|
||||
|
||||
public boolean a(Entity entity) {
|
||||
@@ -116,7 +117,7 @@ public class WorldServer extends World implements BlockChangeDelegate {
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
this.server.serverConfigurationManager.a(entity.locX, entity.locY, entity.locZ, 512.0D, new Packet71Weather(entity));
|
||||
this.server.serverConfigurationManager.a(entity.locX, entity.locY, entity.locZ, 512.0D, this.worldProvider.dimension, new Packet71Weather(entity));
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
@@ -126,7 +127,7 @@ public class WorldServer extends World implements BlockChangeDelegate {
|
||||
public void a(Entity entity, byte b0) {
|
||||
Packet38EntityStatus packet38entitystatus = new Packet38EntityStatus(entity.id, b0);
|
||||
|
||||
this.server.tracker.b(entity, packet38entitystatus);
|
||||
this.server.b(this.worldProvider.dimension).b(entity, packet38entitystatus);
|
||||
}
|
||||
|
||||
public Explosion createExplosion(Entity entity, double d0, double d1, double d2, float f, boolean flag) {
|
||||
@@ -138,17 +139,17 @@ public class WorldServer extends World implements BlockChangeDelegate {
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
this.server.serverConfigurationManager.a(d0, d1, d2, 64.0D, new Packet60Explosion(d0, d1, d2, f, explosion.g));
|
||||
this.server.serverConfigurationManager.a(d0, d1, d2, 64.0D, this.worldProvider.dimension, new Packet60Explosion(d0, d1, d2, f, explosion.g));
|
||||
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, new Packet54PlayNoteBlock(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));
|
||||
}
|
||||
|
||||
public void saveLevel() {
|
||||
this.r.e();
|
||||
this.w.e();
|
||||
}
|
||||
|
||||
protected void i() {
|
||||
|
Reference in New Issue
Block a user