Merge pull request #11 from GTNewHorizons/render-fixes

Fixed some NullPointerExceptions
GTNewHorizons · Aug 18, 2022 · e9bcd33 · e9bcd33
2 parents eebc0c9 + 1f83d9e
commit e9bcd33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 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
@@ -121,10 +121,12 @@ public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z,
 				TileEntityAdvancedInfoPanelExtender advancedExtender = (TileEntityAdvancedInfoPanelExtender) tileEntity;
 				boolean wasRendered = false;
 
-				for (Screen screen : IC2NuclearControl.instance.screenManager.getScreens().get(
-					IC2NuclearControl.instance.screenManager.getWorldKey(advancedExtender.getWorldObj()))) {
-					if (screen.isBlockPartOf(advancedExtender)) {
-						wasRendered = true;
+				if (IC2NuclearControl.instance.screenManager != null) {
+					for (Screen screen : IC2NuclearControl.instance.screenManager.getScreens().get(
+						IC2NuclearControl.instance.screenManager.getWorldKey(advancedExtender.getWorldObj()))) {
+						if (screen != null && screen.isBlockPartOf(advancedExtender)) {
+							wasRendered = true;
+						}
 					}
 				}
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityInfoPanel.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityInfoPanel.java
@@ -784,9 +784,7 @@ public int modifyTextureIndex(int texture, int x, int y, int z) {
 		}
 		texture = I_PANEL_BACKGROUND;
 
-		if (colored) {
-			texture = texture + colorBackground * 16;
-		}
+		texture = texture + colorBackground * 16;
 
 		if (getPowered()) {
 			texture += 240;