summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortonibm19 <tonibm19@gmail.com>2013-11-10 16:42:38 +0100
committertonibm19 <tonibm19@gmail.com>2013-11-10 16:42:38 +0100
commit9da4011a7fc0f98efb2f1a9d8ad5af6e7bb0a5a9 (patch)
tree13f905a2ab333d05e5a40872338ce6c9cff375ea
parentAdded sheep dyeing (diff)
downloadcuberite-9da4011a7fc0f98efb2f1a9d8ad5af6e7bb0a5a9.tar
cuberite-9da4011a7fc0f98efb2f1a9d8ad5af6e7bb0a5a9.tar.gz
cuberite-9da4011a7fc0f98efb2f1a9d8ad5af6e7bb0a5a9.tar.bz2
cuberite-9da4011a7fc0f98efb2f1a9d8ad5af6e7bb0a5a9.tar.lz
cuberite-9da4011a7fc0f98efb2f1a9d8ad5af6e7bb0a5a9.tar.xz
cuberite-9da4011a7fc0f98efb2f1a9d8ad5af6e7bb0a5a9.tar.zst
cuberite-9da4011a7fc0f98efb2f1a9d8ad5af6e7bb0a5a9.zip
-rw-r--r--source/Mobs/Sheep.cpp319
1 files changed, 161 insertions, 158 deletions
diff --git a/source/Mobs/Sheep.cpp b/source/Mobs/Sheep.cpp
index 85081b294..f9fc5a60c 100644
--- a/source/Mobs/Sheep.cpp
+++ b/source/Mobs/Sheep.cpp
@@ -50,164 +50,167 @@ void cSheep::OnRightClicked(cPlayer & a_Player)
Drops.push_back(cItem(E_BLOCK_WOOL, NumDrops, m_WoolColor));
m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10);
}
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_BLACK)
- {
- m_WoolColor = 15;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
- }
- }
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_RED)
- {
- m_WoolColor = 14;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
- }
- }
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_GREEN)
- {
- m_WoolColor = 13;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
- }
- }
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_BROWN)
- {
- m_WoolColor = 12;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
- }
- }
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_BLUE)
- {
- m_WoolColor = 11;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
- }
- }
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_PURPLE)
- {
- m_WoolColor = 10;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
- }
- }
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_CYAN)
- {
- m_WoolColor = 9;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
- }
- }
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_LIGHTGRAY)
- {
- m_WoolColor = 8;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
- }
- }
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_GRAY)
- {
- m_WoolColor = 7;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
- }
- }
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_PINK)
- {
- m_WoolColor = 6;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
- }
- }
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_LIGHTGREEN)
- {
- m_WoolColor = 5;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
- }
- }
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_YELLOW)
- {
- m_WoolColor = 4;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
- }
- }
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_LIGHTBLUE)
- {
- m_WoolColor = 3;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
- }
- }
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_MAGENTA)
- {
- m_WoolColor = 2;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
- }
- }
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_ORANGE)
- {
- m_WoolColor = 1;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
- }
- }
- if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_WHITE)
- {
- m_WoolColor = 0;
- m_World->BroadcastEntityMetadata(*this);
-
- if (!a_Player.IsGameModeCreative())
- {
- a_Player.GetInventory().RemoveOneEquippedItem();
+ if (a_Player.GetEquippedItem().m_ItemType == E_ITEM_DYE
+ )
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_BLACK)
+ {
+ m_WoolColor = 15;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
+ }
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_RED)
+ {
+ m_WoolColor = 14;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
+ }
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_GREEN)
+ {
+ m_WoolColor = 13;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
+ }
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_BROWN)
+ {
+ m_WoolColor = 12;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
+ }
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_BLUE)
+ {
+ m_WoolColor = 11;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
+ }
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_PURPLE)
+ {
+ m_WoolColor = 10;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
+ }
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_CYAN)
+ {
+ m_WoolColor = 9;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
+ }
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_LIGHTGRAY)
+ {
+ m_WoolColor = 8;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
+ }
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_GRAY)
+ {
+ m_WoolColor = 7;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
+ }
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_PINK)
+ {
+ m_WoolColor = 6;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
+ }
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_LIGHTGREEN)
+ {
+ m_WoolColor = 5;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
+ }
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_YELLOW)
+ {
+ m_WoolColor = 4;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
+ }
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_LIGHTBLUE)
+ {
+ m_WoolColor = 3;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
+ }
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_MAGENTA)
+ {
+ m_WoolColor = 2;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
+ }
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_ORANGE)
+ {
+ m_WoolColor = 1;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
+ }
+ if (a_Player.GetEquippedItem().m_ItemDamage == E_META_DYE_WHITE)
+ {
+ m_WoolColor = 0;
+ m_World->BroadcastEntityMetadata(*this);
+
+ if (!a_Player.IsGameModeCreative())
+ {
+ a_Player.GetInventory().RemoveOneEquippedItem();
+ }
}
}
}