3 files changed, 36 insertions, 1 deletions

diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp
index 93f6a69bc..4c840e6e1 100644
--- a/src/Entities/Pawn.cpp
+++ b/src/Entities/Pawn.cpp
@@ -72,6 +72,26 @@ void cPawn::RemoveEntityEffect(cEntityEffect::eType a_EffectType)
 
 
 
+void cPawn::ClearEntityEffects()
+{
+	// Iterate through this entity's applied effects
+	for (tEffectMap::iterator iter = m_EntityEffects.begin(); iter != m_EntityEffects.end();)
+	{
+		// Copy values to prevent pesky wrong erasures
+		cEntityEffect::eType effect_type = iter->first;
+		
+		// Iterates (must be called before any possible erasure)
+		++iter;
+		
+		// Remove effect
+		RemoveEntityEffect(effect_type);
+	}
+}
+
+
+
+
+
 void cPawn::HandleEntityEffects(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect)
 {
 	switch (a_EffectType)
diff --git a/src/Entities/Pawn.h b/src/Entities/Pawn.h
index 1a897c958..857488901 100644
--- a/src/Entities/Pawn.h
+++ b/src/Entities/Pawn.h
@@ -22,13 +22,28 @@ public:
 	
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 	
+	/** Applies an entity effect
+	 *  @param a_EffectType The entity effect to apply
+	 *  @param a_Effect     The parameters of the effect
+	 */
 	void AddEntityEffect(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect);
+	
+	/** Removes a currently applied entity effect
+	 *  @param a_EffectType The entity effect to remove
+	 */
 	void RemoveEntityEffect(cEntityEffect::eType a_EffectType);
+	
+	/** Removes all currently applied entity effects (used when drinking milk) */
+	void ClearEntityEffects();
 
 protected:
 	typedef std::map<cEntityEffect::eType, cEntityEffect> tEffectMap;
 	tEffectMap m_EntityEffects;
 	
+	/** Applies entity effect effects
+	 *  @param a_EffectType The selected entity effect
+	 *  @param a_Effect     The parameters of the selected entity effect
+	 */
 	virtual void HandleEntityEffects(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect);
 } ;  // tolua_export
 
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 67449f800..b4b344584 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -552,7 +552,7 @@ void cPlayer::SetFoodExhaustionLevel(double a_FoodExhaustionLevel)
 
 bool cPlayer::Feed(int a_Food, double a_Saturation)
 {
-	if (m_FoodLevel >= MAX_FOOD_LEVEL)
+	if (IsSatiated())
 	{
 		return false;
 	}