Update CraftBukkit to Minecraft 1.7.5

1 files changed, 29 insertions, 29 deletions

diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java
index da5fd8f9..cb25df17 100644
--- a/src/main/java/net/minecraft/server/EntitySkeleton.java
+++ b/src/main/java/net/minecraft/server/EntitySkeleton.java
@@ -20,12 +20,12 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         this.targetSelector.a(1, new PathfinderGoalHurtByTarget(this, false));
         this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget(this, EntityHuman.class, 0, true));
         if (world != null && !world.isStatic) {
-            this.bX();
+            this.bZ();
         }
     }
 
-    protected void aD() {
-        super.aD();
+    protected void aC() {
+        super.aC();
         this.getAttributeInstance(GenericAttributes.d).setValue(0.25D);
     }
 
@@ -34,7 +34,7 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         this.datawatcher.a(13, new Byte((byte) 0));
     }
 
-    public boolean bk() {
+    public boolean bj() {
         return true;
     }
 
@@ -42,11 +42,11 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         return "mob.skeleton.say";
     }
 
-    protected String aT() {
+    protected String aS() {
         return "mob.skeleton.hurt";
     }
 
-    protected String aU() {
+    protected String aT() {
         return "mob.skeleton.death";
     }
 
@@ -54,8 +54,8 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         this.makeSound("mob.skeleton.step", 0.15F, 1.0F);
     }
 
-    public boolean m(Entity entity) {
-        if (super.m(entity)) {
+    public boolean n(Entity entity) {
+        if (super.n(entity)) {
             if (this.getSkeletonType() == 1 && entity instanceof EntityLiving) {
                 ((EntityLiving) entity).addEffect(new MobEffect(MobEffectList.WITHER.id, 200));
             }
@@ -71,7 +71,7 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
     }
 
     public void e() {
-        if (this.world.v() && !this.world.isStatic) {
+        if (this.world.w() && !this.world.isStatic) {
             float f = this.d(1.0F);
 
             if (f > 0.5F && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && this.world.i(MathHelper.floor(this.locX), MathHelper.floor(this.locY), MathHelper.floor(this.locZ))) {
@@ -110,12 +110,12 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         super.e();
     }
 
-    public void ab() {
-        super.ab();
+    public void aa() {
+        super.aa();
         if (this.vehicle instanceof EntityCreature) {
             EntityCreature entitycreature = (EntityCreature) this.vehicle;
 
-            this.aN = entitycreature.aN;
+            this.aM = entitycreature.aM;
         }
     }
 
@@ -182,22 +182,22 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         return null; // CraftBukkit
     }
 
-    protected void bA() {
-        super.bA();
+    protected void bC() {
+        super.bC();
         this.setEquipment(0, new ItemStack(Items.BOW));
     }
 
     public GroupDataEntity a(GroupDataEntity groupdataentity) {
         groupdataentity = super.a(groupdataentity);
-        if (this.world.worldProvider instanceof WorldProviderHell && this.aI().nextInt(5) > 0) {
+        if (this.world.worldProvider instanceof WorldProviderHell && this.aH().nextInt(5) > 0) {
             this.goalSelector.a(4, this.bq);
             this.setSkeletonType(1);
             this.setEquipment(0, new ItemStack(Items.STONE_SWORD));
             this.getAttributeInstance(GenericAttributes.e).setValue(4.0D);
         } else {
             this.goalSelector.a(4, this.bp);
-            this.bA();
-            this.bB();
+            this.bC();
+            this.bD();
         }
 
         this.h(this.random.nextFloat() < 0.55F * this.world.b(this.locX, this.locY, this.locZ));
@@ -213,10 +213,10 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         return groupdataentity;
     }
 
-    public void bX() {
+    public void bZ() {
         this.goalSelector.a((PathfinderGoal) this.bq);
         this.goalSelector.a((PathfinderGoal) this.bp);
-        ItemStack itemstack = this.be();
+        ItemStack itemstack = this.bd();
 
         if (itemstack != null && itemstack.getItem() == Items.BOW) {
             this.goalSelector.a(4, this.bp);
@@ -227,8 +227,8 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
 
     public void a(EntityLiving entityliving, float f) {
         EntityArrow entityarrow = new EntityArrow(this.world, this, entityliving, 1.6F, (float) (14 - this.world.difficulty.a() * 4));
-        int i = EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_DAMAGE.id, this.be());
-        int j = EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_KNOCKBACK.id, this.be());
+        int i = EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_DAMAGE.id, this.bd());
+        int j = EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_KNOCKBACK.id, this.bd());
 
         entityarrow.b((double) (f * 2.0F) + this.random.nextGaussian() * 0.25D + (double) ((float) this.world.difficulty.a() * 0.11F));
         if (i > 0) {
@@ -236,15 +236,15 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         }
 
         if (j > 0) {
-            entityarrow.a(j);
+            entityarrow.setKnockbackStrength(j);
         }
 
-        if (EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_FIRE.id, this.be()) > 0 || this.getSkeletonType() == 1) {
+        if (EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_FIRE.id, this.bd()) > 0 || this.getSkeletonType() == 1) {
             entityarrow.setOnFire(100);
         }
 
         // CraftBukkit start
-        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.be(), entityarrow, 0.8F);
+        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.bd(), entityarrow, 0.8F);
         if (event.isCancelled()) {
             event.getProjectile().remove();
             return;
@@ -255,7 +255,7 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         }
         // CraftBukkit end
 
-        this.makeSound("random.bow", 1.0F, 1.0F / (this.aI().nextFloat() * 0.4F + 0.8F));
+        this.makeSound("random.bow", 1.0F, 1.0F / (this.aH().nextFloat() * 0.4F + 0.8F));
         // this.world.addEntity(entityarrow); // CraftBukkit - moved up
     }
 
@@ -281,7 +281,7 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
             this.setSkeletonType(b0);
         }
 
-        this.bX();
+        this.bZ();
     }
 
     public void b(NBTTagCompound nbttagcompound) {
@@ -292,11 +292,11 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
     public void setEquipment(int i, ItemStack itemstack) {
         super.setEquipment(i, itemstack);
         if (!this.world.isStatic && i == 0) {
-            this.bX();
+            this.bZ();
         }
     }
 
-    public double ad() {
-        return super.ad() - 0.5D;
+    public double ac() {
+        return super.ac() - 0.5D;
     }
 }