diff options
author | Wesley Wolfe <weswolf@aol.com> | 2013-01-05 16:45:34 -0600 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2013-01-05 17:15:49 -0600 |
commit | 182681e384a1f7e4b6944ad5c6eda0710fb1bff9 (patch) | |
tree | 80b9d164aa713bf0215f8123cb18055be7a7ebb5 /src/main | |
parent | baaf8e1d864da19e374211b4c2dd1aa49d564561 (diff) | |
download | craftbukkit-182681e384a1f7e4b6944ad5c6eda0710fb1bff9.tar craftbukkit-182681e384a1f7e4b6944ad5c6eda0710fb1bff9.tar.gz craftbukkit-182681e384a1f7e4b6944ad5c6eda0710fb1bff9.tar.lz craftbukkit-182681e384a1f7e4b6944ad5c6eda0710fb1bff9.tar.xz craftbukkit-182681e384a1f7e4b6944ad5c6eda0710fb1bff9.zip |
Update calls to DyeColor getData and getByData. Addresses BUKKIT-2786
These two methods are now deprecated and replaced by the strictly
equivalent calls using wool data.
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/net/minecraft/server/ItemDye.java | 2 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java | 4 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/ItemDye.java b/src/main/java/net/minecraft/server/ItemDye.java index 75cbf7de..b93421af 100644 --- a/src/main/java/net/minecraft/server/ItemDye.java +++ b/src/main/java/net/minecraft/server/ItemDye.java @@ -188,7 +188,7 @@ public class ItemDye extends Item { return false; } - i = (byte) event.getColor().getData(); + i = (byte) event.getColor().getWoolData(); // CraftBukkit end entitysheep.setColor(i); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java index 46f8ef0a..81b938a2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java @@ -13,11 +13,11 @@ public class CraftSheep extends CraftAnimals implements Sheep { } public DyeColor getColor() { - return DyeColor.getByData((byte) getHandle().getColor()); + return DyeColor.getByWoolData((byte) getHandle().getColor()); } public void setColor(DyeColor color) { - getHandle().setColor(color.getData()); + getHandle().setColor(color.getWoolData()); } public boolean isSheared() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java index e266c98a..3d0e7cb5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java @@ -30,10 +30,10 @@ public class CraftWolf extends CraftTameableAnimal implements Wolf { } public DyeColor getCollarColor() { - return DyeColor.getByData((byte) getHandle().getCollarColor()); + return DyeColor.getByWoolData((byte) getHandle().getCollarColor()); } public void setCollarColor(DyeColor color) { - getHandle().setCollarColor(color.getData()); + getHandle().setCollarColor(color.getWoolData()); } } |