Merge pull request #616 from Electrical-Age/bugfix/lamp-waila-crash

Fixed bug crashing server when autoplacing bulp into lamp
Electrical-Age · Jan 24, 2017 · 3780f28 · 3780f28 · AMIDIBOSS · Jan 25, 2017
2 parents 1938171 + 2ea1d8b
commit 3780f28
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/mods/eln/sixnode/lampsocket/LampSocketElement.java b/src/main/java/mods/eln/sixnode/lampsocket/LampSocketElement.java
@@ -224,7 +224,7 @@ public Map<String, String> getWaila() {
 			}
 			info.put(I18N.tr("Voltage"), Utils.plotVolt("", positiveLoad.getU()));
 			ItemStack lampStack = acceptingInventory.getInventory().getStackInSlot(0);
-			if (lampStack != null) {
+			if (lampStack != null && lampDescriptor != null) {
 				info.put(I18N.tr("Life"), Utils.plotValue(lampDescriptor.getLifeInTag(lampStack)));
 			}