|
@@ -100,7 +100,7 @@ public class L2NpcActionShift implements IActionHandler
|
|
|
html.replace("%heading%", String.valueOf(((L2Character) target).getHeading()));
|
|
|
html.replace("%collision_radius%", String.valueOf(((L2Character) target).getTemplate().getfCollisionRadius()));
|
|
|
html.replace("%collision_height%", String.valueOf(((L2Character) target).getTemplate().getfCollisionHeight()));
|
|
|
- html.replace("%dist%", String.valueOf((int) Math.sqrt(activeChar.getDistanceSq(target))));
|
|
|
+ html.replace("%dist%", String.valueOf((int) activeChar.calculateDistance(target, true, false)));
|
|
|
|
|
|
byte attackAttribute = ((L2Character) target).getAttackElement();
|
|
|
html.replace("%ele_atk%", Elementals.getElementName(attackAttribute));
|
|
@@ -115,8 +115,8 @@ public class L2NpcActionShift implements IActionHandler
|
|
|
if (((L2Npc) target).getSpawn() != null)
|
|
|
{
|
|
|
html.replace("%spawn%", ((L2Npc) target).getSpawn().getX() + " " + ((L2Npc) target).getSpawn().getY() + " " + ((L2Npc) target).getSpawn().getZ());
|
|
|
- html.replace("%loc2d%", String.valueOf((int) Math.sqrt(((L2Character) target).getPlanDistanceSq(((L2Npc) target).getSpawn().getX(), ((L2Npc) target).getSpawn().getY()))));
|
|
|
- html.replace("%loc3d%", String.valueOf((int) Math.sqrt(((L2Character) target).getDistanceSq(((L2Npc) target).getSpawn().getX(), ((L2Npc) target).getSpawn().getY(), ((L2Npc) target).getSpawn().getZ()))));
|
|
|
+ html.replace("%loc2d%", String.valueOf((int) target.calculateDistance(((L2Npc) target).getSpawn(), false, false)));
|
|
|
+ html.replace("%loc3d%", String.valueOf((int) target.calculateDistance(((L2Npc) target).getSpawn(), true, false)));
|
|
|
if (((L2Npc) target).getSpawn().getRespawnMinDelay() == 0)
|
|
|
{
|
|
|
html.replace("%resp%", "None");
|