Fixed pull effect broadcast validateposition to owner.
Contributed by Sahar.
This commit is contained in:
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -614,6 +614,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4188,14 +4188,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -614,6 +614,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4194,14 +4194,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -614,6 +614,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4196,14 +4196,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -614,6 +614,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4192,14 +4192,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -614,6 +614,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4171,14 +4171,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -614,6 +614,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4171,14 +4171,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -614,6 +614,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4172,14 +4172,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -614,6 +614,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4102,14 +4102,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -614,6 +614,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4106,14 +4106,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -614,6 +614,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4146,14 +4146,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -614,6 +614,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4146,14 +4146,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+5
@@ -614,6 +614,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4130,14 +4130,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+5
@@ -615,6 +615,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4141,14 +4141,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+5
@@ -615,6 +615,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4141,14 +4141,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+5
@@ -615,6 +615,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4060,14 +4060,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -614,6 +614,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4148,14 +4148,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -77,7 +77,7 @@ public class PullBack extends AbstractEffect
|
|||||||
{
|
{
|
||||||
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
effected.broadcastPacket(new FlyToLocation(effected, effector, _type, _speed, _delay, _animationSpeed));
|
||||||
effected.setXYZ(effector);
|
effected.setXYZ(effector);
|
||||||
effected.broadcastPacket(new ValidateLocation(effected));
|
effected.broadcastPacket(new ValidateLocation(effected), false);
|
||||||
effected.revalidateZone(true);
|
effected.revalidateZone(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+5
@@ -615,6 +615,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
* @param mov
|
* @param mov
|
||||||
*/
|
*/
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov)
|
||||||
|
{
|
||||||
|
broadcastPacket(mov, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -4128,14 +4128,17 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
if (mov instanceof CharInfo)
|
if (mov instanceof CharInfo)
|
||||||
{
|
{
|
||||||
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
new IllegalArgumentException("CharInfo is being send via broadcastPacket. Do NOT do that! Use broadcastCharInfo() instead.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeSelf)
|
||||||
|
{
|
||||||
sendPacket(mov);
|
sendPacket(mov);
|
||||||
|
}
|
||||||
|
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class TrapInstance extends Npc
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastPacket(IClientOutgoingPacket mov)
|
public void broadcastPacket(IClientOutgoingPacket mov, boolean includeSelf)
|
||||||
{
|
{
|
||||||
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user