From dd41990db463723d4c0b8a1e24d3115824b1de24 Mon Sep 17 00:00:00 2001 From: Abastro Date: Mon, 15 Aug 2016 05:58:54 +0900 Subject: [PATCH] Fixed NPE from missing Capabilities (#3191) --- .../net/minecraftforge/common/util/WorldCapabilityData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/common/util/WorldCapabilityData.java b/src/main/java/net/minecraftforge/common/util/WorldCapabilityData.java index d0a671638..28aafc952 100644 --- a/src/main/java/net/minecraftforge/common/util/WorldCapabilityData.java +++ b/src/main/java/net/minecraftforge/common/util/WorldCapabilityData.java @@ -50,7 +50,7 @@ public class WorldCapabilityData extends WorldSavedData public void setCapabilities(WorldProvider provider, INBTSerializable capabilities) { this.serializable = capabilities; - if (this.capNBT != null) + if (this.capNBT != null && serializable != null) { serializable.deserializeNBT(this.capNBT); this.capNBT = null;