From 532870121903f613cd93c044a6065300d283cea7 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Thu, 8 Jan 2015 21:42:13 -0800 Subject: [PATCH] Fix potential NPE when loading a single player world where you were saved in a unloaded dimension. Closes #1575 --- .../server/integrated/IntegratedServer.java.patch | 8 ++++++++ .../java/net/minecraftforge/oredict/OreDictionary.java | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch b/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch index 351c82daf..8ef517737 100644 --- a/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch +++ b/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch @@ -66,3 +66,11 @@ { this.func_147139_a(this.field_71349_l.field_71474_y.field_74318_M); } +@@ -233,6 +211,7 @@ + + public EnumDifficulty func_147135_j() + { ++ if (this.field_71349_l.field_71441_e == null) return this.field_71349_l.field_71474_y.field_74318_M; // Fix NPE just in case. + return this.field_71349_l.field_71441_e.func_72912_H().func_176130_y(); + } + diff --git a/src/main/java/net/minecraftforge/oredict/OreDictionary.java b/src/main/java/net/minecraftforge/oredict/OreDictionary.java index 54019b2a0..0f9799925 100644 --- a/src/main/java/net/minecraftforge/oredict/OreDictionary.java +++ b/src/main/java/net/minecraftforge/oredict/OreDictionary.java @@ -423,7 +423,6 @@ public class OreDictionary * Raises the registerOre function in all registered handlers. * * @param name The name of the ore - * @param id The ID of the ore * @param ore The ore's ItemStack */ private static void registerOreImpl(String name, ItemStack ore)