1 files changed, 166 insertions, 30 deletions
diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java
index 6cfe0539..70130d7d 100644
--- a/src/main/java/net/minecraft/server/EntitySkeleton.java
+++ b/src/main/java/net/minecraft/server/EntitySkeleton.java
@@ -1,27 +1,31 @@
 package net.minecraft.server;
 
-import org.bukkit.event.entity.EntityCombustEvent; // CraftBukkit
+import java.util.Calendar;
 
-public class EntitySkeleton extends EntityMonster {
+import org.bukkit.event.entity.EntityCombustEvent; // CraftBukkit
 
-    private static final ItemStack d = new ItemStack(Item.BOW, 1);
+public class EntitySkeleton extends EntityMonster implements IRangedEntity {
 
     public EntitySkeleton(World world) {
         super(world);
         this.texture = "/mob/skeleton.png";
-        this.bw = 0.25F;
+        this.bI = 0.25F;
         this.goalSelector.a(1, new PathfinderGoalFloat(this));
         this.goalSelector.a(2, new PathfinderGoalRestrictSun(this));
-        this.goalSelector.a(3, new PathfinderGoalFleeSun(this, this.bw));
-        this.goalSelector.a(4, new PathfinderGoalArrowAttack(this, this.bw, 1, 60));
-        this.goalSelector.a(5, new PathfinderGoalRandomStroll(this, this.bw));
+        this.goalSelector.a(3, new PathfinderGoalFleeSun(this, this.bI));
+        this.goalSelector.a(5, new PathfinderGoalRandomStroll(this, this.bI));
         this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 8.0F));
         this.goalSelector.a(6, new PathfinderGoalRandomLookaround(this));
         this.targetSelector.a(1, new PathfinderGoalHurtByTarget(this, false));
         this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget(this, EntityHuman.class, 16.0F, 0, true));
     }
 
-    public boolean aV() {
+    protected void a() {
+        super.a();
+        this.datawatcher.a(13, new Byte((byte) 0));
+    }
+
+    public boolean bb() {
         return true;
     }
 
@@ -29,28 +33,75 @@ public class EntitySkeleton extends EntityMonster {
         return 20;
     }
 
-    protected String aQ() {
-        return "mob.skeleton";
+    protected String aW() {
+        return "mob.skeleton.say";
+    }
+
+    protected String aX() {
+        return "mob.skeleton.hurt";
+    }
+
+    protected String aY() {
+        return "mob.skeleton.death";
     }
 
-    protected String aR() {
-        return "mob.skeletonhurt";
+    protected void a(int i, int j, int k, int l) {
+        this.world.makeSound(this, "mob.skeleton.step", 0.15F, 1.0F);
     }
 
-    protected String aS() {
-        return "mob.skeletonhurt";
+    public boolean l(Entity entity) {
+        if (super.l(entity)) {
+            if (this.getSkeletonType() == 1 && entity instanceof EntityLiving) {
+                ((EntityLiving) entity).addEffect(new MobEffect(MobEffectList.WITHER.id, 200));
+            }
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public int c(Entity entity) {
+        if (this.getSkeletonType() == 1) {
+            ItemStack itemstack = this.bA();
+            int i = 4;
+
+            if (itemstack != null) {
+                i += itemstack.a((Entity) this);
+            }
+
+            return i;
+        } else {
+            return super.c(entity);
+        }
     }
 
     public EnumMonsterType getMonsterType() {
         return EnumMonsterType.UNDEAD;
     }
 
-    public void d() {
-        if (this.world.s() && !this.world.isStatic) {
+    public void c() {
+        if (this.world.t() && !this.world.isStatic) {
             float f = this.c(1.0F);
 
-            if (f > 0.5F && this.world.j(MathHelper.floor(this.locX), MathHelper.floor(this.locY), MathHelper.floor(this.locZ)) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F) {
-                // CraftBukkit start
+            if (f > 0.5F && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && this.world.j(MathHelper.floor(this.locX), MathHelper.floor(this.locY), MathHelper.floor(this.locZ))) {
+                boolean flag = true;
+                ItemStack itemstack = this.getEquipment(4);
+
+                if (itemstack != null) {
+                    if (itemstack.f()) {
+                        itemstack.setData(itemstack.i() + this.random.nextInt(2));
+                        if (itemstack.i() >= itemstack.k()) {
+                            this.a(itemstack);
+                            this.setEquipment(4, (ItemStack) null);
+                        }
+                    }
+
+                    flag = false;
+                }
+
+                if (flag) {
+                    // CraftBukkit start
                 EntityCombustEvent event = new EntityCombustEvent(this.getBukkitEntity(), 8);
                 this.world.getServer().getPluginManager().callEvent(event);
 
@@ -58,10 +109,11 @@ public class EntitySkeleton extends EntityMonster {
                     this.setOnFire(event.getDuration());
                 }
                 // CraftBukkit end
+                }
             }
         }
 
-        super.d();
+        super.c();
     }
 
     public void die(DamageSource damagesource) {
@@ -84,14 +136,20 @@ public class EntitySkeleton extends EntityMonster {
     protected void dropDeathLoot(boolean flag, int i) {
         // CraftBukkit start - whole method
         java.util.List<org.bukkit.inventory.ItemStack> loot = new java.util.ArrayList<org.bukkit.inventory.ItemStack>();
-        int j = this.random.nextInt(3 + i);
 
-        int count = this.random.nextInt(3 + i);
-        if (count > 0) {
-            loot.add(new org.bukkit.inventory.ItemStack(org.bukkit.Material.ARROW, count));
+        if (this.getSkeletonType() == 1) {
+            int count = this.random.nextInt(3 + i) - 1;
+            if (count > 0) {
+                loot.add(new org.bukkit.inventory.ItemStack(org.bukkit.Material.COAL, count));
+            }
+        } else {
+            int count = this.random.nextInt(3 + i);
+            if (count > 0) {
+                loot.add(new org.bukkit.inventory.ItemStack(org.bukkit.Material.ARROW, count));
+            }
         }
 
-        count = this.random.nextInt(3 + i);
+        int count = this.random.nextInt(3 + i);
         if (count > 0) {
             loot.add(new org.bukkit.inventory.ItemStack(org.bukkit.Material.BONE, count));
         }
@@ -112,16 +170,94 @@ public class EntitySkeleton extends EntityMonster {
         // CraftBukkit end
     }
 
-    // CraftBukkit start - return rare dropped item instead of dropping it
+    // CraftBukkit - return rare dropped item instead of dropping it
     protected ItemStack l(int i) {
+        if (this.getSkeletonType() == 1) {
+            return new ItemStack(Item.SKULL.id, 1, 1); // CraftBukkit
+        }
+
+        return null;
+    }
+
+    protected void bB() {
+        super.bB();
+        this.setEquipment(0, new ItemStack(Item.BOW));
+    }
+
+    public void bD() {
+        if (this.world.worldProvider instanceof WorldProviderHell && this.aA().nextInt(5) > 0) {
+            this.goalSelector.a(4, new PathfinderGoalMeleeAttack(this, EntityHuman.class, this.bI, false));
+            this.setSkeletonType(1);
+            this.setEquipment(0, new ItemStack(Item.STONE_SWORD));
+        } else {
+            this.goalSelector.a(4, new PathfinderGoalArrowAttack(this, this.bI, 60, 10.0F));
+            this.bB();
+            this.bC();
+        }
+
+        this.canPickUpLoot = this.random.nextFloat() < as[this.world.difficulty];
+        if (this.getEquipment(4) == null) {
+            Calendar calendar = this.world.S();
+
+            if (calendar.get(2) + 1 == 10 && calendar.get(5) == 31 && this.random.nextFloat() < 0.25F) {
+                this.setEquipment(4, new ItemStack(this.random.nextFloat() < 0.1F ? Block.JACK_O_LANTERN : Block.PUMPKIN));
+                this.dropChances[4] = 0.0F;
+            }
+        }
+    }
+
+    public void d(EntityLiving entityliving) {
+        EntityArrow entityarrow = new EntityArrow(this.world, this, entityliving, 1.6F, 12.0F);
+        int i = EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_DAMAGE.id, this.bA());
+        int j = EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_KNOCKBACK.id, this.bA());
+
         if (i > 0) {
-            ItemStack itemstack = new ItemStack(Item.BOW);
+            entityarrow.b(entityarrow.c() + (double) i * 0.5D + 0.5D);
+        }
+
+        if (j > 0) {
+            entityarrow.a(j);
+        }
+
+        if (EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_FIRE.id, this.bA()) > 0 || this.getSkeletonType() == 1) {
+            entityarrow.setOnFire(100);
+        }
+
+        this.world.makeSound(this, "random.bow", 1.0F, 1.0F / (this.aA().nextFloat() * 0.4F + 0.8F));
+        this.world.addEntity(entityarrow);
+    }
+
+    public int getSkeletonType() {
+        return this.datawatcher.getByte(13);
+    }
+
+    public void setSkeletonType(int i) {
+        this.datawatcher.watch(13, Byte.valueOf((byte) i));
+        this.fireProof = i == 1;
+        if (i == 1) {
+            this.a(0.72F, 2.16F);
+        } else {
+            this.a(0.6F, 1.8F);
+        }
+    }
+
+    public void a(NBTTagCompound nbttagcompound) {
+        super.a(nbttagcompound);
+        if (nbttagcompound.hasKey("SkeletonType")) {
+            byte b0 = nbttagcompound.getByte("SkeletonType");
 
-            EnchantmentManager.a(this.random, itemstack, 5);
-            return itemstack;
+            this.setSkeletonType(b0);
+        }
+
+        if (this.getSkeletonType() == 1) {
+            this.goalSelector.a(4, new PathfinderGoalMeleeAttack(this, EntityHuman.class, this.bI, false));
         } else {
-            return new ItemStack(Item.BOW.id, 1, 0);
+            this.goalSelector.a(4, new PathfinderGoalArrowAttack(this, this.bI, 60, 10.0F));
         }
     }
-    // CraftBukkit end
+
+    public void b(NBTTagCompound nbttagcompound) {
+        super.b(nbttagcompound);
+        nbttagcompound.setByte("SkeletonType", (byte) this.getSkeletonType());
+    }
 }