Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.3.1

Browse Source
This commit is contained in:
feildmaster
2012-07-29 02:33:13 -05:00
committed by Travis Watkins
parent 08e2923bd4
commit a43d621c01
240 changed files with 10763 additions and 9150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@@ -257,7 +257,6 @@ public class CraftWorld implements World {
world.chunkProviderServer.chunks.put(x, z, chunk);
world.chunkProviderServer.chunkList.add(chunk);
chunk.loadNOP();
chunk.addEntities();
if (!chunk.done && world.chunkProviderServer.isChunkLoaded(x + 1, z + 1) && world.chunkProviderServer.isChunkLoaded(x, z + 1) && world.chunkProviderServer.isChunkLoaded(x + 1, z)) {
@@ -338,13 +337,13 @@ public class CraftWorld implements World {
}
public LightningStrike strikeLightning(Location loc) {
EntityWeatherLighting lightning = new EntityWeatherLighting(world, loc.getX(), loc.getY(), loc.getZ());
EntityLightning lightning = new EntityLightning(world, loc.getX(), loc.getY(), loc.getZ());
world.strikeLightning(lightning);
return new CraftLightningStrike(server, lightning);
}
public LightningStrike strikeLightningEffect(Location loc) {
EntityWeatherLighting lightning = new EntityWeatherLighting(world, loc.getX(), loc.getY(), loc.getZ(), true);
EntityLightning lightning = new EntityLightning(world, loc.getX(), loc.getY(), loc.getZ(), true);
world.strikeLightning(lightning);
return new CraftLightningStrike(server, lightning);
}
@@ -400,7 +399,7 @@ public class CraftWorld implements World {
}
public String getName() {
return world.worldData.name;
return world.worldData.getName();
}
@Deprecated
@@ -409,7 +408,7 @@ public class CraftWorld implements World {
}
public UUID getUID() {
return world.getUUID();
return world.getDataManager().getUUID();
}
@Override
@@ -514,18 +513,18 @@ public class CraftWorld implements World {
net.minecraft.server.Chunk chunk = this.world.getChunkAtWorldCoords(x, z);
if (chunk != null) {
byte[] biomevals = chunk.l();
byte[] biomevals = chunk.m();
biomevals[((z & 0xF) << 4) | (x & 0xF)] = (byte)bb.id;
}
}
}
public double getTemperature(int x, int z) {
return this.world.getBiome(x, z).F;
return this.world.getBiome(x, z).temperature;
}
public double getHumidity(int x, int z) {
return this.world.getBiome(x, z).G;
return this.world.getBiome(x, z).humidity;
}
public List<Entity> getEntities() {
@@ -636,12 +635,16 @@ public class CraftWorld implements World {
}
public void save() {
boolean oldSave = world.savingDisabled;
try {
boolean oldSave = world.savingDisabled;
world.savingDisabled = false;
world.save(true, null);
world.savingDisabled = false;
world.save(true, null);
world.savingDisabled = oldSave;
world.savingDisabled = oldSave;
} catch (ExceptionWorldConflict ex) {
ex.printStackTrace();
}
}
public boolean isAutoSave() {
@@ -806,8 +809,6 @@ public class CraftWorld implements World {
entity = new EntitySnowball(world, x, y, z);
} else if (Egg.class.isAssignableFrom(clazz)) {
entity = new EntityEgg(world, x, y, z);
} else if (EnderPearl.class.isAssignableFrom(clazz)) {
entity = new EntityEnderPearl(world, x, y, z);
} else if (Arrow.class.isAssignableFrom(clazz)) {
entity = new EntityArrow(world);
entity.setPositionRotation(x, y, z, 0, 0);
@@ -946,7 +947,7 @@ public class CraftWorld implements World {
entity = new EntityExperienceOrb(world, x, y, z, 0);
} else if (Weather.class.isAssignableFrom(clazz)) {
// not sure what this can do
entity = new EntityWeatherLighting(world, x, y, z);
entity = new EntityLightning(world, x, y, z);
} else if (LightningStrike.class.isAssignableFrom(clazz)) {
// what is this, I don't even
} else if (Fish.class.isAssignableFrom(clazz)) {