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

Added rider sit pull request.

This commit is contained in:
LexManos 2012-03-25 23:28:32 -07:00
parent 06eb9de126
commit 9153ded16f
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
forge/patches/minecraft/net/minecraft/src/Entity.java.patch
View File

@ -10,7 +10,7 @@
public Entity(World par1World) public Entity(World par1World)
{ {
@@ -214,6 +217,20 @@ @@ -214,6 +217,29 @@
} }
protected abstract void entityInit(); protected abstract void entityInit();
@ -27,11 +27,20 @@
+ customEntityData = new NBTTagCompound(); + customEntityData = new NBTTagCompound();
+ } + }
+ return customEntityData; + return customEntityData;
+ }
+
+ /**
+ * Used in model rendering to determine if the entity riding this entity should be in the 'sitting' position.
+ * @return false to prevent an entity that is mounted to this entity from displaying the 'sitting' animation.
+ */
+ public boolean shouldRiderSit()
+ {
+ return true;
+ } + }
public DataWatcher getDataWatcher() public DataWatcher getDataWatcher()
{ {
@@ -1286,6 +1303,10 @@ @@ -1286,6 +1312,10 @@
par1NBTTagCompound.setShort("Fire", (short)this.fire); par1NBTTagCompound.setShort("Fire", (short)this.fire);
par1NBTTagCompound.setShort("Air", (short)this.getAir()); par1NBTTagCompound.setShort("Air", (short)this.getAir());
par1NBTTagCompound.setBoolean("OnGround", this.onGround); par1NBTTagCompound.setBoolean("OnGround", this.onGround);
@ -42,7 +51,7 @@
this.writeEntityToNBT(par1NBTTagCompound); this.writeEntityToNBT(par1NBTTagCompound);
} }
@@ -1327,6 +1348,10 @@ @@ -1327,6 +1357,10 @@
this.onGround = par1NBTTagCompound.getBoolean("OnGround"); this.onGround = par1NBTTagCompound.getBoolean("OnGround");
this.setPosition(this.posX, this.posY, this.posZ); this.setPosition(this.posX, this.posY, this.posZ);
this.setRotation(this.rotationYaw, this.rotationPitch); this.setRotation(this.rotationYaw, this.rotationPitch);
@ -53,3 +62,12 @@
this.readEntityFromNBT(par1NBTTagCompound); this.readEntityFromNBT(par1NBTTagCompound);
} }
@@ -1685,7 +1719,7 @@
*/
public boolean isRiding()
{
- return this.ridingEntity != null || this.getFlag(2);
+ return (this.ridingEntity != null && ridingEntity.shouldRiderSit()) || this.getFlag(2);
}
/**

15
forge/patches/minecraft_server/net/minecraft/src/Entity.java.patch
View File

@ -10,7 +10,7 @@
public Entity(World par1World) public Entity(World par1World)
{ {
this.entityId = nextEntityID++; this.entityId = nextEntityID++;
@@ -206,6 +209,20 @@ @@ -206,6 +209,29 @@
protected abstract void entityInit(); protected abstract void entityInit();
@ -27,11 +27,20 @@
+ } + }
+ return customEntityData; + return customEntityData;
+ } + }
+
+ /**
+ * Used in model rendering to determine if the entity riding this entity should be in the 'sitting' position.
+ * @return false to prevent an entity that is mounted to this entity from displaying the 'sitting' animation.
+ */
+ public boolean shouldRiderSit()
+ {
+ return true;
+ }
+ +
public DataWatcher getDataWatcher() public DataWatcher getDataWatcher()
{ {
return this.dataWatcher; return this.dataWatcher;
@@ -1183,6 +1200,10 @@ @@ -1183,6 +1209,10 @@
par1NBTTagCompound.setShort("Fire", (short)this.fire); par1NBTTagCompound.setShort("Fire", (short)this.fire);
par1NBTTagCompound.setShort("Air", (short)this.getAir()); par1NBTTagCompound.setShort("Air", (short)this.getAir());
par1NBTTagCompound.setBoolean("OnGround", this.onGround); par1NBTTagCompound.setBoolean("OnGround", this.onGround);
@ -42,7 +51,7 @@
this.writeEntityToNBT(par1NBTTagCompound); this.writeEntityToNBT(par1NBTTagCompound);
} }
@@ -1224,6 +1245,10 @@ @@ -1224,6 +1254,10 @@
this.onGround = par1NBTTagCompound.getBoolean("OnGround"); this.onGround = par1NBTTagCompound.getBoolean("OnGround");
this.setPosition(this.posX, this.posY, this.posZ); this.setPosition(this.posX, this.posY, this.posZ);
this.setRotation(this.rotationYaw, this.rotationPitch); this.setRotation(this.rotationYaw, this.rotationPitch);