Send message when leaving combat zone.

This commit is contained in:
MobiusDevelopment 2020-05-12 10:54:08 +00:00
parent 24051db7c8
commit de8eb81969
18 changed files with 24 additions and 24 deletions

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneRespawn;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
/** /**
* An arena * A PVP Zone
* @author durgus * @author durgus
*/ */
public class ArenaZone extends ZoneRespawn public class ArenaZone extends ZoneRespawn
@ -37,12 +37,12 @@ public class ArenaZone extends ZoneRespawn
@Override @Override
protected void onEnter(Creature creature) protected void onEnter(Creature creature)
{ {
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{
creature.getActingPlayer().sendPacket(SystemMessageId.YOU_HAVE_ENTERED_A_COMBAT_ZONE);
}
creature.setInsideZone(ZoneId.PVP, true); creature.setInsideZone(ZoneId.PVP, true);
creature.setInsideZone(ZoneId.NO_SUMMON_FRIEND, true); creature.setInsideZone(ZoneId.NO_SUMMON_FRIEND, true);
if (creature instanceof PlayerInstance)
{
((PlayerInstance) creature).sendPacket(SystemMessageId.YOU_HAVE_ENTERED_A_COMBAT_ZONE);
}
} }
@Override @Override
@ -50,9 +50,9 @@ public class ArenaZone extends ZoneRespawn
{ {
creature.setInsideZone(ZoneId.PVP, false); creature.setInsideZone(ZoneId.PVP, false);
creature.setInsideZone(ZoneId.NO_SUMMON_FRIEND, false); creature.setInsideZone(ZoneId.NO_SUMMON_FRIEND, false);
if (creature instanceof PlayerInstance) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
((PlayerInstance) creature).sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.getActingPlayer().sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }

View File

@ -45,10 +45,10 @@ public class ArenaZone extends ZoneType
@Override @Override
protected void onExit(Creature creature) protected void onExit(Creature creature)
{ {
creature.setInsideZone(ZoneId.PVP, false);
if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP)) if (creature.isPlayer() && !creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE); creature.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
} }
creature.setInsideZone(ZoneId.PVP, false);
} }
} }