From e92b70c40a1632ecbd6a8fbb223ece43800f784e Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 18 Dec 2022 07:38:27 +0000 Subject: [PATCH] Invisible GM players should not be attackable. --- .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 ++++++ 29 files changed, 174 insertions(+) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java index 220e673363..a8dd9d6583 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8185,6 +8185,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java index 8833c353c8..a2323d1fcb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8188,6 +8188,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java index 843331d809..e5b33266d3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8190,6 +8190,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java index 5714a01dc4..796f5fc316 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8208,6 +8208,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java index eae599590d..d026392424 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8225,6 +8225,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java index ff2e2daf89..dd7e9bf3a4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8238,6 +8238,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java index 0e8e8b227e..006a233eed 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8239,6 +8239,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java index 5b493e7d23..46d8bd48a4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8267,6 +8267,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java index 1a3ee74126..620053e2f6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8377,6 +8377,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java index 3766fa19a9..08d4bcbd09 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8403,6 +8403,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index 86bbaaf2c6..550c4e4596 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8462,6 +8462,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index 12e0e8c2dd..27ca2537cb 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8492,6 +8492,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index 30abd54d35..90997c4849 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -7937,6 +7937,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _summon)) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java index 8a7b9edf92..394d7f313e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8402,6 +8402,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _summon)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java index 599da79162..2899821971 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8286,6 +8286,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _summon)) { diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java index 4ef7c438fc..6191e3d02c 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8086,6 +8086,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java index 14740570c1..89b3af818b 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8097,6 +8097,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java index 14740570c1..89b3af818b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8097,6 +8097,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java index 55931d0756..06afe7c75e 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8097,6 +8097,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java index cacada3270..c5c32b37c9 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8083,6 +8083,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java index f1a6456366..08c1a364a3 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8126,6 +8126,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java index 61390cfe88..e3f6c4f708 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8173,6 +8173,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java index 2cb61acfd7..d2fa07546e 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8126,6 +8126,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java index 7451b1242b..92e2ad8bad 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8083,6 +8083,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index 1dff6cc430..14c4687cfe 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8072,6 +8072,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java index 2a64c50f74..3545e7097a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8226,6 +8226,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java index f5ce988dab..39134b0c51 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8365,6 +8365,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java index ad01b9161f..b8d2bc18c7 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8605,6 +8605,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Player.java index 2998e23357..09c3e58371 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -8605,6 +8605,12 @@ public class Player extends Playable return false; } + // Invisible GM players should not be attackable. + if (isInvisible() && isGM()) + { + return false; + } + // Check if the attacker isn't the Player Pet if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) {