summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2014-03-24 15:22:15 -0500
committerTravis Watkins <amaranth@ubuntu.com>2014-03-24 15:22:15 -0500
commit4992df25ec8c843c2b139526e43821cae84a555f (patch)
treebff20e2e8f5a48ef2209575895276e27295bb4d4 /src
parentd51463d162659f202aad16c3ba71062c47495243 (diff)
downloadcraftbukkit-4992df25ec8c843c2b139526e43821cae84a555f.tar
craftbukkit-4992df25ec8c843c2b139526e43821cae84a555f.tar.gz
craftbukkit-4992df25ec8c843c2b139526e43821cae84a555f.tar.lz
craftbukkit-4992df25ec8c843c2b139526e43821cae84a555f.tar.xz
craftbukkit-4992df25ec8c843c2b139526e43821cae84a555f.zip
Correct missed diff
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/EntityHuman.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityLiving.java2
-rw-r--r--src/main/java/net/minecraft/server/TileEntityHopper.java2
3 files changed, 3 insertions, 3 deletions
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;
}