From e350784c95945367582ba9728a43400e73f6e209 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 3 Feb 2019 09:41:10 +0000 Subject: [PATCH] Send proper event trigger for disabling event shrines. --- .../dist/game/data/scripts/events/EventShrines.java | 11 +++++++++-- .../dist/game/data/scripts/events/EventShrines.java | 11 +++++++++-- .../dist/game/data/scripts/events/EventShrines.java | 11 +++++++++-- .../dist/game/data/scripts/events/EventShrines.java | 11 +++++++++-- .../dist/game/data/scripts/events/EventShrines.java | 11 +++++++++-- .../dist/game/data/scripts/events/EventShrines.java | 11 +++++++++-- 6 files changed, 54 insertions(+), 12 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/EventShrines.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/EventShrines.java index fe9979c958..ef8b2e2943 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/EventShrines.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/EventShrines.java @@ -59,9 +59,16 @@ public final class EventShrines extends Quest @Override public String onEnterZone(L2Character character, L2ZoneType zone) { - if (character.isPlayer() && EventShrineManager.getInstance().areShrinesEnabled()) + if (character.isPlayer()) { - character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()), true)); + if (EventShrineManager.getInstance().areShrinesEnabled()) + { + character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()), true)); + } + else // Deactivate shrine. + { + character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()) + 2, true)); + } } return super.onEnterZone(character, zone); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/EventShrines.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/EventShrines.java index fe9979c958..ef8b2e2943 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/EventShrines.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/EventShrines.java @@ -59,9 +59,16 @@ public final class EventShrines extends Quest @Override public String onEnterZone(L2Character character, L2ZoneType zone) { - if (character.isPlayer() && EventShrineManager.getInstance().areShrinesEnabled()) + if (character.isPlayer()) { - character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()), true)); + if (EventShrineManager.getInstance().areShrinesEnabled()) + { + character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()), true)); + } + else // Deactivate shrine. + { + character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()) + 2, true)); + } } return super.onEnterZone(character, zone); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/EventShrines.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/EventShrines.java index fe9979c958..ef8b2e2943 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/EventShrines.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/EventShrines.java @@ -59,9 +59,16 @@ public final class EventShrines extends Quest @Override public String onEnterZone(L2Character character, L2ZoneType zone) { - if (character.isPlayer() && EventShrineManager.getInstance().areShrinesEnabled()) + if (character.isPlayer()) { - character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()), true)); + if (EventShrineManager.getInstance().areShrinesEnabled()) + { + character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()), true)); + } + else // Deactivate shrine. + { + character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()) + 2, true)); + } } return super.onEnterZone(character, zone); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/EventShrines.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/EventShrines.java index fe9979c958..ef8b2e2943 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/EventShrines.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/EventShrines.java @@ -59,9 +59,16 @@ public final class EventShrines extends Quest @Override public String onEnterZone(L2Character character, L2ZoneType zone) { - if (character.isPlayer() && EventShrineManager.getInstance().areShrinesEnabled()) + if (character.isPlayer()) { - character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()), true)); + if (EventShrineManager.getInstance().areShrinesEnabled()) + { + character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()), true)); + } + else // Deactivate shrine. + { + character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()) + 2, true)); + } } return super.onEnterZone(character, zone); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/EventShrines.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/EventShrines.java index fe9979c958..ef8b2e2943 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/EventShrines.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/EventShrines.java @@ -59,9 +59,16 @@ public final class EventShrines extends Quest @Override public String onEnterZone(L2Character character, L2ZoneType zone) { - if (character.isPlayer() && EventShrineManager.getInstance().areShrinesEnabled()) + if (character.isPlayer()) { - character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()), true)); + if (EventShrineManager.getInstance().areShrinesEnabled()) + { + character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()), true)); + } + else // Deactivate shrine. + { + character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()) + 2, true)); + } } return super.onEnterZone(character, zone); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/EventShrines.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/EventShrines.java index fe9979c958..ef8b2e2943 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/EventShrines.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/EventShrines.java @@ -59,9 +59,16 @@ public final class EventShrines extends Quest @Override public String onEnterZone(L2Character character, L2ZoneType zone) { - if (character.isPlayer() && EventShrineManager.getInstance().areShrinesEnabled()) + if (character.isPlayer()) { - character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()), true)); + if (EventShrineManager.getInstance().areShrinesEnabled()) + { + character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()), true)); + } + else // Deactivate shrine. + { + character.sendPacket(new OnEventTrigger(ZONE_TRIGGERS.get(zone.getId()) + 2, true)); + } } return super.onEnterZone(character, zone); }