Update CraftBukkit to 1.6.1

1 files changed, 11 insertions, 11 deletions

diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index f46c9209..affeca6e 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -12,14 +12,14 @@ public class EntityArrow extends Entity implements IProjectile {
     private int d = -1;
     private int e = -1;
     private int f = -1;
-    private int g = 0;
-    private int h = 0;
-    private boolean inGround = false;
-    public int fromPlayer = 0;
-    public int shake = 0;
+    private int g;
+    private int h;
+    private boolean inGround;
+    public int fromPlayer;
+    public int shake;
     public Entity shooter;
     private int j;
-    private int au = 0;
+    private int au;
     private double damage = 2.0D;
     private int aw;
 
@@ -237,12 +237,12 @@ public class EntityArrow extends Entity implements IProjectile {
                         // CraftBukkit end
                     }
 
-                    // if (movingobjectposition.entity.damageEntity(damagesource, i1)) { // CraftBukkit - moved up
+                    // if (movingobjectposition.entity.damageEntity(damagesource, (float) i1)) { // CraftBukkit - moved up
                         if (movingobjectposition.entity instanceof EntityLiving) {
                             EntityLiving entityliving = (EntityLiving) movingobjectposition.entity;
 
                             if (!this.world.isStatic) {
-                                entityliving.r(entityliving.bM() + 1);
+                                entityliving.m(entityliving.aQ() + 1);
                             }
 
                             if (this.aw > 0) {
@@ -386,7 +386,7 @@ public class EntityArrow extends Entity implements IProjectile {
                 EntityItem item = new EntityItem(this.world, this.locX, this.locY, this.locZ, itemstack);
 
                 PlayerPickupItemEvent event = new PlayerPickupItemEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), new org.bukkit.craftbukkit.entity.CraftItem(this.world.getServer(), this, item), 0);
-                event.setCancelled(!entityhuman.canPickUpLoot);
+                // event.setCancelled(!entityhuman.canPickUpLoot); TODO
                 this.world.getServer().getPluginManager().callEvent(event);
 
                 if (event.isCancelled()) {
@@ -409,7 +409,7 @@ public class EntityArrow extends Entity implements IProjectile {
         }
     }
 
-    protected boolean f_() {
+    protected boolean e_() {
         return false;
     }
 
@@ -425,7 +425,7 @@ public class EntityArrow extends Entity implements IProjectile {
         this.aw = i;
     }
 
-    public boolean ap() {
+    public boolean ao() {
         return false;
     }