From 5e61cecf5b9b20fdce59fdd32ce6c875c99bb9a8 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 13 Apr 2017 20:04:16 +0000 Subject: [PATCH] Fixed olympiad observers getting expelled from the arena. --- .../gameserver/model/zone/type/L2OlympiadStadiumZone.java | 2 +- .../gameserver/model/zone/type/L2OlympiadStadiumZone.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java index dce0a9585c..8209ddaf83 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java @@ -142,7 +142,7 @@ public class L2OlympiadStadiumZone extends L2ZoneRespawn if (player != null) { // only participants, observers and GMs allowed - if (!player.canOverrideCond(PcCondOverride.ZONE_CONDITIONS) && !player.isInOlympiadMode()) + if (!player.canOverrideCond(PcCondOverride.ZONE_CONDITIONS) && !player.isInOlympiadMode() && !player.inObserverMode()) { ThreadPoolManager.getInstance().executeGeneral(new KickPlayer(player)); } diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java index dce0a9585c..8209ddaf83 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java @@ -142,7 +142,7 @@ public class L2OlympiadStadiumZone extends L2ZoneRespawn if (player != null) { // only participants, observers and GMs allowed - if (!player.canOverrideCond(PcCondOverride.ZONE_CONDITIONS) && !player.isInOlympiadMode()) + if (!player.canOverrideCond(PcCondOverride.ZONE_CONDITIONS) && !player.isInOlympiadMode() && !player.inObserverMode()) { ThreadPoolManager.getInstance().executeGeneral(new KickPlayer(player)); }