From 2185c72c2ca2d66b238d7d3234c173bd820d32ac Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sat, 7 Jun 2014 16:32:37 -0700
Subject: Implemented drinkable potions, noeffect entity effect,

Clears entity effects on death
---
 src/Entities/Pawn.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'src/Entities/Pawn.cpp')

diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp
index 4c840e6e1..5cf270006 100644
--- a/src/Entities/Pawn.cpp
+++ b/src/Entities/Pawn.cpp
@@ -52,8 +52,22 @@ void cPawn::Tick(float a_Dt, cChunk & a_Chunk)
 
 
 
+void cPawn::KilledBy(cEntity *a_Killer)
+{
+	ClearEntityEffects();
+}
+
+
+
+
+
 void cPawn::AddEntityEffect(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect)
 {
+	if (a_EffectType == cEntityEffect::efNoEffect)
+	{
+		return;
+	}
+	
 	m_EntityEffects[a_EffectType] = a_Effect;
 	m_World->BroadcastEntityEffect(*this, a_EffectType, a_Effect.GetIntensity(), a_Effect.m_Ticks);
 }
-- 
cgit v1.2.3