Water and Swamp zones should not broadcast info on teleport.
Contributed by Sahar.
This commit is contained in:
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -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,8 +64,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
((PlayerInstance) creature).broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature instanceof NpcInstance)
|
||||
{
|
||||
Collection<PlayerInstance> plrs = creature.getKnownList().getKnownPlayers().values();
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
@@ -124,10 +124,13 @@ public class SwampZone extends ZoneType
|
||||
{
|
||||
creature.sendPacket(new OnEventTrigger(_eventId, false));
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double getMoveBonus()
|
||||
{
|
||||
|
@@ -84,8 +84,11 @@ public class WaterZone extends ZoneType
|
||||
{
|
||||
((PlayerInstance) creature).stopWaterTask();
|
||||
}
|
||||
if (!creature.isTeleporting())
|
||||
{
|
||||
creature.getActingPlayer().broadcastUserInfo();
|
||||
}
|
||||
}
|
||||
else if (creature.isNpc())
|
||||
{
|
||||
World.getInstance().forEachVisibleObject(creature, PlayerInstance.class, player ->
|
||||
|
Reference in New Issue
Block a user