keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Remove our changes to Stitcher slot allocation.

Browse source
This commit is contained in:
Lex Manos 2014-12-13 18:07:31 -08:00
parent fd859812eb
commit 9d95952dc1
1 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch
View file

@ -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;
}