OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 13:07:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Workaround for crash when chests mix up with furnaces - need to investigate cause

Browse source
This commit is contained in:
Dinnerbone 2011-09-18 00:03:58 +01:00 committed by Erik Broes
parent 3f4ee9ab56
commit 65052c8a59
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/net/minecraft/server/TileEntityChest.java
View file

@ -119,19 +119,19 @@ public class TileEntityChest extends TileEntity implements IInventory {
this.d = null; this.d = null;
this.e = null; this.e = null;
if (this.world.getTypeId(this.x - 1, this.y, this.z) == Block.CHEST.id) { if (this.world.getTypeId(this.x - 1, this.y, this.z) == Block.CHEST.id) {
this.d = (TileEntityChest) this.world.getTileEntity(this.x - 1, this.y, this.z); this.d = getTileEntity(this.x - 1, this.y, this.z); // CraftBukkit
} }
if (this.world.getTypeId(this.x + 1, this.y, this.z) == Block.CHEST.id) { if (this.world.getTypeId(this.x + 1, this.y, this.z) == Block.CHEST.id) {
this.c = (TileEntityChest) this.world.getTileEntity(this.x + 1, this.y, this.z); this.c = getTileEntity(this.x + 1, this.y, this.z); // CraftBukkit
} }
if (this.world.getTypeId(this.x, this.y, this.z - 1) == Block.CHEST.id) { if (this.world.getTypeId(this.x, this.y, this.z - 1) == Block.CHEST.id) {
this.b = (TileEntityChest) this.world.getTileEntity(this.x, this.y, this.z - 1); this.b = getTileEntity(this.x, this.y, this.z - 1); // CraftBukkit
} }
if (this.world.getTypeId(this.x, this.y, this.z + 1) == Block.CHEST.id) { if (this.world.getTypeId(this.x, this.y, this.z + 1) == Block.CHEST.id) {
this.e = (TileEntityChest) this.world.getTileEntity(this.x, this.y, this.z + 1); this.e = getTileEntity(this.x, this.y, this.z + 1); // CraftBukkit
} }
if (this.b != null) { if (this.b != null) {
@ -152,6 +152,19 @@ public class TileEntityChest extends TileEntity implements IInventory {
} }
} }
// CraftBukkit start
private TileEntityChest getTileEntity(int x, int y, int z) {
TileEntity entity = this.world.getTileEntity(x, y, z);
if (entity instanceof TileEntityChest) {
return (TileEntityChest)entity;
} else {
world.getServer().getLogger().severe("Block at " + x + "," + y + "," + z + " is a chest but has a " + entity.getClass().getName());
return null;
}
}
// CraftBukkit end
public void h_() { public void h_() {
super.h_(); super.h_();
this.h(); this.h();