diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp
index 13934d943..95d1b113e 100644
--- a/src/Entities/Pawn.cpp
+++ b/src/Entities/Pawn.cpp
@@ -19,7 +19,22 @@ cPawn::cPawn(eEntityType a_EntityType, double a_Width, double a_Height)
 
 void cPawn::Tick(float a_Dt, cChunk & a_Chunk)
 {
-	
+	// Iterate through this entity's applied effects
+	for (std::map<cEntityEffect::eType, cEntityEffect>::iterator iter = m_EntityEffects.begin();
+		 iter != m_EntityEffects.end();
+		 ++iter)
+	{
+		// Reduce the effect's duration
+		iter->second.m_Ticks--;
+		
+		// Remove effect if duration has elapsed
+		if (iter->second.m_Ticks <= 0)
+		{
+			RemoveEntityEffect(iter->first);
+		}
+		
+		// TODO: Check for discrepancies between client and server effect values
+	}
 	
 	super::Tick(a_Dt, a_Chunk);
 }
@@ -31,6 +46,7 @@ void cPawn::Tick(float a_Dt, cChunk & a_Chunk)
 void cPawn::AddEntityEffect(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect)
 {
 	m_EntityEffects[a_EffectType] = a_Effect;
+	//m_World->BroadcastEntityEffect(*this, a_EffectType, a_Effect.m_Intensity, a_Effect.m_Ticks);
 }
 
 
@@ -40,4 +56,5 @@ void cPawn::AddEntityEffect(cEntityEffect::eType a_EffectType, cEntityEffect a_E
 void cPawn::RemoveEntityEffect(cEntityEffect::eType a_EffectType)
 {
 	m_EntityEffects.erase(a_EffectType);
+	//m_World->BroadcastRemoveEntityEffect(*this, a_EffectType);
 }