Fix #1017 crash when accessing bee cart gui

This commit is contained in:
mezz committed 2015-12-22 17:44:38 -08:00
1 parent d5ebc02999
commit cc64b09ad4
5 files changed
+14 -3

No files matched your search

@@ -113,4 +113,9 @@ public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implement
public Object getContainer(EntityPlayer player, int data) {
return new ContainerMinecartBeehouse(player.inventory, this, true);
}
@Override
public int getIdOfEntity() {
return getEntityId();
}
}
@@ -98,4 +98,9 @@ public class EntityMinecartBeehouse extends EntityMinecartBeeHousingBase {
public Object getContainer(EntityPlayer player, int data) {
return new ContainerMinecartBeehouse(player.inventory, this, false);
}
@Override
public int getIdOfEntity() {
return getEntityId();
}
}
@@ -29,7 +29,7 @@ public class GuiHandler implements IGuiHandler {
public static void openGui(EntityPlayer entityplayer, IGuiHandlerEntity guiHandler, short data) {
int guiData = encodeGuiData(guiHandler, data);
entityplayer.openGui(ForestryAPI.instance, guiData, entityplayer.worldObj, guiHandler.getEntityId(), 0, 0);
entityplayer.openGui(ForestryAPI.instance, guiData, entityplayer.worldObj, guiHandler.getIdOfEntity(), 0, 0);
}
public static void openGui(EntityPlayer entityplayer, IGuiHandlerItem guiHandler) {
@@ -17,5 +17,6 @@ public interface IGuiHandlerEntity extends IGuiHandlerForestry {
Object getContainer(EntityPlayer player, int data);
int getEntityId();
// can't be named getEntityId() for obfuscation reasons
int getIdOfEntity();
}