Support for multiple or intersecting timed hunting zones.

This commit is contained in:
MobiusDevelopment 2022-04-01 11:39:18 +00:00
parent 8602a5565f
commit 00288fa5dc
10 changed files with 20 additions and 20 deletions

View File

@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
@Override
protected void onEnter(Creature creature)
{
if (!creature.isPlayer())
if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
{
return;
}
@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
}
final Player player = creature.getActingPlayer();
if (player != null)
if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
{
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);

View File

@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
@Override
protected void onEnter(Creature creature)
{
if (!creature.isPlayer())
if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
{
return;
}
@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
}
final Player player = creature.getActingPlayer();
if (player != null)
if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
{
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);

View File

@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
@Override
protected void onEnter(Creature creature)
{
if (!creature.isPlayer())
if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
{
return;
}
@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
}
final Player player = creature.getActingPlayer();
if (player != null)
if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
{
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);

View File

@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
@Override
protected void onEnter(Creature creature)
{
if (!creature.isPlayer())
if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
{
return;
}
@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
}
final Player player = creature.getActingPlayer();
if (player != null)
if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
{
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);

View File

@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
@Override
protected void onEnter(Creature creature)
{
if (!creature.isPlayer())
if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
{
return;
}
@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
}
final Player player = creature.getActingPlayer();
if (player != null)
if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
{
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);

View File

@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
@Override
protected void onEnter(Creature creature)
{
if (!creature.isPlayer())
if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
{
return;
}
@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
}
final Player player = creature.getActingPlayer();
if (player != null)
if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
{
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);

View File

@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
@Override
protected void onEnter(Creature creature)
{
if (!creature.isPlayer())
if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
{
return;
}
@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
}
final Player player = creature.getActingPlayer();
if (player != null)
if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
{
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);

View File

@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
@Override
protected void onEnter(Creature creature)
{
if (!creature.isPlayer())
if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
{
return;
}
@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
}
final Player player = creature.getActingPlayer();
if (player != null)
if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
{
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);

View File

@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
@Override
protected void onEnter(Creature creature)
{
if (!creature.isPlayer())
if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
{
return;
}
@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
}
final Player player = creature.getActingPlayer();
if (player != null)
if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
{
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);

View File

@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
@Override
protected void onEnter(Creature creature)
{
if (!creature.isPlayer())
if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
{
return;
}
@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
}
final Player player = creature.getActingPlayer();
if (player != null)
if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
{
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);