From cd4e73edfaccd1ea1657d572b0dce096c9e9a471 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Thu, 18 Dec 2014 08:10:38 -0800 Subject: [PATCH] Remove our changes to Stitcher slot allocation. --- .../renderer/texture/Stitcher.java.patch | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch deleted file mode 100644 index ccd683730c..0000000000 --- a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/renderer/texture/Stitcher.java -+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/Stitcher.java -@@ -161,7 +161,7 @@ - - if (flag4 ^ flag5) - { -- flag1 = !flag4; -+ flag1 = flag4; //Forge: Bug fix: Fixed inverted logic. flag1 = addNewColumn, flag4 = expandWidth - } - else - { -@@ -183,7 +183,7 @@ - - j = Math.max(p_94311_1_.func_94197_a(), p_94311_1_.func_94199_b()); - -- if (MathHelper.func_151236_b((flag1 ? this.field_94315_d : this.field_94318_c) + j) > (flag1 ? this.field_94313_f : this.field_94316_e)) -+ if (MathHelper.func_151236_b((!flag1 ? this.field_94315_d : this.field_94318_c) + j) > (!flag1 ? this.field_94313_f : this.field_94316_e)) //Forge: Width and height were swapped. - { - return false; - }