diff options
| author | madmaxoft <github@xoft.cz> | 2014-08-03 22:03:48 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-08-03 22:04:52 +0200 |
| commit | 3136fc6246a6e0c3ab19eb3dddb1badc7c427ee3 (patch) | |
| tree | 1af0928bd5e51e38c459aca0e60c8ae4f1ea21fe /src/Mobs/Wolf.cpp | |
| parent | Debuggers: Added a Name-from-UUID cMojangAPI test. (diff) | |
| download | cuberite-3136fc6246a6e0c3ab19eb3dddb1badc7c427ee3.tar cuberite-3136fc6246a6e0c3ab19eb3dddb1badc7c427ee3.tar.gz cuberite-3136fc6246a6e0c3ab19eb3dddb1badc7c427ee3.tar.bz2 cuberite-3136fc6246a6e0c3ab19eb3dddb1badc7c427ee3.tar.lz cuberite-3136fc6246a6e0c3ab19eb3dddb1badc7c427ee3.tar.xz cuberite-3136fc6246a6e0c3ab19eb3dddb1badc7c427ee3.tar.zst cuberite-3136fc6246a6e0c3ab19eb3dddb1badc7c427ee3.zip | |
Diffstat (limited to 'src/Mobs/Wolf.cpp')
| -rw-r--r-- | src/Mobs/Wolf.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Mobs/Wolf.cpp b/src/Mobs/Wolf.cpp index 5bb97d30e..4fe1ff1d6 100644 --- a/src/Mobs/Wolf.cpp +++ b/src/Mobs/Wolf.cpp @@ -68,6 +68,7 @@ void cWolf::OnRightClicked(cPlayer & a_Player) { if (!IsTame() && !IsAngry()) { + // If the player is holding a bone, try to tame the wolf: if (a_Player.GetEquippedItem().m_ItemType == E_ITEM_BONE) { if (!a_Player.IsGameModeCreative()) @@ -77,14 +78,16 @@ void cWolf::OnRightClicked(cPlayer & a_Player) if (m_World->GetTickRandomNumber(7) == 0) { + // Taming succeeded SetMaxHealth(20); SetIsTame(true); - SetOwner(a_Player.GetName()); + SetOwner(a_Player.GetName(), a_Player.GetUUID()); m_World->BroadcastEntityStatus(*this, esWolfTamed); m_World->BroadcastParticleEffect("heart", (float) GetPosX(), (float) GetPosY(), (float) GetPosZ(), 0, 0, 0, 0, 5); } else { + // Taming failed m_World->BroadcastEntityStatus(*this, esWolfTaming); m_World->BroadcastParticleEffect("smoke", (float) GetPosX(), (float) GetPosY(), (float) GetPosZ(), 0, 0, 0, 0, 5); } @@ -92,6 +95,7 @@ void cWolf::OnRightClicked(cPlayer & a_Player) } else if (IsTame()) { + // Feed the wolf, restoring its health, or dye its collar: switch (a_Player.GetEquippedItem().m_ItemType) { case E_ITEM_RAW_BEEF: |