Why this NPE anyway?

FlansMods · Sep 10, 2013 · 7973191 · 7973191
1 parent 4e1c1f8
commit 7973191
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/minecraft/co/uk/flansmods/client/FlansModClient.java b/src/minecraft/co/uk/flansmods/client/FlansModClient.java
@@ -96,7 +96,7 @@ public void renderLiving(RenderPlayerEvent.Pre event)
 		RendererLivingEntity.NAME_TAG_RANGE = 64F;
 		RendererLivingEntity.NAME_TAG_RANGE_SNEAK = 32F;
 
-		if(event.entity instanceof EntityPlayer && GuiTeamScores.gametype != null && !GuiTeamScores.gametype.equals("No Gametype"))
+		if(event.entity instanceof EntityPlayer && GuiTeamScores.gametype != null && !"No Gametype".equals(GuiTeamScores.gametype))
 		{
 			GuiTeamScores.PlayerData rendering = GuiTeamScores.getPlayerData(event.entity.getEntityName());
 			GuiTeamScores.PlayerData thePlayer = GuiTeamScores.getPlayerData(minecraft.thePlayer.username);

diff --git a/src/minecraft/co/uk/flansmods/common/ItemPlane.java b/src/minecraft/co/uk/flansmods/common/ItemPlane.java
@@ -91,7 +91,11 @@ private NBTTagCompound getOldTagCompound(ItemStack stack, World world)
 	@Override
     public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) 
 	{
-		lines.add(PartType.getPart(getTagCompound(stack, player.worldObj).getString("Engine")).name);
+		NBTTagCompound tags = getTagCompound(stack, player.worldObj);
+		String engineName = tags.getString("Engine");
+		PartType part = PartType.getPart(engineName);
+		if(part != null)
+			lines.add(part.name);
 	}
 
 	@Override

diff --git a/src/minecraft/co/uk/flansmods/common/ItemVehicle.java b/src/minecraft/co/uk/flansmods/common/ItemVehicle.java
@@ -89,7 +89,8 @@ public void addInformation(ItemStack stack, EntityPlayer player, List lines, boo
 		NBTTagCompound tags = getTagCompound(stack, player.worldObj);
 		String engineName = tags.getString("Engine");
 		PartType part = PartType.getPart(engineName);
-		lines.add(part.name);
+		if(part != null)
+			lines.add(part.name);
 	}
 
     public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer)