flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Moved Effects.h to EntityEffects.h, added initial impl

Browse Source
This commit is contained in:
archshift
2014-06-06 00:17:49 -07:00
parent c1692a2e3b
commit 87b1bfaf2a
9 changed files with 115 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Entities/Player.cpp
View File

@@ -584,12 +584,12 @@ void cPlayer::FoodPoison(int a_NumTicks)
m_FoodPoisonedTicksRemaining = std::max(m_FoodPoisonedTicksRemaining, a_NumTicks);
if (!HasBeenFoodPoisoned)
{
m_World->BroadcastRemoveEntityEffect(*this, E_EFFECT_HUNGER);
m_World->BroadcastRemoveEntityEffect(*this, cEntityEffect::efHunger);
SendHealth();
}
else
{
m_World->BroadcastEntityEffect(*this, E_EFFECT_HUNGER, 0, 400); // Give the player the "Hunger" effect for 20 seconds.
m_World->BroadcastEntityEffect(*this, cEntityEffect::efHunger, 0, 400); // Give the player the "Hunger" effect for 20 seconds.
}
}
@@ -1930,7 +1930,7 @@ void cPlayer::HandleFood(void)
}
else
{
m_World->BroadcastRemoveEntityEffect(*this, E_EFFECT_HUNGER); // Remove the "Hunger" effect.
m_World->BroadcastRemoveEntityEffect(*this, cEntityEffect::efHunger); // Remove the "Hunger" effect.
}
// Apply food exhaustion that has accumulated: