From 4992df25ec8c843c2b139526e43821cae84a555f Mon Sep 17 00:00:00 2001 From: Travis Watkins Date: Mon, 24 Mar 2014 15:22:15 -0500 Subject: Correct missed diff --- src/main/java/net/minecraft/server/EntityHuman.java | 2 +- src/main/java/net/minecraft/server/EntityLiving.java | 2 +- src/main/java/net/minecraft/server/TileEntityHopper.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/net') diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index 81cd30d3..58b7b964 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -328,7 +328,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen // First statement moved down, second statement handled in parent method. /* if (!this.world.isStatic) { - this.l(this.vehicle); + this.m(this.vehicle); } if (this.vehicle != null) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index af5deb93..f90e2a31 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1407,7 +1407,7 @@ public abstract class EntityLiving extends Entity { double d3 = MathHelper.g(this.bk - (double) this.yaw); this.yaw = (float) ((double) this.yaw + d3 / (double) this.bg); - this.pitch = (float) ((double) this.pitch + (this.bm - (double) this.pitch) / (double) this.bg); + this.pitch = (float) ((double) this.pitch + (this.bl - (double) this.pitch) / (double) this.bg); --this.bg; this.setPosition(d0, d1, d2); this.b(this.yaw, this.pitch); diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java index 563d9c80..3f1a910e 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -259,7 +259,7 @@ public class TileEntityHopper extends TileEntity implements IHopper { InventoryMoveItemEvent event = new InventoryMoveItemEvent(this.getOwner().getInventory(), oitemstack.clone(), destinationInventory, true); this.getWorld().getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { - this.setItem(i, itemstack); + this.setItem(j, itemstack); this.c(8); // Delay hopper checks return false; } -- cgit v1.2.3