From 9ccee1addcfba0767eb001dcacbf81499f4814e1 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Sat, 1 Feb 2014 13:33:32 +0800 Subject: [PATCH] Fixed TileMaterial loading colors before texture loads --- .../resonantinduction/core/resource/TileMaterial.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/resonantinduction/core/resource/TileMaterial.java b/src/main/java/resonantinduction/core/resource/TileMaterial.java index 6cf9dc35..b954860a 100644 --- a/src/main/java/resonantinduction/core/resource/TileMaterial.java +++ b/src/main/java/resonantinduction/core/resource/TileMaterial.java @@ -18,11 +18,12 @@ import com.google.common.io.ByteArrayDataInput; public class TileMaterial extends TileAdvanced implements IPacketReceiver { public String name; - private int clientColor = 0xFFFFFF; public int getColor() { - return clientColor; + if (name != null) + return ResourceGenerator.materialColors.get(name); + return 0xFFFFFF; } @Override @@ -35,7 +36,6 @@ public class TileMaterial extends TileAdvanced implements IPacketReceiver public void onReceivePacket(ByteArrayDataInput data, EntityPlayer player, Object... extra) { name = data.readUTF(); - clientColor = ResourceGenerator.materialColors.get(name); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } @@ -61,6 +61,7 @@ public class TileMaterial extends TileAdvanced implements IPacketReceiver public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setString("name", name); + if (name != null) + nbt.setString("name", name); } }