lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor L2Character moveToNextRoutePoint improvements.

Browse Source
This commit is contained in:
MobiusDev
2018-06-07 15:17:42 +00:00
parent 2c2b31dee5
commit 04160e3878
8 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -3447,6 +3447,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return false; return false;
} }
// Get current position of the L2Character
final int curX = getX();
final int curY = getY();
// Create and Init a MoveData object // Create and Init a MoveData object
final MoveData m = new MoveData(); final MoveData m = new MoveData();
@@ -3471,11 +3475,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ(); m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ();
} }
double distance = Math.hypot(m._xDestination - super.getX(), m._yDestination - super.getY()); final double distance = Math.hypot(m._xDestination - curX, m._yDestination - curY);
// Calculate and set the heading of the L2Character // Calculate and set the heading of the L2Character
if (distance != 0) if (distance != 0)
{ {
setHeading(Util.calculateHeadingFrom(getX(), getY(), m._xDestination, m._yDestination)); setHeading(Util.calculateHeadingFrom(curX, curY, m._xDestination, m._yDestination));
} }
// Caclulate the Nb of ticks between the current position and the destination // Caclulate the Nb of ticks between the current position and the destination

8
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -3447,6 +3447,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return false; return false;
} }
// Get current position of the L2Character
final int curX = getX();
final int curY = getY();
// Create and Init a MoveData object // Create and Init a MoveData object
final MoveData m = new MoveData(); final MoveData m = new MoveData();
@@ -3471,11 +3475,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ(); m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ();
} }
double distance = Math.hypot(m._xDestination - super.getX(), m._yDestination - super.getY()); final double distance = Math.hypot(m._xDestination - curX, m._yDestination - curY);
// Calculate and set the heading of the L2Character // Calculate and set the heading of the L2Character
if (distance != 0) if (distance != 0)
{ {
setHeading(Util.calculateHeadingFrom(getX(), getY(), m._xDestination, m._yDestination)); setHeading(Util.calculateHeadingFrom(curX, curY, m._xDestination, m._yDestination));
} }
// Caclulate the Nb of ticks between the current position and the destination // Caclulate the Nb of ticks between the current position and the destination

8
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -3447,6 +3447,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return false; return false;
} }
// Get current position of the L2Character
final int curX = getX();
final int curY = getY();
// Create and Init a MoveData object // Create and Init a MoveData object
final MoveData m = new MoveData(); final MoveData m = new MoveData();
@@ -3471,11 +3475,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ(); m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ();
} }
double distance = Math.hypot(m._xDestination - super.getX(), m._yDestination - super.getY()); final double distance = Math.hypot(m._xDestination - curX, m._yDestination - curY);
// Calculate and set the heading of the L2Character // Calculate and set the heading of the L2Character
if (distance != 0) if (distance != 0)
{ {
setHeading(Util.calculateHeadingFrom(getX(), getY(), m._xDestination, m._yDestination)); setHeading(Util.calculateHeadingFrom(curX, curY, m._xDestination, m._yDestination));
} }
// Caclulate the Nb of ticks between the current position and the destination // Caclulate the Nb of ticks between the current position and the destination

8
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -3447,6 +3447,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return false; return false;
} }
// Get current position of the L2Character
final int curX = getX();
final int curY = getY();
// Create and Init a MoveData object // Create and Init a MoveData object
final MoveData m = new MoveData(); final MoveData m = new MoveData();
@@ -3471,11 +3475,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ(); m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ();
} }
double distance = Math.hypot(m._xDestination - super.getX(), m._yDestination - super.getY()); final double distance = Math.hypot(m._xDestination - curX, m._yDestination - curY);
// Calculate and set the heading of the L2Character // Calculate and set the heading of the L2Character
if (distance != 0) if (distance != 0)
{ {
setHeading(Util.calculateHeadingFrom(getX(), getY(), m._xDestination, m._yDestination)); setHeading(Util.calculateHeadingFrom(curX, curY, m._xDestination, m._yDestination));
} }
// Caclulate the Nb of ticks between the current position and the destination // Caclulate the Nb of ticks between the current position and the destination

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -4463,6 +4463,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return false; return false;
} }
// Get current position of the L2Character
final int curX = getX();
final int curY = getY();
// Create and Init a MoveData object // Create and Init a MoveData object
final MoveData m = new MoveData(); final MoveData m = new MoveData();
@@ -4487,11 +4491,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ(); m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ();
} }
double distance = Math.hypot(m._xDestination - super.getX(), m._yDestination - super.getY()); final double distance = Math.hypot(m._xDestination - curX, m._yDestination - curY);
// Calculate and set the heading of the L2Character // Calculate and set the heading of the L2Character
if (distance != 0) if (distance != 0)
{ {
setHeading(Util.calculateHeadingFrom(getX(), getY(), m._xDestination, m._yDestination)); setHeading(Util.calculateHeadingFrom(curX, curY, m._xDestination, m._yDestination));
} }
// Caclulate the Nb of ticks between the current position and the destination // Caclulate the Nb of ticks between the current position and the destination

8
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -3447,6 +3447,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return false; return false;
} }
// Get current position of the L2Character
final int curX = getX();
final int curY = getY();
// Create and Init a MoveData object // Create and Init a MoveData object
final MoveData m = new MoveData(); final MoveData m = new MoveData();
@@ -3471,11 +3475,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ(); m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ();
} }
double distance = Math.hypot(m._xDestination - super.getX(), m._yDestination - super.getY()); final double distance = Math.hypot(m._xDestination - curX, m._yDestination - curY);
// Calculate and set the heading of the L2Character // Calculate and set the heading of the L2Character
if (distance != 0) if (distance != 0)
{ {
setHeading(Util.calculateHeadingFrom(getX(), getY(), m._xDestination, m._yDestination)); setHeading(Util.calculateHeadingFrom(curX, curY, m._xDestination, m._yDestination));
} }
// Caclulate the Nb of ticks between the current position and the destination // Caclulate the Nb of ticks between the current position and the destination

8
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -3447,6 +3447,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return false; return false;
} }
// Get current position of the L2Character
final int curX = getX();
final int curY = getY();
// Create and Init a MoveData object // Create and Init a MoveData object
final MoveData m = new MoveData(); final MoveData m = new MoveData();
@@ -3471,11 +3475,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ(); m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ();
} }
double distance = Math.hypot(m._xDestination - super.getX(), m._yDestination - super.getY()); final double distance = Math.hypot(m._xDestination - curX, m._yDestination - curY);
// Calculate and set the heading of the L2Character // Calculate and set the heading of the L2Character
if (distance != 0) if (distance != 0)
{ {
setHeading(Util.calculateHeadingFrom(getX(), getY(), m._xDestination, m._yDestination)); setHeading(Util.calculateHeadingFrom(curX, curY, m._xDestination, m._yDestination));
} }
// Caclulate the Nb of ticks between the current position and the destination // Caclulate the Nb of ticks between the current position and the destination

8
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -3447,6 +3447,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return false; return false;
} }
// Get current position of the L2Character
final int curX = getX();
final int curY = getY();
// Create and Init a MoveData object // Create and Init a MoveData object
final MoveData m = new MoveData(); final MoveData m = new MoveData();
@@ -3471,11 +3475,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ(); m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ();
} }
double distance = Math.hypot(m._xDestination - super.getX(), m._yDestination - super.getY()); final double distance = Math.hypot(m._xDestination - curX, m._yDestination - curY);
// Calculate and set the heading of the L2Character // Calculate and set the heading of the L2Character
if (distance != 0) if (distance != 0)
{ {
setHeading(Util.calculateHeadingFrom(getX(), getY(), m._xDestination, m._yDestination)); setHeading(Util.calculateHeadingFrom(curX, curY, m._xDestination, m._yDestination));
} }
// Caclulate the Nb of ticks between the current position and the destination // Caclulate the Nb of ticks between the current position and the destination