From 2d539e8013c4763c1dbad5b2d102254c18899d2e Mon Sep 17 00:00:00 2001 From: bdew Date: Thu, 1 Oct 2015 00:11:05 +0300 Subject: [PATCH] Don't try to open GUIs of nonexistant TEs if crap is passed to the gui handler --- src/net/bdew/lib/gui/GuiProvider.scala | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/net/bdew/lib/gui/GuiProvider.scala b/src/net/bdew/lib/gui/GuiProvider.scala index efafbec..9de14f4 100644 --- a/src/net/bdew/lib/gui/GuiProvider.scala +++ b/src/net/bdew/lib/gui/GuiProvider.scala @@ -23,6 +23,13 @@ trait GuiProvider { def getContainer(te: TEClass, player: EntityPlayer): AnyRef @SideOnly(Side.CLIENT) - def getGui(te: TileEntity, player: EntityPlayer): AnyRef = getGui(te.asInstanceOf[TEClass], player) - def getContainer(te: TileEntity, player: EntityPlayer): AnyRef = getContainer(te.asInstanceOf[TEClass], player) + def getGui(te: TileEntity, player: EntityPlayer): AnyRef = + if (te != null) + getGui(te.asInstanceOf[TEClass], player) + else null + + def getContainer(te: TileEntity, player: EntityPlayer): AnyRef = + if (te != null) + getContainer(te.asInstanceOf[TEClass], player) + else null }