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

Previous commit for HighFive branch.

Browse Source
This commit is contained in:
MobiusDev
2017-12-21 00:06:15 +00:00
parent 661ac22cae
commit d5f6591114
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4122,11 +4122,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
// Delete movement data of the L2Character // Delete movement data of the L2Character
_move = null; _move = null;
_cursorKeyMovement = false;
// if (getAI() != null)
// getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
// Set the current position (x,y,z), its current L2WorldRegion if necessary and its heading
// All data are contained in a Location object // All data are contained in a Location object
if (loc != null) if (loc != null)
{ {
@@ -4253,6 +4250,15 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
final int curY = getY(); final int curY = getY();
final int curZ = getZ(); final int curZ = getZ();
// In case of cursor movement, avoid moving through obstacles.
if (_cursorKeyMovement)
{
final Location newDestination = GeoEngine.getInstance().canMoveToTargetLoc(curX, curY, curZ, x, y, z, getInstanceId());
x = newDestination.getX();
y = newDestination.getY();
z = newDestination.getZ();
}
// Calculate distance (dx,dy) between current position and destination // Calculate distance (dx,dy) between current position and destination
// TODO: improve Z axis move/follow support when dx,dy are small compared to dz // TODO: improve Z axis move/follow support when dx,dy are small compared to dz
double dx = (x - curX); double dx = (x - curX);