Merge pull request #12 from GTNewHorizons/fix-render-npe

Fix render NPE
GTNewHorizons · Aug 20, 2022 · 908d46c · 908d46c
2 parents e9bcd33 + 0fd7823
commit 908d46c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/renderers/MainBlockRenderer.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/renderers/MainBlockRenderer.java
@@ -18,7 +18,6 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import shedar.mods.ic2.nuclearcontrol.panel.Screen;
-import shedar.mods.ic2.nuclearcontrol.panel.ScreenManager;
 
 @SideOnly(Side.CLIENT)
 public class MainBlockRenderer implements ISimpleBlockRenderingHandler {
@@ -121,7 +120,10 @@ public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z,
 				TileEntityAdvancedInfoPanelExtender advancedExtender = (TileEntityAdvancedInfoPanelExtender) tileEntity;
 				boolean wasRendered = false;
 
-				if (IC2NuclearControl.instance.screenManager != null) {
+				if (IC2NuclearControl.instance.screenManager == null || IC2NuclearControl.instance.screenManager.getScreens().get(
+					IC2NuclearControl.instance.screenManager.getWorldKey(advancedExtender.getWorldObj())) == null ) {
+					wasRendered = true;
+				} else {
 					for (Screen screen : IC2NuclearControl.instance.screenManager.getScreens().get(
 						IC2NuclearControl.instance.screenManager.getWorldKey(advancedExtender.getWorldObj()))) {
 						if (screen != null && screen.isBlockPartOf(advancedExtender)) {