From 4c6ab9d5943ea8910cd029d77f66afbc3466379a Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 12 Nov 2019 11:01:44 +0000 Subject: [PATCH] Water and Swamp zones should not broadcast info on teleport. Contributed by Sahar. --- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 2 +- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/SwampZone.java | 5 ++++- .../org/l2jmobius/gameserver/model/zone/type/WaterZone.java | 5 ++++- 36 files changed, 141 insertions(+), 36 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index c72e9d8409..3e90f7c42c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index d1c7d64f8b..af2f66cbb0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index c72e9d8409..3e90f7c42c 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index d1c7d64f8b..af2f66cbb0 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index c72e9d8409..3e90f7c42c 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index d1c7d64f8b..af2f66cbb0 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index c72e9d8409..3e90f7c42c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index d1c7d64f8b..af2f66cbb0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index c72e9d8409..3e90f7c42c 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index d1c7d64f8b..af2f66cbb0 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index c72e9d8409..3e90f7c42c 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index d1c7d64f8b..af2f66cbb0 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index c72e9d8409..3e90f7c42c 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index d1c7d64f8b..af2f66cbb0 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index c72e9d8409..3e90f7c42c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index d1c7d64f8b..af2f66cbb0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index 4b25dea770..e8fe49cafc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -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(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index c6d6e4d239..9d6397b91e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index 0a11185d98..ae467dc3bd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index 335d3e851d..b21f72dda3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index 0a11185d98..ae467dc3bd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index 335d3e851d..b21f72dda3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index c72e9d8409..3e90f7c42c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index d1c7d64f8b..af2f66cbb0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index c72e9d8409..3e90f7c42c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index d1c7d64f8b..af2f66cbb0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index c72e9d8409..3e90f7c42c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index d1c7d64f8b..af2f66cbb0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index c72e9d8409..3e90f7c42c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index d1c7d64f8b..af2f66cbb0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index c72e9d8409..3e90f7c42c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index d1c7d64f8b..af2f66cbb0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index c72e9d8409..3e90f7c42c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index d1c7d64f8b..af2f66cbb0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index c72e9d8409..3e90f7c42c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -124,7 +124,10 @@ public class SwampZone extends ZoneType { creature.sendPacket(new OnEventTrigger(_eventId, false)); } - creature.getActingPlayer().broadcastUserInfo(); + if (!creature.isTeleporting()) + { + creature.getActingPlayer().broadcastUserInfo(); + } } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java index d1c7d64f8b..af2f66cbb0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java @@ -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()) {