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 for 1.4_00_01 -- if you bypassed Bukkit, you will most likely break.

Browse Source
This commit is contained in:
Erik Broes
2011-04-20 19:05:14 +02:00
parent ac9f297445
commit 483a878b8b
116 changed files with 3155 additions and 3207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,59 +12,59 @@ import org.bukkit.craftbukkit.CraftWorld;
public class WorldServer extends World implements BlockChangeDelegate {
// CraftBukkit end
public ChunkProviderServer u;
public boolean v = false;
public ChunkProviderServer chunkProviderServer;
public boolean weirdIsOpCache = false;
public boolean w;
public final MinecraftServer x; // CraftBukkit - private -> public final
public final MinecraftServer server; // CraftBukkit - private -> public final
private EntityList y = new EntityList();
public PlayerManager manager; // CraftBukkit
public WorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, String s, int i, long j) {
super(idatamanager, s, j, WorldProvider.a(i));
this.x = minecraftserver;
this.server = minecraftserver;
// CraftBukkit start
this.server = minecraftserver.server;
this.cserver = minecraftserver.server;
this.world = new CraftWorld(this);
this.manager = new PlayerManager(minecraftserver, this);
}
private final CraftWorld world;
private final CraftServer server;
private final CraftServer cserver;
public CraftWorld getWorld() {
return world;
}
public CraftServer getServer() {
return server;
return cserver;
}
// CraftBukkit end
public void a(Entity entity, boolean flag) {
public void entityJoinedWorld(Entity entity, boolean flag) {
// CraftBukkit start -- We prevent spawning in general, so this butchering is not needed
//if (!this.x.m && (entity instanceof EntityAnimal || entity instanceof EntityWaterAnimal)) {
// entity.D();
//if (!this.server.spawnAnimals && (entity instanceof EntityAnimal || entity instanceof EntityWaterAnimal)) {
// entity.die();
//}
// CraftBukkit end
if (entity.passenger == null || !(entity.passenger instanceof EntityHuman)) {
super.a(entity, flag);
super.entityJoinedWorld(entity, flag);
}
}
public void b(Entity entity, boolean flag) {
super.a(entity, flag);
public void vehicleEnteredWorld(Entity entity, boolean flag) {
super.entityJoinedWorld(entity, flag);
}
protected IChunkProvider b() {
IChunkLoader ichunkloader = this.p.a(this.m);
IChunkLoader ichunkloader = this.p.a(this.worldProvider);
this.u = new ChunkProviderServer(this, ichunkloader, this.m.c());
return this.u;
this.chunkProviderServer = new ChunkProviderServer(this, ichunkloader, this.worldProvider.c());
return this.chunkProviderServer;
}
public List d(int i, int j, int k, int l, int i1, int j1) {
public List getTileEntities(int i, int j, int k, int l, int i1, int j1) {
ArrayList arraylist = new ArrayList();
for (int k1 = 0; k1 < this.c.size(); ++k1) {
@@ -79,15 +79,15 @@ 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.q.c()));
int i1 = (int) MathHelper.e((float) (k - this.q.e()));
int l = (int) MathHelper.abs((float) (i - this.worldData.c()));
int i1 = (int) MathHelper.abs((float) (k - this.worldData.e()));
if (l > i1) {
i1 = l;
}
// CraftBukkit -- Configurable spawn protection
return i1 > this.x.spawnProtection || this.x.f.h(entityhuman.name);
return i1 > this.server.spawnProtection || this.server.serverConfigurationManager.isOp(entityhuman.name);
}
protected void b(Entity entity) {
@@ -100,18 +100,18 @@ public class WorldServer extends World implements BlockChangeDelegate {
this.y.d(entity.id);
}
public Entity a(int i) {
public Entity getEntity(int i) {
return (Entity) this.y.a(i);
}
public void a(Entity entity, byte b0) {
Packet38EntityStatus packet38entitystatus = new Packet38EntityStatus(entity.id, b0);
this.x.k.b(entity, packet38entitystatus);
this.server.tracker.b(entity, packet38entitystatus);
}
public Explosion a(Entity entity, double d0, double d1, double d2, float f, boolean flag) {
Explosion explosion = super.a(entity, d0, d1, d2, f, flag);
public Explosion createExplosion(Entity entity, double d0, double d1, double d2, float f, boolean flag) {
Explosion explosion = super.createExplosion(entity, d0, d1, d2, f, flag);
// CraftBukkit start
if (explosion.wasCanceled) {
@@ -119,16 +119,16 @@ public class WorldServer extends World implements BlockChangeDelegate {
}
// CraftBukkit end
this.x.f.a(d0, d1, d2, 64.0D, new Packet60Explosion(d0, d1, d2, f, explosion.g));
this.server.serverConfigurationManager.a(d0, d1, d2, 64.0D, 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.x.f.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, new Packet54PlayNoteBlock(i, j, k, l, i1));
}
public void t() {
public void saveLevel() {
this.p.e();
}
}