3 files changed, 22 insertions, 4 deletions
diff --git a/src/Mobs/AggressiveMonster.cpp b/src/Mobs/AggressiveMonster.cpp
index 85b122034..de881f4eb 100644
--- a/src/Mobs/AggressiveMonster.cpp
+++ b/src/Mobs/AggressiveMonster.cpp
@@ -95,12 +95,14 @@ void cAggressiveMonster::Attack(float a_Dt)
 {
 	m_AttackInterval += a_Dt * m_AttackRate;
 
-	if ((m_Target != NULL) && (m_AttackInterval > 3.0))
+	if ((m_Target == NULL) || (m_AttackInterval < 3.0))
 	{
-		// Setting this higher gives us more wiggle room for attackrate
-		m_AttackInterval = 0.0;
-		m_Target->TakeDamage(dtMobAttack, this, m_AttackDamage, 0);
+		return;
 	}
+	
+	// Setting this higher gives us more wiggle room for attackrate
+	m_AttackInterval = 0.0;
+	m_Target->TakeDamage(dtMobAttack, this, m_AttackDamage, 0);
 }
 
 
diff --git a/src/Mobs/CaveSpider.cpp b/src/Mobs/CaveSpider.cpp
index 1157b81f9..fe0f2ac73 100644
--- a/src/Mobs/CaveSpider.cpp
+++ b/src/Mobs/CaveSpider.cpp
@@ -27,6 +27,21 @@ void cCaveSpider::Tick(float a_Dt, cChunk & a_Chunk)
 
 
 
+void cCaveSpider::Attack(float a_Dt)
+{
+	super::Attack(a_Dt);
+	
+	if (m_Target->IsPawn())
+	{
+		// TODO: Easy = no poison, Medium = 7 seconds, Hard = 15 seconds
+		((cPawn *) m_Target)->AddEntityEffect(cEntityEffect::effPoison, cEntityEffect(140, 0, this));
+	}
+}
+
+
+
+
+
 void cCaveSpider::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	int LootingLevel = 0;
diff --git a/src/Mobs/CaveSpider.h b/src/Mobs/CaveSpider.h
index be9f174f9..3f8b2cece 100644
--- a/src/Mobs/CaveSpider.h
+++ b/src/Mobs/CaveSpider.h
@@ -17,6 +17,7 @@ public:
 	CLASS_PROTODEF(cCaveSpider);
 
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void Attack(float a_Dt) override;
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;