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

Fix accedential reverted patch.

This commit is contained in:
LexManos 2013-07-08 18:35:34 -07:00
parent 38bd039a93
commit 34bcca2640
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
View File

@ -22,7 +22,19 @@
Iterator iterator = this.field_110574_e.entrySet().iterator(); Iterator iterator = this.field_110574_e.entrySet().iterator();
while (iterator.hasNext()) while (iterator.hasNext())
@@ -142,6 +146,7 @@ @@ -73,7 +77,10 @@
try
{
- textureatlassprite.func_130100_a(par1ResourceManager.func_110536_a(resourcelocation1));
+ if (!textureatlassprite.load(par1ResourceManager, resourcelocation1))
+ {
+ continue;
+ }
}
catch (RuntimeException runtimeexception)
{
@@ -142,6 +149,7 @@
textureatlassprite1 = (TextureAtlasSprite)iterator1.next(); textureatlassprite1 = (TextureAtlasSprite)iterator1.next();
textureatlassprite1.copyFrom(this.missingImage); textureatlassprite1.copyFrom(this.missingImage);
} }
@ -30,7 +42,7 @@
} }
private void func_110573_f() private void func_110573_f()
@@ -212,6 +217,7 @@ @@ -212,6 +220,7 @@
if (par1Str == null) if (par1Str == null)
{ {
(new RuntimeException("Don\'t register null!")).printStackTrace(); (new RuntimeException("Don\'t register null!")).printStackTrace();
@ -38,7 +50,7 @@
} }
Object object = (TextureAtlasSprite)this.field_110574_e.get(par1Str); Object object = (TextureAtlasSprite)this.field_110574_e.get(par1Str);
@@ -253,4 +259,37 @@ @@ -253,4 +262,37 @@
{ {
this.updateAnimations(); this.updateAnimations();
} }