diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/npcinfo.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/npcinfo.htm
index 9955a357a1..ff44a16af7 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/npcinfo.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/npcinfo.htm
@@ -30,7 +30,7 @@
|
Collision Radius: | %collision_radius% |
|
Collision Height: | %collision_height% |
|
-Distance: | 2D: %loc2d%, 3D: %loc3d%, You: %dist% |
|
+Distance: | 2D: %loc2d%, 3D: %loc3d% |
|
|
|
|
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
index c30658f04d..2ee241c765 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
@@ -90,12 +90,13 @@ public class L2NpcActionShift implements IActionShiftHandler
html.replace("%heading%", String.valueOf(npc.getHeading()));
html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius()));
html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight()));
- html.replace("%dist%", String.valueOf((int) activeChar.calculateDistance(target, true, false)));
html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none");
html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue());
html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks());
html.replace("%mpRewardType%", npc.getTemplate().getMpRewardType().name());
html.replace("%mpRewardAffectType%", npc.getTemplate().getMpRewardAffectType().name());
+ html.replace("%loc2d%", String.valueOf((int) activeChar.calculateDistance(npc, false, false)));
+ html.replace("%loc3d%", String.valueOf((int) activeChar.calculateDistance(npc, true, false)));
final AttributeType attackAttribute = npc.getAttackElement();
html.replace("%ele_atk%", attackAttribute.name());
@@ -129,8 +130,6 @@ public class L2NpcActionShift implements IActionShiftHandler
}
html.replace("%spawn%", npc.getSpawn().getX() + " " + npc.getSpawn().getY() + " " + npc.getSpawn().getZ());
- html.replace("%loc2d%", String.valueOf((int) npc.calculateDistance(npc.getSpawn().getLocation(), false, false)));
- html.replace("%loc3d%", String.valueOf((int) npc.calculateDistance(npc.getSpawn().getLocation(), true, false)));
if (npc.getSpawn().getRespawnMinDelay() == 0)
{
html.replace("%resp%", "None");
@@ -147,8 +146,6 @@ public class L2NpcActionShift implements IActionShiftHandler
else
{
html.replace("%spawn%", "null");
- html.replace("%loc2d%", "--");
- html.replace("%loc3d%", "--");
html.replace("%resp%", "--");
}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/npcinfo.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/npcinfo.htm
index 9955a357a1..ff44a16af7 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/npcinfo.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/npcinfo.htm
@@ -30,7 +30,7 @@
|
Collision Radius: | %collision_radius% |
|
Collision Height: | %collision_height% |
|
-Distance: | 2D: %loc2d%, 3D: %loc3d%, You: %dist% |
|
+Distance: | 2D: %loc2d%, 3D: %loc3d% |
|
|
|
|
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
index c30658f04d..2ee241c765 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
@@ -90,12 +90,13 @@ public class L2NpcActionShift implements IActionShiftHandler
html.replace("%heading%", String.valueOf(npc.getHeading()));
html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius()));
html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight()));
- html.replace("%dist%", String.valueOf((int) activeChar.calculateDistance(target, true, false)));
html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none");
html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue());
html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks());
html.replace("%mpRewardType%", npc.getTemplate().getMpRewardType().name());
html.replace("%mpRewardAffectType%", npc.getTemplate().getMpRewardAffectType().name());
+ html.replace("%loc2d%", String.valueOf((int) activeChar.calculateDistance(npc, false, false)));
+ html.replace("%loc3d%", String.valueOf((int) activeChar.calculateDistance(npc, true, false)));
final AttributeType attackAttribute = npc.getAttackElement();
html.replace("%ele_atk%", attackAttribute.name());
@@ -129,8 +130,6 @@ public class L2NpcActionShift implements IActionShiftHandler
}
html.replace("%spawn%", npc.getSpawn().getX() + " " + npc.getSpawn().getY() + " " + npc.getSpawn().getZ());
- html.replace("%loc2d%", String.valueOf((int) npc.calculateDistance(npc.getSpawn().getLocation(), false, false)));
- html.replace("%loc3d%", String.valueOf((int) npc.calculateDistance(npc.getSpawn().getLocation(), true, false)));
if (npc.getSpawn().getRespawnMinDelay() == 0)
{
html.replace("%resp%", "None");
@@ -147,8 +146,6 @@ public class L2NpcActionShift implements IActionShiftHandler
else
{
html.replace("%spawn%", "null");
- html.replace("%loc2d%", "--");
- html.replace("%loc3d%", "--");
html.replace("%resp%", "--");
}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/npcinfo.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/npcinfo.htm
index 9955a357a1..ff44a16af7 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/npcinfo.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/npcinfo.htm
@@ -30,7 +30,7 @@
|
Collision Radius: | %collision_radius% |
|
Collision Height: | %collision_height% |
|
-Distance: | 2D: %loc2d%, 3D: %loc3d%, You: %dist% |
|
+Distance: | 2D: %loc2d%, 3D: %loc3d% |
|
|
|
|
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
index c30658f04d..2ee241c765 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
@@ -90,12 +90,13 @@ public class L2NpcActionShift implements IActionShiftHandler
html.replace("%heading%", String.valueOf(npc.getHeading()));
html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius()));
html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight()));
- html.replace("%dist%", String.valueOf((int) activeChar.calculateDistance(target, true, false)));
html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none");
html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue());
html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks());
html.replace("%mpRewardType%", npc.getTemplate().getMpRewardType().name());
html.replace("%mpRewardAffectType%", npc.getTemplate().getMpRewardAffectType().name());
+ html.replace("%loc2d%", String.valueOf((int) activeChar.calculateDistance(npc, false, false)));
+ html.replace("%loc3d%", String.valueOf((int) activeChar.calculateDistance(npc, true, false)));
final AttributeType attackAttribute = npc.getAttackElement();
html.replace("%ele_atk%", attackAttribute.name());
@@ -129,8 +130,6 @@ public class L2NpcActionShift implements IActionShiftHandler
}
html.replace("%spawn%", npc.getSpawn().getX() + " " + npc.getSpawn().getY() + " " + npc.getSpawn().getZ());
- html.replace("%loc2d%", String.valueOf((int) npc.calculateDistance(npc.getSpawn().getLocation(), false, false)));
- html.replace("%loc3d%", String.valueOf((int) npc.calculateDistance(npc.getSpawn().getLocation(), true, false)));
if (npc.getSpawn().getRespawnMinDelay() == 0)
{
html.replace("%resp%", "None");
@@ -147,8 +146,6 @@ public class L2NpcActionShift implements IActionShiftHandler
else
{
html.replace("%spawn%", "null");
- html.replace("%loc2d%", "--");
- html.replace("%loc3d%", "--");
html.replace("%resp%", "--");
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/npcinfo.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/npcinfo.htm
index 9955a357a1..ff44a16af7 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/npcinfo.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/npcinfo.htm
@@ -30,7 +30,7 @@
|
Collision Radius: | %collision_radius% |
|
Collision Height: | %collision_height% |
|
-Distance: | 2D: %loc2d%, 3D: %loc3d%, You: %dist% |
|
+Distance: | 2D: %loc2d%, 3D: %loc3d% |
|
|
|
|
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
index c30658f04d..2ee241c765 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
@@ -90,12 +90,13 @@ public class L2NpcActionShift implements IActionShiftHandler
html.replace("%heading%", String.valueOf(npc.getHeading()));
html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius()));
html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight()));
- html.replace("%dist%", String.valueOf((int) activeChar.calculateDistance(target, true, false)));
html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none");
html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue());
html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks());
html.replace("%mpRewardType%", npc.getTemplate().getMpRewardType().name());
html.replace("%mpRewardAffectType%", npc.getTemplate().getMpRewardAffectType().name());
+ html.replace("%loc2d%", String.valueOf((int) activeChar.calculateDistance(npc, false, false)));
+ html.replace("%loc3d%", String.valueOf((int) activeChar.calculateDistance(npc, true, false)));
final AttributeType attackAttribute = npc.getAttackElement();
html.replace("%ele_atk%", attackAttribute.name());
@@ -129,8 +130,6 @@ public class L2NpcActionShift implements IActionShiftHandler
}
html.replace("%spawn%", npc.getSpawn().getX() + " " + npc.getSpawn().getY() + " " + npc.getSpawn().getZ());
- html.replace("%loc2d%", String.valueOf((int) npc.calculateDistance(npc.getSpawn().getLocation(), false, false)));
- html.replace("%loc3d%", String.valueOf((int) npc.calculateDistance(npc.getSpawn().getLocation(), true, false)));
if (npc.getSpawn().getRespawnMinDelay() == 0)
{
html.replace("%resp%", "None");
@@ -147,8 +146,6 @@ public class L2NpcActionShift implements IActionShiftHandler
else
{
html.replace("%spawn%", "null");
- html.replace("%loc2d%", "--");
- html.replace("%loc3d%", "--");
html.replace("%resp%", "--");
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/npcinfo.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/npcinfo.htm
index 36bac808f7..45af04b8f2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/npcinfo.htm
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/npcinfo.htm
@@ -28,7 +28,7 @@
|
Collision Radius: | %collision_radius% |
|
Collision Height: | %collision_height% |
|
-Distance: | 2D: %loc2d%, 3D: %loc3d%, You: %dist% |
|
+Distance: | 2D: %loc2d%, 3D: %loc3d% |
|
|
|
|
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
index c1364e6747..6b25a9567f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
@@ -101,7 +101,8 @@ public class L2NpcActionShift implements IActionShiftHandler
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) activeChar.calculateDistance(target, true, false)));
+ html.replace("%loc2d%", String.valueOf((int) activeChar.calculateDistance(target, false, false)));
+ html.replace("%loc3d%", String.valueOf((int) activeChar.calculateDistance(target, true, false)));
final byte attackAttribute = ((L2Character) target).getAttackElement();
html.replace("%ele_atk%", Elementals.getElementName(attackAttribute));
@@ -127,8 +128,6 @@ public class L2NpcActionShift implements IActionShiftHandler
html.replace("%spawntype%", "Fixed");
html.replace("%spawn%", ((L2Npc) target).getSpawn().getX() + " " + ((L2Npc) target).getSpawn().getY() + " " + ((L2Npc) target).getSpawn().getZ());
}
- html.replace("%loc2d%", String.valueOf((int) target.calculateDistance(((L2Npc) target).getSpawn().getLocation(), false, false)));
- html.replace("%loc3d%", String.valueOf((int) target.calculateDistance(((L2Npc) target).getSpawn().getLocation(), true, false)));
if (((L2Npc) target).getSpawn().getRespawnMinDelay() == 0)
{
html.replace("%resp%", "None");
@@ -151,8 +150,6 @@ public class L2NpcActionShift implements IActionShiftHandler
html.replace("%territory%", "--");
html.replace("%spawntype%", "--");
html.replace("%spawn%", "null");
- html.replace("%loc2d%", "--");
- html.replace("%loc3d%", "--");
html.replace("%resp%", "--");
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/npcinfo.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/npcinfo.htm
index 9955a357a1..ff44a16af7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/npcinfo.htm
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/npcinfo.htm
@@ -30,7 +30,7 @@
|
Collision Radius: | %collision_radius% |
|
Collision Height: | %collision_height% |
|
-Distance: | 2D: %loc2d%, 3D: %loc3d%, You: %dist% |
|
+Distance: | 2D: %loc2d%, 3D: %loc3d% |
|
|
|
|
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
index c30658f04d..2ee241c765 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
@@ -90,12 +90,13 @@ public class L2NpcActionShift implements IActionShiftHandler
html.replace("%heading%", String.valueOf(npc.getHeading()));
html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius()));
html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight()));
- html.replace("%dist%", String.valueOf((int) activeChar.calculateDistance(target, true, false)));
html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none");
html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue());
html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks());
html.replace("%mpRewardType%", npc.getTemplate().getMpRewardType().name());
html.replace("%mpRewardAffectType%", npc.getTemplate().getMpRewardAffectType().name());
+ html.replace("%loc2d%", String.valueOf((int) activeChar.calculateDistance(npc, false, false)));
+ html.replace("%loc3d%", String.valueOf((int) activeChar.calculateDistance(npc, true, false)));
final AttributeType attackAttribute = npc.getAttackElement();
html.replace("%ele_atk%", attackAttribute.name());
@@ -129,8 +130,6 @@ public class L2NpcActionShift implements IActionShiftHandler
}
html.replace("%spawn%", npc.getSpawn().getX() + " " + npc.getSpawn().getY() + " " + npc.getSpawn().getZ());
- html.replace("%loc2d%", String.valueOf((int) npc.calculateDistance(npc.getSpawn().getLocation(), false, false)));
- html.replace("%loc3d%", String.valueOf((int) npc.calculateDistance(npc.getSpawn().getLocation(), true, false)));
if (npc.getSpawn().getRespawnMinDelay() == 0)
{
html.replace("%resp%", "None");
@@ -147,8 +146,6 @@ public class L2NpcActionShift implements IActionShiftHandler
else
{
html.replace("%spawn%", "null");
- html.replace("%loc2d%", "--");
- html.replace("%loc3d%", "--");
html.replace("%resp%", "--");
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/npcinfo.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/npcinfo.htm
index 9955a357a1..ff44a16af7 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/npcinfo.htm
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/npcinfo.htm
@@ -30,7 +30,7 @@
|
Collision Radius: | %collision_radius% |
|
Collision Height: | %collision_height% |
|
-Distance: | 2D: %loc2d%, 3D: %loc3d%, You: %dist% |
|
+Distance: | 2D: %loc2d%, 3D: %loc3d% |
|
|
|
|
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
index c30658f04d..2ee241c765 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
@@ -90,12 +90,13 @@ public class L2NpcActionShift implements IActionShiftHandler
html.replace("%heading%", String.valueOf(npc.getHeading()));
html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius()));
html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight()));
- html.replace("%dist%", String.valueOf((int) activeChar.calculateDistance(target, true, false)));
html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none");
html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue());
html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks());
html.replace("%mpRewardType%", npc.getTemplate().getMpRewardType().name());
html.replace("%mpRewardAffectType%", npc.getTemplate().getMpRewardAffectType().name());
+ html.replace("%loc2d%", String.valueOf((int) activeChar.calculateDistance(npc, false, false)));
+ html.replace("%loc3d%", String.valueOf((int) activeChar.calculateDistance(npc, true, false)));
final AttributeType attackAttribute = npc.getAttackElement();
html.replace("%ele_atk%", attackAttribute.name());
@@ -129,8 +130,6 @@ public class L2NpcActionShift implements IActionShiftHandler
}
html.replace("%spawn%", npc.getSpawn().getX() + " " + npc.getSpawn().getY() + " " + npc.getSpawn().getZ());
- html.replace("%loc2d%", String.valueOf((int) npc.calculateDistance(npc.getSpawn().getLocation(), false, false)));
- html.replace("%loc3d%", String.valueOf((int) npc.calculateDistance(npc.getSpawn().getLocation(), true, false)));
if (npc.getSpawn().getRespawnMinDelay() == 0)
{
html.replace("%resp%", "None");
@@ -147,8 +146,6 @@ public class L2NpcActionShift implements IActionShiftHandler
else
{
html.replace("%spawn%", "null");
- html.replace("%loc2d%", "--");
- html.replace("%loc3d%", "--");
html.replace("%resp%", "--");
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/npcinfo.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/npcinfo.htm
index 9955a357a1..ff44a16af7 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/npcinfo.htm
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/npcinfo.htm
@@ -30,7 +30,7 @@
|
Collision Radius: | %collision_radius% |
|
Collision Height: | %collision_height% |
|
-Distance: | 2D: %loc2d%, 3D: %loc3d%, You: %dist% |
|
+Distance: | 2D: %loc2d%, 3D: %loc3d% |
|
|
|
|
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
index c30658f04d..2ee241c765 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
@@ -90,12 +90,13 @@ public class L2NpcActionShift implements IActionShiftHandler
html.replace("%heading%", String.valueOf(npc.getHeading()));
html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius()));
html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight()));
- html.replace("%dist%", String.valueOf((int) activeChar.calculateDistance(target, true, false)));
html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none");
html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue());
html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks());
html.replace("%mpRewardType%", npc.getTemplate().getMpRewardType().name());
html.replace("%mpRewardAffectType%", npc.getTemplate().getMpRewardAffectType().name());
+ html.replace("%loc2d%", String.valueOf((int) activeChar.calculateDistance(npc, false, false)));
+ html.replace("%loc3d%", String.valueOf((int) activeChar.calculateDistance(npc, true, false)));
final AttributeType attackAttribute = npc.getAttackElement();
html.replace("%ele_atk%", attackAttribute.name());
@@ -129,8 +130,6 @@ public class L2NpcActionShift implements IActionShiftHandler
}
html.replace("%spawn%", npc.getSpawn().getX() + " " + npc.getSpawn().getY() + " " + npc.getSpawn().getZ());
- html.replace("%loc2d%", String.valueOf((int) npc.calculateDistance(npc.getSpawn().getLocation(), false, false)));
- html.replace("%loc3d%", String.valueOf((int) npc.calculateDistance(npc.getSpawn().getLocation(), true, false)));
if (npc.getSpawn().getRespawnMinDelay() == 0)
{
html.replace("%resp%", "None");
@@ -147,8 +146,6 @@ public class L2NpcActionShift implements IActionShiftHandler
else
{
html.replace("%spawn%", "null");
- html.replace("%loc2d%", "--");
- html.replace("%loc3d%", "--");
html.replace("%resp%", "--");
}