From 31c73e9d8fb3b688813eabee7131422502d92bb9 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 27 Jun 2021 23:38:40 +0000
Subject: [PATCH] Summoning a servitor should not renew your own PvP flag time.
 Contributed by Iris.

---
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 .../org/l2jmobius/gameserver/model/skills/SkillCaster.java    | 4 +++-
 20 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 5e869ce373..d9620add47 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index e657283a90..d4ace40cd9 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index e657283a90..d4ace40cd9 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index e657283a90..d4ace40cd9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index f0add58cf0..29c3454bbf 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index f0add58cf0..29c3454bbf 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index f0add58cf0..29c3454bbf 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 1c4e3edc05..ad8d1a79f7 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 1c4e3edc05..ad8d1a79f7 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 1c4e3edc05..ad8d1a79f7 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 9934405462..bd2bfe8a44 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 9934405462..bd2bfe8a44 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 9934405462..bd2bfe8a44 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 9934405462..bd2bfe8a44 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 9934405462..bd2bfe8a44 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 064f1faee9..ca8b2c2fb5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -640,7 +640,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 9934405462..bd2bfe8a44 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -635,7 +635,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 24e40803b8..2edc531fd9 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -640,7 +640,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 24e40803b8..2edc531fd9 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -640,7 +640,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
diff --git a/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 24e40803b8..2edc531fd9 100644
--- a/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -640,7 +640,9 @@ public class SkillCaster implements Runnable
 							// Add hate to the attackable, and put it in the attack list.
 							((Attackable) obj).addDamageHate(caster, 0, -skill.getEffectPoint());
 							((Creature) obj).addAttackerToAttackByList(caster);
-							if (obj.isFakePlayer())
+							
+							// Summoning a servitor should not renew your own PvP flag time.
+							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}