twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-14 11:45:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.3 beta

Browse Source
This commit is contained in:
Dinnerbone
2011-02-23 02:37:56 +00:00
parent a124bfdab5
commit f759e0b60d
83 changed files with 3182 additions and 3292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/main/java/net/minecraft/server/WorldServer.java
View File

@@ -13,16 +13,16 @@ import org.bukkit.craftbukkit.CraftWorld;
public class WorldServer extends World implements BlockChangeDelegate {
// CraftBukkit end
public ChunkProviderServer A;
public boolean B = false;
public boolean C;
public final MinecraftServer D; // Craftbukkit
private EntityList E = new EntityList();
public ChunkProviderServer u;
public boolean v = false;
public boolean w;
public final MinecraftServer x; // Craftbukkit - private -> public final
private EntityList y = new EntityList();
public PlayerManager manager; // Craftbukkit
public WorldServer(MinecraftServer minecraftserver, File file1, String s, int i) {
super(file1, s, (new Random()).nextLong(), WorldProvider.a(i));
this.D = minecraftserver;
public WorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, String s, int i) {
super(idatamanager, s, (new Random()).nextLong(), WorldProvider.a(i));
this.x = minecraftserver;
// CraftBukkit start
this.server = minecraftserver.server;
@@ -42,14 +42,10 @@ public class WorldServer extends World implements BlockChangeDelegate {
}
// CraftBukkit end
public void f() {
super.f();
}
public void a(Entity entity, boolean flag) {
// CraftBukkit start -- We prevent spawning in general, so this butching is not needed
//if (!this.D.m && (entity instanceof EntityAnimal || entity instanceof EntityWaterAnimal)) {
// entity.q();
// CraftBukkit start -- We prevent spawning in general, so this butchering is not needed
//if (!this.x.m && (entity instanceof EntityAnimal || entity instanceof EntityWaterAnimal)) {
// entity.C();
//}
// CraftBukkit end
@@ -62,9 +58,11 @@ public class WorldServer extends World implements BlockChangeDelegate {
super.a(entity, flag);
}
protected IChunkProvider a(File file1) {
this.A = new ChunkProviderServer(this, this.q.a(file1), this.q.c());
return this.A;
protected IChunkProvider b() {
IChunkLoader ichunkloader = this.p.a(this.m);
this.u = new ChunkProviderServer(this, ichunkloader, this.m.c());
return this.u;
}
public List d(int i, int j, int k, int l, int i1, int j1) {
@@ -73,7 +71,7 @@ public class WorldServer extends World implements BlockChangeDelegate {
for (int k1 = 0; k1 < this.c.size(); ++k1) {
TileEntity tileentity = (TileEntity) this.c.get(k1);
if (tileentity.b >= i && tileentity.c >= j && tileentity.d >= k && tileentity.b < l && tileentity.c < i1 && tileentity.d < j1) {
if (tileentity.e >= i && tileentity.f >= j && tileentity.g >= k && tileentity.e < l && tileentity.f < i1 && tileentity.g < j1) {
arraylist.add(tileentity);
}
}
@@ -82,34 +80,34 @@ public class WorldServer extends World implements BlockChangeDelegate {
}
public boolean a(EntityHuman entityhuman, int i, int j, int k) {
int l = (int) MathHelper.e((float) (i - this.spawnX));
int i1 = (int) MathHelper.e((float) (k - this.spawnZ));
int l = (int) MathHelper.e((float) (i - this.q.c()));
int i1 = (int) MathHelper.e((float) (k - this.q.e()));
if (l > i1) {
i1 = l;
}
return i1 > this.D.spawnProtection || this.D.f.g(entityhuman.name); // CraftBukkit Configurable spawn protection start
return i1 > this.x.spawnProtection || this.x.f.h(entityhuman.name); // CraftBukkit Configurable spawn protection start
}
protected void b(Entity entity) {
super.b(entity);
this.E.a(entity.id, entity);
this.y.a(entity.id, entity);
}
protected void c(Entity entity) {
super.c(entity);
this.E.d(entity.id);
this.y.d(entity.id);
}
public Entity a(int i) {
return (Entity) this.E.a(i);
return (Entity) this.y.a(i);
}
public void a(Entity entity, byte b0) {
Packet38EntityStatus packet38entitystatus = new Packet38EntityStatus(entity.id, b0);
this.D.k.b(entity, packet38entitystatus);
this.x.k.b(entity, packet38entitystatus);
}
public Explosion a(Entity entity, double d0, double d1, double d2, float f, boolean flag) {
@@ -121,12 +119,16 @@ public class WorldServer extends World implements BlockChangeDelegate {
}
// Craftbukkit end
this.D.f.a(d0, d1, d2, 64.0D, new Packet60Explosion(d0, d1, d2, f, explosion.g));
this.x.f.a(d0, d1, d2, 64.0D, new Packet60Explosion(d0, d1, d2, f, explosion.g));
return explosion;
}
public void c(int i, int j, int k, int l, int i1) {
super.c(i, j, k, l, i1);
this.D.f.a((double) i, (double) j, (double) k, 64.0D, new Packet54PlayNoteBlock(i, j, k, l, i1));
public void d(int i, int j, int k, int l, int i1) {
super.d(i, j, k, l, i1);
this.x.f.a((double) i, (double) j, (double) k, 64.0D, new Packet54PlayNoteBlock(i, j, k, l, i1));
}
public void r() {
this.p.e();
}
}