summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorSTRWarrior <niels.breuker@hotmail.nl>2013-12-14 18:03:00 +0100
committerSTRWarrior <niels.breuker@hotmail.nl>2013-12-14 18:03:00 +0100
commit37069288d5801acce0ad34878a78aa0daf004135 (patch)
tree592aa27e4f5e685c4ccf37ab90ebb62f428cb970 /src/Entities
parentMerge pull request #429 from worktycho/quickfixs (diff)
downloadcuberite-37069288d5801acce0ad34878a78aa0daf004135.tar
cuberite-37069288d5801acce0ad34878a78aa0daf004135.tar.gz
cuberite-37069288d5801acce0ad34878a78aa0daf004135.tar.bz2
cuberite-37069288d5801acce0ad34878a78aa0daf004135.tar.lz
cuberite-37069288d5801acce0ad34878a78aa0daf004135.tar.xz
cuberite-37069288d5801acce0ad34878a78aa0daf004135.tar.zst
cuberite-37069288d5801acce0ad34878a78aa0daf004135.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Player.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 85833f31d..20c4818b2 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -557,9 +557,13 @@ void cPlayer::FoodPoison(int a_NumTicks)
m_FoodPoisonedTicksRemaining = std::max(m_FoodPoisonedTicksRemaining, a_NumTicks);
if (!HasBeenFoodPoisoned)
{
- // TODO: Send the poisoning indication to the client - how?
+ m_ClientHandle->SendRemoveEntityEffect(*this, 17);
SendHealth();
}
+ else
+ {
+ m_ClientHandle->SendEntityEffect(*this, 17, 0, 20);
+ }
}
@@ -1704,6 +1708,10 @@ void cPlayer::HandleFood(void)
m_FoodPoisonedTicksRemaining--;
m_FoodExhaustionLevel += 0.025; // 0.5 per second = 0.025 per tick
}
+ else
+ {
+ m_ClientHandle->SendRemoveEntityEffect(*this, 17); // remove the "Hunger" effect.
+ }
// Apply food exhaustion that has accumulated:
if (m_FoodExhaustionLevel >= 4)