mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-13 00:37:52 +00:00
Fix accedential reverted patch.
This commit is contained in:
1 parent
38bd039a93
commit
34bcca2640
1 file changed
+15
-3
@@ -22,7 +22,19 @@
|
||||
Iterator iterator = this.field_110574_e.entrySet().iterator();
|
||||
|
||||
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.copyFrom(this.missingImage);
|
||||
}
|
||||
@@ -30,7 +42,7 @@
|
||||
}
|
||||
|
||||
private void func_110573_f()
|
||||
@@ -212,6 +217,7 @@
|
||||
@@ -212,6 +220,7 @@
|
||||
if (par1Str == null)
|
||||
{
|
||||
(new RuntimeException("Don\'t register null!")).printStackTrace();
|
||||
@@ -38,7 +50,7 @@
|
||||
}
|
||||
|
||||
Object object = (TextureAtlasSprite)this.field_110574_e.get(par1Str);
|
||||
@@ -253,4 +259,37 @@
|
||||
@@ -253,4 +262,37 @@
|
||||
{
|
||||
this.updateAnimations();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user