xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

1403

Browse Source
This commit is contained in:
Prototik 2015-05-13 17:33:49 +07:00
parent 66f77f8314
commit 73bd06891b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -46,7 +46,7 @@ ext.mcVersion = "1.7.10"
ext.cauldronVersion = "2"
ext.forgeVersion = "1403"
ext.bukkitVersion = "1"
version = "${mcVersion}-${cauldronVersion}.${forgeVersion}.${bukkitVersion}.47"
version = "${mcVersion}-${cauldronVersion}.${forgeVersion}.${bukkitVersion}.49"
jenkins {
job = 'Cauldron'

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

@ -85,7 +85,8 @@ public class CraftWorld implements World {
}
public Block getBlockAt(int x, int y, int z) {
return getChunkAt(x >> 4, z >> 4).getBlock(x & 0xF, y & 0xFF, z & 0xF);
Chunk chunk = getChunkAt(x >> 4, z >> 4);
return chunk == null ? null : chunk.getBlock(x & 0xF, y & 0xFF, z & 0xF);
}
public int getBlockTypeIdAt(int x, int y, int z) {
@ -121,7 +122,8 @@ public class CraftWorld implements World {
}
public Chunk getChunkAt(int x, int z) {
return this.world.theChunkProviderServer.loadChunk(x, z).bukkitChunk;
net.minecraft.world.chunk.Chunk chunk = this.world.theChunkProviderServer.loadChunk(x, z);
return chunk == null ? null : chunk.bukkitChunk;
}
public Chunk getChunkAt(Block block) {