diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 01:23:52 +0100 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 01:23:52 +0100 |
commit | 5b2c774edc069f70d1fa9940d96bb0b8705bef7a (patch) | |
tree | 79d1800e7154bba7b5fca4f8c8373ee4376cca89 /src/main/java/net/minecraft/server/EntitySheep.java | |
parent | 54bcd1c1f36691a714234e5ca2f30a20b3ad2816 (diff) | |
download | craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.gz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.lz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.xz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.zip |
Update for Minecraft 1.8
Diffstat (limited to 'src/main/java/net/minecraft/server/EntitySheep.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntitySheep.java | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java index cb2e3f16..f619288e 100644 --- a/src/main/java/net/minecraft/server/EntitySheep.java +++ b/src/main/java/net/minecraft/server/EntitySheep.java @@ -17,11 +17,7 @@ public class EntitySheep extends EntityAnimal { this.datawatcher.a(16, new Byte((byte) 0)); } - public boolean damageEntity(Entity entity, int i) { - return super.damageEntity(entity, i); - } - - protected void q() { + protected void a(boolean flag) { // CraftBukkit start - whole method java.util.List<org.bukkit.inventory.ItemStack> loot = new java.util.ArrayList<org.bukkit.inventory.ItemStack>(); @@ -41,11 +37,11 @@ public class EntitySheep extends EntityAnimal { // CraftBukkit end } - protected int j() { + protected int k() { return Block.WOOL.id; } - public boolean a(EntityHuman entityhuman) { + public boolean b(EntityHuman entityhuman) { ItemStack itemstack = entityhuman.inventory.getItemInHand(); if (itemstack != null && itemstack.id == Item.SHEARS.id && !this.isSheared()) { @@ -80,15 +76,15 @@ public class EntitySheep extends EntityAnimal { this.setColor(nbttagcompound.c("Color")); } - protected String g() { + protected String h() { return "mob.sheep"; } - protected String h() { + protected String i() { return "mob.sheep"; } - protected String i() { + protected String j() { return "mob.sheep"; } |