From 69ec57c215d91c466ab87b0b866add7a17d01256 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 5 Dec 2020 23:08:08 +0000
Subject: [PATCH] Check if effected NPC is not attackable.

---
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 .../game/data/scripts/handlers/effecthandlers/RealDamage.java | 4 ++--
 17 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index 3c25ec3ea9..75ad485a1d 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index 3c25ec3ea9..75ad485a1d 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index 3c25ec3ea9..75ad485a1d 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index 3c25ec3ea9..75ad485a1d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index 3c25ec3ea9..75ad485a1d 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index 3c25ec3ea9..75ad485a1d 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index 3c25ec3ea9..75ad485a1d 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index 3c25ec3ea9..75ad485a1d 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index 3c25ec3ea9..75ad485a1d 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index 3c25ec3ea9..75ad485a1d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index 3c25ec3ea9..75ad485a1d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index 3c25ec3ea9..75ad485a1d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index c40512d1bd..f9e211754d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index c40512d1bd..f9e211754d 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index c40512d1bd..f9e211754d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index 3c25ec3ea9..75ad485a1d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
index c40512d1bd..f9e211754d 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java
@@ -51,8 +51,8 @@ public class RealDamage extends AbstractEffect
 			return;
 		}
 		
-		// Check if effected is not attackable.
-		if (!effected.isAttackable())
+		// Check if effected NPC is not attackable.
+		if (effected.isNpc() && !effected.isAttackable())
 		{
 			return;
 		}