From 7a7cc1e66f5c24a543699d0079b67657c4b97698 Mon Sep 17 00:00:00 2001
From: Gargaj <gargaj@conspiracy.hu>
Date: Tue, 1 Dec 2015 14:10:06 +0100
Subject: [PATCH] fix wolf collars
I don't know why this had an inversion but it consistently made the wrong collar color (i.e. yellow dye made the collar blue)
---
src/Mobs/Wolf.cpp | 4 ++--
1 file 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();