From f27e223be9a145ece0f68ddae82f63c05b3e6583 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 25 Jan 2019 03:11:41 +0000 Subject: [PATCH] Self casting should not increase PvP time. --- .../com/l2jmobius/gameserver/model/skills/SkillCaster.java | 6 +++++- .../com/l2jmobius/gameserver/model/skills/SkillCaster.java | 6 +++++- .../com/l2jmobius/gameserver/model/skills/SkillCaster.java | 6 +++++- .../com/l2jmobius/gameserver/model/skills/SkillCaster.java | 6 +++++- .../com/l2jmobius/gameserver/model/skills/SkillCaster.java | 6 +++++- .../com/l2jmobius/gameserver/model/skills/SkillCaster.java | 6 +++++- .../com/l2jmobius/gameserver/model/skills/SkillCaster.java | 6 +++++- .../com/l2jmobius/gameserver/model/skills/SkillCaster.java | 6 +++++- .../com/l2jmobius/gameserver/model/skills/SkillCaster.java | 6 +++++- .../com/l2jmobius/gameserver/model/skills/SkillCaster.java | 6 +++++- 10 files changed, 50 insertions(+), 10 deletions(-) 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 b6bf1ff56e..08cc6bb6cd 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 @@ -653,7 +653,11 @@ public class SkillCaster implements Runnable && (!((L2Npc) obj).isScriptValue(0) // || (((L2Npc) obj).getReputation() < 0)))) { - player.updatePvPStatus(); + // Self casting should not increase PvP time. + if (obj != player) + { + 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 b6bf1ff56e..08cc6bb6cd 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 @@ -653,7 +653,11 @@ public class SkillCaster implements Runnable && (!((L2Npc) obj).isScriptValue(0) // || (((L2Npc) obj).getReputation() < 0)))) { - player.updatePvPStatus(); + // Self casting should not increase PvP time. + if (obj != player) + { + 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 b6bf1ff56e..08cc6bb6cd 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 @@ -653,7 +653,11 @@ public class SkillCaster implements Runnable && (!((L2Npc) obj).isScriptValue(0) // || (((L2Npc) obj).getReputation() < 0)))) { - player.updatePvPStatus(); + // Self casting should not increase PvP time. + if (obj != player) + { + 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 b6bf1ff56e..08cc6bb6cd 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 @@ -653,7 +653,11 @@ public class SkillCaster implements Runnable && (!((L2Npc) obj).isScriptValue(0) // || (((L2Npc) obj).getReputation() < 0)))) { - player.updatePvPStatus(); + // Self casting should not increase PvP time. + if (obj != player) + { + 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 299173a789..64cb2b233a 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 @@ -653,7 +653,11 @@ public class SkillCaster implements Runnable && (!((L2Npc) obj).isScriptValue(0) // || (((L2Npc) obj).getReputation() < 0)))) { - player.updatePvPStatus(); + // Self casting should not increase PvP time. + if (obj != player) + { + 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 299173a789..64cb2b233a 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 @@ -653,7 +653,11 @@ public class SkillCaster implements Runnable && (!((L2Npc) obj).isScriptValue(0) // || (((L2Npc) obj).getReputation() < 0)))) { - player.updatePvPStatus(); + // Self casting should not increase PvP time. + if (obj != player) + { + 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 8cd6a13040..5369272742 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 @@ -653,7 +653,11 @@ public class SkillCaster implements Runnable && (!((L2Npc) obj).isScriptValue(0) // || (((L2Npc) obj).getReputation() < 0)))) { - player.updatePvPStatus(); + // Self casting should not increase PvP time. + if (obj != player) + { + 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 8cd6a13040..5369272742 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 @@ -653,7 +653,11 @@ public class SkillCaster implements Runnable && (!((L2Npc) obj).isScriptValue(0) // || (((L2Npc) obj).getReputation() < 0)))) { - player.updatePvPStatus(); + // Self casting should not increase PvP time. + if (obj != player) + { + 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 8cd6a13040..5369272742 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 @@ -653,7 +653,11 @@ public class SkillCaster implements Runnable && (!((L2Npc) obj).isScriptValue(0) // || (((L2Npc) obj).getReputation() < 0)))) { - player.updatePvPStatus(); + // Self casting should not increase PvP time. + if (obj != player) + { + 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 8cd6a13040..5369272742 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 @@ -653,7 +653,11 @@ public class SkillCaster implements Runnable && (!((L2Npc) obj).isScriptValue(0) // || (((L2Npc) obj).getReputation() < 0)))) { - player.updatePvPStatus(); + // Self casting should not increase PvP time. + if (obj != player) + { + player.updatePvPStatus(); + } } } }