Fix World Capabilities NPE when there are no attached capabilities.

This commit is contained in:
LexManos committed 2016-08-14 01:48:41 -07:00
1 parent bfddcfb4fc
commit 0e286f880e
4 files changed
+24 -20

No files matched your search

@@ -26,7 +26,7 @@ public class WorldCapabilityData extends WorldSavedData
public void readFromNBT(NBTTagCompound nbt)
{
this.capNBT = nbt;
if(serializable != null)
if (serializable != null)
{
serializable.deserializeNBT(this.capNBT);
this.capNBT = null;
@@ -36,7 +36,9 @@ public class WorldCapabilityData extends WorldSavedData
@Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt)
{
return nbt = serializable.serializeNBT();
if (serializable != null)
nbt = serializable.serializeNBT();
return nbt;
}
@Override
@@ -48,7 +50,7 @@ public class WorldCapabilityData extends WorldSavedData
public void setCapabilities(WorldProvider provider, INBTSerializable<NBTTagCompound> capabilities)
{
this.serializable = capabilities;
if(this.capNBT != null)
if (this.capNBT != null)
{
serializable.deserializeNBT(this.capNBT);
this.capNBT = null;