Remove EntityFX patch - moved to FML. Patch SuspiciousClasses to add "forge"

Update FML: fa56701
fa56701 Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit.
96935bb 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 pa
This commit is contained in:
Christian 2012-11-16 23:06:37 -05:00
parent f13200e16a
commit ba65c08f19
3 changed files with 10 additions and 15 deletions

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 "FML is installed";
+ return "FML and Forge are installed";
}
}

View file

@ -1,15 +0,0 @@
--- ../src_base/minecraft/net/minecraft/src/EntityFX.java
+++ ../src_work/minecraft/net/minecraft/src/EntityFX.java
@@ -37,9 +37,9 @@
this.setSize(0.2F, 0.2F);
this.yOffset = this.height / 2.0F;
this.setPosition(par2, par4, par6);
- this.lastTickPosX = par2;
- this.lastTickPosY = par4;
- this.lastTickPosZ = par6;
+ this.prevPosX = par2;
+ this.prevPosY = par4;
+ this.prevPosZ = par6;
this.particleRed = this.particleGreen = this.particleBlue = 1.0F;
this.motionX = par8 + (double)((float)(Math.random() * 2.0D - 1.0D) * 0.4F);
this.motionY = par10 + (double)((float)(Math.random() * 2.0D - 1.0D) * 0.4F);