Send proper event trigger for disabling event shrines.

This commit is contained in:
MobiusDev 2019-02-03 09:41:10 +00:00
parent 074fdca40c
commit e350784c95
6 changed files with 54 additions and 12 deletions

View File

@ -59,9 +59,16 @@ public final class EventShrines extends Quest
@Override @Override
public String onEnterZone(L2Character character, L2ZoneType zone) 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); return super.onEnterZone(character, zone);
} }

View File

@ -59,9 +59,16 @@ public final class EventShrines extends Quest
@Override @Override
public String onEnterZone(L2Character character, L2ZoneType zone) 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); return super.onEnterZone(character, zone);
} }

View File

@ -59,9 +59,16 @@ public final class EventShrines extends Quest
@Override @Override
public String onEnterZone(L2Character character, L2ZoneType zone) 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); return super.onEnterZone(character, zone);
} }

View File

@ -59,9 +59,16 @@ public final class EventShrines extends Quest
@Override @Override
public String onEnterZone(L2Character character, L2ZoneType zone) 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); return super.onEnterZone(character, zone);
} }

View File

@ -59,9 +59,16 @@ public final class EventShrines extends Quest
@Override @Override
public String onEnterZone(L2Character character, L2ZoneType zone) 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); return super.onEnterZone(character, zone);
} }

View File

@ -59,9 +59,16 @@ public final class EventShrines extends Quest
@Override @Override
public String onEnterZone(L2Character character, L2ZoneType zone) 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); return super.onEnterZone(character, zone);
} }