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

Player moving on ledges check replaced by combined Water-Castle check.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-02-07 01:26:07 +02:00
parent 2a8040a745
commit 4c1957ff3d
31 changed files with 144 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -4996,18 +4996,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
double dx = m._xDestination - m._xAccurate;
double dy = m._yDestination - m._yAccurate;
double dz = m._zDestination - zPrev; // Z coordinate will follow client values
float speed;
if (this instanceof Boat)
{
speed = ((Boat) this).boatSpeed;
}
else
{
speed = getStat().getMoveSpeed();
}
if (isPlayer())
if (isPlayer() && !_isFlying)
{
// In case of cursor movement, avoid moving through obstacles.
if (_cursorKeyMovement)
@@ -5083,37 +5072,31 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
}
}
}
// Prevent player moving on ledges.
if ((dz > 180) && (distance < 300))
{
_move.onGeodataPathIndex = -1;
if (hasAI() && getAI().isFollowing())
{
getAI().stopFollow();
}
stopMove(null);
return false;
}
}
}
double distFraction;
final double distPassed = (speed * (gameTicks - m._moveTimestamp)) / GameTimeTaskManager.TICKS_PER_SECOND;
if ((((dx * dx) + (dy * dy)) < 10000) && ((dz * dz) > 2500)) // close enough, allows error between client and server geodata if it cannot be avoided
double delta = (dx * dx) + (dy * dy);
final boolean isFloating = _isFlying || (isInsideZone(ZoneId.WATER) && !isInsideZone(ZoneId.CASTLE));
if (!isFloating && (delta < 10000) && ((dz * dz) > 2500)) // Close enough, allows error between client and server geodata if it cannot be avoided.
{
distFraction = distPassed / Math.sqrt((dx * dx) + (dy * dy));
delta = Math.sqrt(delta);
}
else
{
distFraction = distPassed / Math.sqrt((dx * dx) + (dy * dy) + (dz * dz));
delta = Math.sqrt(delta + (dz * dz));
}
double distFraction = Double.MAX_VALUE;
if (delta > 1)
{
final double distPassed = (_stat.getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeTaskManager.TICKS_PER_SECOND;
distFraction = distPassed / delta;
}
if (distFraction > 1)
{
// Set the position of the Creature to the destination
super.setXYZ(m._xDestination, m._yDestination, m._zDestination);
if (isBoat())
{
((Boat) this).updatePeopleInTheBoat(m._xDestination, m._yDestination, m._zDestination);
@@ -5352,7 +5335,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
final int curZ = getZ();
// Mobius: Fix for teleporting on top of catacomb entrances.
final boolean isInWater = isInsideZone(ZoneId.WATER);
final boolean isInWater = isInsideZone(ZoneId.WATER) && !isInsideZone(ZoneId.CASTLE);
if (isInWater && (z > curZ))
{
z = Math.max(z - 500, curZ);