Script Checker Entity/Block Conditional

src/main/java/tschipp/carryon/common/scripting/CarryOnOverride.java

@@ -36,6 +36,8 @@ public class CarryOnOverride
 	private String renderRotation;
 	private String renderScale;
 	
+	private boolean isBlock;
+	private boolean isEntity;
 
 	
 	
@@ -43,6 +45,22 @@ public class CarryOnOverride
 	
 	
 	
+	public boolean isBlock()
+	{
+		return isBlock;
+	}
+	public void setBlock(boolean isBlock)
+	{
+		this.isBlock = isBlock;
+	}
+	public boolean isEntity()
+	{
+		return isEntity;
+	}
+	public void setEntity(boolean isEntity)
+	{
+		this.isEntity = isEntity;
+	}
 	public NBTTagCompound getTypeBlockTag()
 	{
 		return typeBlockTag;

src/main/java/tschipp/carryon/common/scripting/ScriptChecker.java

@@ -34,15 +34,17 @@ public class ScriptChecker
 		NBTTagCompound nbt = tag;
 
 		for (CarryOnOverride override : ScriptReader.OVERRIDES)
+		{
+			if (override.isBlock())
 			{
 				if (matchesAll(override, block, meta, material, hardness, resistance, nbt))
 					return override;
 			}
+		}
 
 		return null;
 	}
 
-	
 	@Nullable
 	public static CarryOnOverride inspectEntity(Entity entity)
 	{
@@ -57,15 +59,17 @@ public class ScriptChecker
 		entity.writeToNBT(tag);
 
 		for (CarryOnOverride override : ScriptReader.OVERRIDES)
+		{
+			if (override.isEntity())
 			{
 				if (matchesAll(override, name, height, width, health, tag))
 					return override;
 			}
+		}
 
 		return null;
 	}
 
-	
 	public static boolean matchesAll(CarryOnOverride override, String name, float height, float width, float health, NBTTagCompound tag)
 	{
 		boolean matchname = name == null ? true : name.equals(override.getTypeNameEntity());

src/main/java/tschipp/carryon/common/scripting/ScriptReader.java

@@ -71,6 +71,7 @@ public class ScriptReader
 					
 					if (block != null)
 					{
+						override.setBlock(true);
 						JsonElement name = block.get("name");
 						JsonElement meta = block.get("meta");
 						JsonElement material = block.get("material");
@@ -93,6 +94,7 @@ public class ScriptReader
 					}
 					else
 					{
+						override.setEntity(true);
 						JsonElement name = entity.get("name");
 						JsonElement health = entity.get("health");
 						JsonElement height = entity.get("height");