Merge pull request #1790 from MatthiasMann/issue_1789

#1789 added null check for entityPlayer
This commit is contained in:
tterrag1098 committed 2015-01-27 18:49:53 -05:00
commit 6ba328d6fa
1 file changed
+1 -1
@@ -130,7 +130,7 @@ public class TooltipAddera {
}
private static boolean addStirlinGeneratorTooltip(ItemTooltipEvent evt) {
if(evt.entityPlayer.openContainer instanceof StirlingGeneratorContainer) {
if(evt.entityPlayer != null && evt.entityPlayer.openContainer instanceof StirlingGeneratorContainer) {
AbstractMachineEntity te = ((StirlingGeneratorContainer)evt.entityPlayer.openContainer).getTileEntity();
if(te instanceof TileEntityStirlingGenerator) {
TileEntityStirlingGenerator gen = (TileEntityStirlingGenerator) te;