Water and Swamp zones should not broadcast info on teleport.
Contributed by Sahar.
This commit is contained in:
parent
0c46db8126
commit
4c6ab9d594
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -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();
|
||||
}
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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())
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user