From 9b7781344b556ca6599f16abba9aebf12ef3b4a4 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 24 Sep 2022 10:23:05 +0000 Subject: [PATCH] Exclude olympiad observers from not friend affect object types. --- .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriend.java | 6 ++++++ .../handlers/targethandlers/affectobject/NotFriendPc.java | 6 ++++++ 48 files changed, 288 insertions(+) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 1fe1f42feb..79baa77ff4 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -85,6 +85,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index a28056572b..b78bce64e2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -85,6 +85,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 1fe1f42feb..79baa77ff4 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -85,6 +85,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index a28056572b..b78bce64e2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -85,6 +85,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 13aca7de62..8fbbd2c527 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -84,6 +84,12 @@ public class NotFriend implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index f1651ed5b0..ab230f81d0 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -84,6 +84,12 @@ public class NotFriendPc implements IAffectObjectHandler return false; } + // Olympiad observer. + if (targetPlayer.inObserverMode()) + { + return false; + } + // Siege. if (target.isInsideZone(ZoneId.SIEGE)) {