mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 12:42:26 +00:00
Update to 1.4.4
This commit is contained in:
1 parent
955683349d
commit
e73cbd088f
35 files changed
+364
-371
No files matched your search
@@ -1,7 +1,7 @@
|
||||
--- ../src_base/common/net/minecraft/src/Entity.java
|
||||
+++ ../src_work/common/net/minecraft/src/Entity.java
|
||||
@@ -5,6 +5,8 @@
|
||||
import java.util.Iterator;
|
||||
@@ -4,6 +4,8 @@
|
||||
import cpw.mods.fml.common.asm.SideOnly;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
+import java.util.UUID;
|
||||
@@ -9,7 +9,7 @@
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
public abstract class Entity
|
||||
@@ -198,6 +200,11 @@
|
||||
@@ -197,6 +199,11 @@
|
||||
protected int field_82152_aq;
|
||||
private boolean field_83001_bt;
|
||||
public EnumEntitySize myEntitySize;
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
public Entity(World par1World)
|
||||
{
|
||||
@@ -1493,6 +1500,15 @@
|
||||
@@ -1489,6 +1496,15 @@
|
||||
par1NBTTagCompound.setInteger("Dimension", this.dimension);
|
||||
par1NBTTagCompound.setBoolean("Invulnerable", this.field_83001_bt);
|
||||
par1NBTTagCompound.setInteger("PortalCooldown", this.timeUntilPortal);
|
||||
@@ -37,7 +37,7 @@
|
||||
this.writeEntityToNBT(par1NBTTagCompound);
|
||||
}
|
||||
catch (Throwable var5)
|
||||
@@ -1547,6 +1563,14 @@
|
||||
@@ -1543,6 +1559,14 @@
|
||||
this.timeUntilPortal = par1NBTTagCompound.getInteger("PortalCooldown");
|
||||
this.setPosition(this.posX, this.posY, this.posZ);
|
||||
this.setRotation(this.rotationYaw, this.rotationPitch);
|
||||
@@ -52,7 +52,7 @@
|
||||
this.readEntityFromNBT(par1NBTTagCompound);
|
||||
}
|
||||
catch (Throwable var5)
|
||||
@@ -1641,7 +1665,14 @@
|
||||
@@ -1637,7 +1661,14 @@
|
||||
{
|
||||
EntityItem var3 = new EntityItem(this.worldObj, this.posX, this.posY + (double)par2, this.posZ, par1ItemStack);
|
||||
var3.delayBeforeCanPickup = 10;
|
||||
@@ -68,7 +68,7 @@
|
||||
return var3;
|
||||
}
|
||||
|
||||
@@ -2001,7 +2032,7 @@
|
||||
@@ -1996,7 +2027,7 @@
|
||||
*/
|
||||
public boolean isRiding()
|
||||
{
|
||||
@@ -77,7 +77,7 @@
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2336,7 +2367,7 @@
|
||||
@@ -2331,7 +2362,7 @@
|
||||
|
||||
public float func_82146_a(Explosion par1Explosion, Block par2Block, int par3, int par4, int par5)
|
||||
{
|
||||
@@ -86,9 +86,9 @@
|
||||
}
|
||||
|
||||
public int func_82143_as()
|
||||
@@ -2366,4 +2397,84 @@
|
||||
par1CrashReportCategory.addCrashSection("Block location", CrashReportCategory.func_85071_a(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ)));
|
||||
par1CrashReportCategory.addCrashSection("Momentum", String.format("%.2f, %.2f, %.2f", new Object[] {Double.valueOf(this.motionX), Double.valueOf(this.motionY), Double.valueOf(this.motionZ)}));
|
||||
@@ -2367,4 +2398,84 @@
|
||||
{
|
||||
return this.isBurning();
|
||||
}
|
||||
+
|
||||
+ /* ================================== Forge Start =====================================*/
|
||||
|
||||
Reference in new issue
Block a user