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

Fix an NPE in TileEntity trying to generate a crash report. Make suspicious classes just return the obvious. 

Fix NPE for FML crash report on server. Clean up dead patches.
This commit is contained in:
Christian 2012-11-16 22:39:47 -05:00
parent 1c9b59b405
commit e8c5b0791f
6 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fml/client/cpw/mods/fml/client/FMLClientHandler.java
View File

@ -37,6 +37,7 @@ import net.minecraft.src.World;
import net.minecraft.src.WorldClient;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import cpw.mods.fml.client.modloader.ModLoaderClientHelper;
@ -289,7 +290,7 @@ public class FMLClientHandler implements IFMLSidedHandler
{
return Arrays.asList(String.format("Optifine %s",optifineContainer.getVersion()));
} else {
return Collections.emptyList();
return ImmutableList.<String>of();
}
}

4
fml/common/cpw/mods/fml/server/FMLServerHandler.java
View File

@ -14,6 +14,8 @@ package cpw.mods.fml.server;
import java.util.List;
import com.google.common.collect.ImmutableList;
import net.minecraft.server.MinecraftServer;
import net.minecraft.src.Entity;
import net.minecraft.src.NetClientHandler;
@ -117,7 +119,7 @@ public class FMLServerHandler implements IFMLSidedHandler
@Override
public List<String> getAdditionalBrandingInformation()
{
return null;
return ImmutableList.<String>of();
}
/* (non-Javadoc)

11
fml/patches/common/net/minecraft/src/BlockDispenser.java.patch
View File

@ -1,11 +0,0 @@
--- ../src-base/common/net/minecraft/src/BlockDispenser.java
+++ ../src-work/common/net/minecraft/src/BlockDispenser.java
@@ -2,6 +2,8 @@
import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly;
+import cpw.mods.fml.common.registry.GameRegistry;
+
import java.util.Random;
public class BlockDispenser extends BlockContainer

10
fml/patches/common/net/minecraft/src/CallableSuspiciousClasses.java.patch Normal file
View File

@ -0,0 +1,10 @@
--- ../src-base/common/net/minecraft/src/CallableSuspiciousClasses.java
+++ ../src-work/common/net/minecraft/src/CallableSuspiciousClasses.java
@@ -130,6 +130,6 @@
public Object call()
{
- return this.func_85085_a();
+ return "FML is installed";
}
}

9
fml/patches/common/net/minecraft/src/EntityAIVillagerMate.java.patch
View File

@ -1,9 +0,0 @@
--- ../src-base/common/net/minecraft/src/EntityAIVillagerMate.java
+++ ../src-work/common/net/minecraft/src/EntityAIVillagerMate.java
@@ -1,4 +1,6 @@
package net.minecraft.src;
+
+import cpw.mods.fml.common.registry.VillagerRegistry;
public class EntityAIVillagerMate extends EntityAIBase
{

9
fml/patches/common/net/minecraft/src/TileEntity.java.patch
View File

@ -44,3 +44,12 @@
}
else
{
@@ -177,7 +189,7 @@
public void func_85027_a(CrashReportCategory p_85027_1_)
{
p_85027_1_.func_71500_a("Name", new CallableTileEntityName(this));
- CrashReportCategory.func_85068_a(p_85027_1_, this.field_70329_l, this.field_70330_m, this.field_70327_n, this.field_70324_q.field_71990_ca, this.field_70325_p);
+ CrashReportCategory.func_85068_a(p_85027_1_, this.field_70329_l, this.field_70330_m, this.field_70327_n, this.field_70324_q != null ? this.field_70324_q.field_71990_ca : 0, this.field_70325_p);
}
static Map func_85028_t()