Water and Swamp zones should not broadcast info on teleport.

Contributed by Sahar.
This commit is contained in:
MobiusDevelopment 2019-11-12 11:01:44 +00:00
parent 0c46db8126
commit 4c6ab9d594
36 changed files with 141 additions and 36 deletions

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -64,7 +64,7 @@ public class SwampZone extends ZoneType
protected void onExit(Creature creature)
{
creature.setInsideZone(ZoneId.SWAMP, false);
if (creature instanceof PlayerInstance)
if (!creature.isTeleporting() && (creature instanceof PlayerInstance))
{
((PlayerInstance) creature).broadcastUserInfo();
}

View File

@ -64,7 +64,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
((PlayerInstance) creature).broadcastUserInfo();
if (!creature.isTeleporting())
{
((PlayerInstance) creature).broadcastUserInfo();
}
}
else if (creature instanceof NpcInstance)
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{

View File

@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
{
creature.sendPacket(new OnEventTrigger(_eventId, false));
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
}
}

View File

@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
{
((PlayerInstance) creature).stopWaterTask();
}
creature.getActingPlayer().broadcastUserInfo();
if (!creature.isTeleporting())
{
creature.getActingPlayer().broadcastUserInfo();
}
}
else if (creature.isNpc())
{