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());
     }
 }