summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-12-03 16:20:48 +0100
committerMattes D <github@xoft.cz>2015-12-03 16:20:48 +0100
commitf9a3eb0278485bb6b4b9a1c9819ccbdbbe981689 (patch)
tree6e8c3f77fc4c05c9fb757ea2852a9f3fa9ab3a83 /src
parentMerge pull request #2707 from Gargaj/rabbitstew (diff)
parentfix wolf collars (diff)
downloadcuberite-f9a3eb0278485bb6b4b9a1c9819ccbdbbe981689.tar
cuberite-f9a3eb0278485bb6b4b9a1c9819ccbdbbe981689.tar.gz
cuberite-f9a3eb0278485bb6b4b9a1c9819ccbdbbe981689.tar.bz2
cuberite-f9a3eb0278485bb6b4b9a1c9819ccbdbbe981689.tar.lz
cuberite-f9a3eb0278485bb6b4b9a1c9819ccbdbbe981689.tar.xz
cuberite-f9a3eb0278485bb6b4b9a1c9819ccbdbbe981689.tar.zst
cuberite-f9a3eb0278485bb6b4b9a1c9819ccbdbbe981689.zip
Diffstat (limited to 'src')
-rw-r--r--src/Mobs/Wolf.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Mobs/Wolf.cpp b/src/Mobs/Wolf.cpp
index 679136213..2d5cfb13f 100644
--- a/src/Mobs/Wolf.cpp
+++ b/src/Mobs/Wolf.cpp
@@ -18,7 +18,7 @@ cWolf::cWolf(void) :
m_IsBegging(false),
m_IsAngry(false),
m_OwnerName(""),
- m_CollarColor(14)
+ m_CollarColor(E_META_DYE_ORANGE)
{
m_RelativeWalkSpeed = 2;
}
@@ -124,7 +124,7 @@ void cWolf::OnRightClicked(cPlayer & a_Player)
{
if (a_Player.GetName() == m_OwnerName) // Is the player the owner of the dog?
{
- SetCollarColor(15 - a_Player.GetEquippedItem().m_ItemDamage);
+ SetCollarColor(a_Player.GetEquippedItem().m_ItemDamage);
if (!a_Player.IsGameModeCreative())
{
a_Player.GetInventory().RemoveOneEquippedItem();