diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
index 08cc6bb6cd..4d962e1337 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
 							((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
 						}
 					}
-					else if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
-						|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
-							|| (((L2Character) obj).getReputation() < 0) //
-						)))
+					// Self casting should not increase PvP time.
+					else if (obj != player)
 					{
-						// Supporting players or monsters result in pvpflag.
-						if (!obj.isFakePlayer() //
-							|| (obj.isFakePlayer() //
-								&& (!((L2Npc) obj).isScriptValue(0) //
-									|| (((L2Npc) obj).getReputation() < 0))))
+						// Supporting monsters or players results in pvpflag.
+						if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
+							|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
+								|| (((L2Character) obj).getReputation() < 0) //
+							)))
 						{
-							// Self casting should not increase PvP time.
-							if (obj != player)
+							// Consider fake player PvP status.
+							if (!obj.isFakePlayer() //
+								|| (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
index 08cc6bb6cd..4d962e1337 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
 							((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
 						}
 					}
-					else if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
-						|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
-							|| (((L2Character) obj).getReputation() < 0) //
-						)))
+					// Self casting should not increase PvP time.
+					else if (obj != player)
 					{
-						// Supporting players or monsters result in pvpflag.
-						if (!obj.isFakePlayer() //
-							|| (obj.isFakePlayer() //
-								&& (!((L2Npc) obj).isScriptValue(0) //
-									|| (((L2Npc) obj).getReputation() < 0))))
+						// Supporting monsters or players results in pvpflag.
+						if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
+							|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
+								|| (((L2Character) obj).getReputation() < 0) //
+							)))
 						{
-							// Self casting should not increase PvP time.
-							if (obj != player)
+							// Consider fake player PvP status.
+							if (!obj.isFakePlayer() //
+								|| (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
index 08cc6bb6cd..4d962e1337 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
 							((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
 						}
 					}
-					else if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
-						|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
-							|| (((L2Character) obj).getReputation() < 0) //
-						)))
+					// Self casting should not increase PvP time.
+					else if (obj != player)
 					{
-						// Supporting players or monsters result in pvpflag.
-						if (!obj.isFakePlayer() //
-							|| (obj.isFakePlayer() //
-								&& (!((L2Npc) obj).isScriptValue(0) //
-									|| (((L2Npc) obj).getReputation() < 0))))
+						// Supporting monsters or players results in pvpflag.
+						if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
+							|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
+								|| (((L2Character) obj).getReputation() < 0) //
+							)))
 						{
-							// Self casting should not increase PvP time.
-							if (obj != player)
+							// Consider fake player PvP status.
+							if (!obj.isFakePlayer() //
+								|| (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
index 08cc6bb6cd..4d962e1337 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
 							((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
 						}
 					}
-					else if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
-						|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
-							|| (((L2Character) obj).getReputation() < 0) //
-						)))
+					// Self casting should not increase PvP time.
+					else if (obj != player)
 					{
-						// Supporting players or monsters result in pvpflag.
-						if (!obj.isFakePlayer() //
-							|| (obj.isFakePlayer() //
-								&& (!((L2Npc) obj).isScriptValue(0) //
-									|| (((L2Npc) obj).getReputation() < 0))))
+						// Supporting monsters or players results in pvpflag.
+						if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
+							|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
+								|| (((L2Character) obj).getReputation() < 0) //
+							)))
 						{
-							// Self casting should not increase PvP time.
-							if (obj != player)
+							// Consider fake player PvP status.
+							if (!obj.isFakePlayer() //
+								|| (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
index 64cb2b233a..1dd7486a10 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
 							((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
 						}
 					}
-					else if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
-						|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
-							|| (((L2Character) obj).getReputation() < 0) //
-						)))
+					// Self casting should not increase PvP time.
+					else if (obj != player)
 					{
-						// Supporting players or monsters result in pvpflag.
-						if (!obj.isFakePlayer() //
-							|| (obj.isFakePlayer() //
-								&& (!((L2Npc) obj).isScriptValue(0) //
-									|| (((L2Npc) obj).getReputation() < 0))))
+						// Supporting monsters or players results in pvpflag.
+						if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
+							|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
+								|| (((L2Character) obj).getReputation() < 0) //
+							)))
 						{
-							// Self casting should not increase PvP time.
-							if (obj != player)
+							// Consider fake player PvP status.
+							if (!obj.isFakePlayer() //
+								|| (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
index 64cb2b233a..1dd7486a10 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
 							((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
 						}
 					}
-					else if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
-						|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
-							|| (((L2Character) obj).getReputation() < 0) //
-						)))
+					// Self casting should not increase PvP time.
+					else if (obj != player)
 					{
-						// Supporting players or monsters result in pvpflag.
-						if (!obj.isFakePlayer() //
-							|| (obj.isFakePlayer() //
-								&& (!((L2Npc) obj).isScriptValue(0) //
-									|| (((L2Npc) obj).getReputation() < 0))))
+						// Supporting monsters or players results in pvpflag.
+						if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
+							|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
+								|| (((L2Character) obj).getReputation() < 0) //
+							)))
 						{
-							// Self casting should not increase PvP time.
-							if (obj != player)
+							// Consider fake player PvP status.
+							if (!obj.isFakePlayer() //
+								|| (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
index 5369272742..1bc9249b05 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
 							((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
 						}
 					}
-					else if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
-						|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
-							|| (((L2Character) obj).getReputation() < 0) //
-						)))
+					// Self casting should not increase PvP time.
+					else if (obj != player)
 					{
-						// Supporting players or monsters result in pvpflag.
-						if (!obj.isFakePlayer() //
-							|| (obj.isFakePlayer() //
-								&& (!((L2Npc) obj).isScriptValue(0) //
-									|| (((L2Npc) obj).getReputation() < 0))))
+						// Supporting monsters or players results in pvpflag.
+						if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
+							|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
+								|| (((L2Character) obj).getReputation() < 0) //
+							)))
 						{
-							// Self casting should not increase PvP time.
-							if (obj != player)
+							// Consider fake player PvP status.
+							if (!obj.isFakePlayer() //
+								|| (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
index 5369272742..1bc9249b05 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
 							((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
 						}
 					}
-					else if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
-						|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
-							|| (((L2Character) obj).getReputation() < 0) //
-						)))
+					// Self casting should not increase PvP time.
+					else if (obj != player)
 					{
-						// Supporting players or monsters result in pvpflag.
-						if (!obj.isFakePlayer() //
-							|| (obj.isFakePlayer() //
-								&& (!((L2Npc) obj).isScriptValue(0) //
-									|| (((L2Npc) obj).getReputation() < 0))))
+						// Supporting monsters or players results in pvpflag.
+						if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
+							|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
+								|| (((L2Character) obj).getReputation() < 0) //
+							)))
 						{
-							// Self casting should not increase PvP time.
-							if (obj != player)
+							// Consider fake player PvP status.
+							if (!obj.isFakePlayer() //
+								|| (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
index 5369272742..1bc9249b05 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
 							((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
 						}
 					}
-					else if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
-						|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
-							|| (((L2Character) obj).getReputation() < 0) //
-						)))
+					// Self casting should not increase PvP time.
+					else if (obj != player)
 					{
-						// Supporting players or monsters result in pvpflag.
-						if (!obj.isFakePlayer() //
-							|| (obj.isFakePlayer() //
-								&& (!((L2Npc) obj).isScriptValue(0) //
-									|| (((L2Npc) obj).getReputation() < 0))))
+						// Supporting monsters or players results in pvpflag.
+						if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
+							|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
+								|| (((L2Character) obj).getReputation() < 0) //
+							)))
 						{
-							// Self casting should not increase PvP time.
-							if (obj != player)
+							// Consider fake player PvP status.
+							if (!obj.isFakePlayer() //
+								|| (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
index 5369272742..1bc9249b05 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
 							((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
 						}
 					}
-					else if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
-						|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
-							|| (((L2Character) obj).getReputation() < 0) //
-						)))
+					// Self casting should not increase PvP time.
+					else if (obj != player)
 					{
-						// Supporting players or monsters result in pvpflag.
-						if (!obj.isFakePlayer() //
-							|| (obj.isFakePlayer() //
-								&& (!((L2Npc) obj).isScriptValue(0) //
-									|| (((L2Npc) obj).getReputation() < 0))))
+						// Supporting monsters or players results in pvpflag.
+						if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
+							|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
+								|| (((L2Character) obj).getReputation() < 0) //
+							)))
 						{
-							// Self casting should not increase PvP time.
-							if (obj != player)
+							// Consider fake player PvP status.
+							if (!obj.isFakePlayer() //
+								|| (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}