From eefbcaaffc995a74f60783330200a49d3f37371c Mon Sep 17 00:00:00 2001 From: LexManos Date: Sat, 25 Jun 2016 01:17:31 -0700 Subject: [PATCH] Fixed shifted patch in GameSettings causing settings to not load properly. Closes #3025 #3022 --- .../client/settings/GameSettings.java.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch b/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch index 7fff84eb41..143437619b 100644 --- a/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch +++ b/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch @@ -16,15 +16,7 @@ this.field_74324_K = (KeyBinding[])ArrayUtils.addAll(new KeyBinding[] {this.field_74312_F, this.field_74313_G, this.field_74351_w, this.field_74370_x, this.field_74368_y, this.field_74366_z, this.field_74314_A, this.field_74311_E, this.field_151444_V, this.field_74316_C, this.field_151445_Q, this.field_74310_D, this.field_74321_H, this.field_74322_I, this.field_74323_J, this.field_151447_Z, this.field_151457_aa, this.field_151458_ab, this.field_152395_am, this.field_178883_an, this.field_186718_X}, this.field_151456_ac); this.field_74318_M = EnumDifficulty.NORMAL; this.field_74332_R = ""; -@@ -547,6 +549,7 @@ - - public void func_74300_a() - { -+ if (net.minecraftforge.fml.client.FMLClientHandler.instance().isLoading()) return; - try - { - if (!this.field_74354_ai.exists()) -@@ -886,6 +889,11 @@ +@@ -886,6 +888,11 @@ { if (s1.equals("key_" + keybinding.func_151464_g())) { @@ -36,6 +28,14 @@ keybinding.func_151462_b(Integer.parseInt(s2)); } } +@@ -943,6 +950,7 @@ + + public void func_74303_b() + { ++ if (net.minecraftforge.fml.client.FMLClientHandler.instance().isLoading()) return; + PrintWriter printwriter = null; + + try @@ -1016,7 +1024,8 @@ for (KeyBinding keybinding : this.field_74324_K)