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

Retail flying dismount prohibition.

Browse Source
This commit is contained in:
MobiusDev
2018-05-15 14:15:49 +00:00
parent 64453bb495
commit 7014a1ebed
26 changed files with 527 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -82,6 +82,7 @@ import com.l2jmobius.gameserver.instancemanager.CoupleManager;
import com.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
import com.l2jmobius.gameserver.instancemanager.DimensionalRiftManager;
import com.l2jmobius.gameserver.instancemanager.DuelManager;
import com.l2jmobius.gameserver.instancemanager.FishingZoneManager;
import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import com.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
import com.l2jmobius.gameserver.instancemanager.PlayerCountManager;
@ -541,9 +542,6 @@ public final class L2PcInstance extends L2Playable
/** Store object used to summon the strider you are mounting *. */
private int _mountObjectID = 0;
/** Remember if dismounted from Wyvern **/
private boolean _hasDismountedWyvern = false;
/** The _telemode. */
public int _telemode = 0;
@ -1056,7 +1054,7 @@ public final class L2PcInstance extends L2Playable
// during fall validations will be disabled for 1000 ms.
private static final int FALLING_VALIDATION_DELAY = 1000;
private long _fallingTimestamp = 0;
private volatile int _fallingDamageSum = 0;
private volatile int _fallingDamage = 0;
private Future<?> _fallingDamageTask = null;
/** Previous coordinate sent to party in ValidatePosition *. */
@ -17731,11 +17729,15 @@ public final class L2PcInstance extends L2Playable
*/
public boolean dismount()
{
if (!canDismount())
{
return false;
}
final boolean wasFlying = isFlying();
setMountType(0);
if (wasFlying)
{
_hasDismountedWyvern = true;
removeSkill(SkillTable.getInstance().getInfo(4289, 1));
}
Ride dismount = new Ride(getObjectId(), Ride.ACTION_DISMOUNT, 0);
@ -17745,9 +17747,34 @@ public final class L2PcInstance extends L2Playable
return true;
}
public boolean hasDismountedWyvern()
private boolean canDismount()
{
return _hasDismountedWyvern;
if (FishingZoneManager.getInstance().isInsideWaterZone(getX(), getY(), getZ() - 300) == null)
{
if (!isInWater() && (getZ() > 10000))
{
sendPacket(SystemMessageId.YOU_ARE_NOT_ALLOWED_TO_DISMOUNT_IN_THIS_LOCATION);
sendPacket(ActionFailed.STATIC_PACKET);
return false;
}
if ((GeoData.getInstance().getHeight(getX(), getY(), getZ()) + 300) < getZ())
{
sendPacket(SystemMessageId.YOU_CANNOT_DISMOUNT_FROM_THIS_ELEVATION);
sendPacket(ActionFailed.STATIC_PACKET);
return false;
}
}
else
{
ThreadPool.schedule(() ->
{
if (isInWater())
{
broadcastUserInfo();
}
}, 1500);
}
return true;
}
/**
@ -18457,27 +18484,27 @@ public final class L2PcInstance extends L2Playable
return false;
}
// TODO: Test on retail. Add or set damage?
_fallingDamageSum += (int) Formulas.calcFallDam(this, deltaZ);
if (_fallingDamage == 0)
{
_fallingDamage = (int) Formulas.calcFallDam(this, deltaZ);
}
if (_fallingDamageTask != null)
{
_fallingDamageTask.cancel(true);
}
_fallingDamageTask = ThreadPool.schedule(() ->
{
if ((_fallingDamageSum > 0) && !isInvul())
if ((_fallingDamage > 0) && !isInvul())
{
reduceCurrentHp(Math.min(_fallingDamageSum, getCurrentHp() - 1), null, false);
sendPacket(new SystemMessage(SystemMessageId.FALL_DAMAGE_S1).addNumber(_fallingDamageSum));
reduceCurrentHp(Math.min(_fallingDamage, getCurrentHp() - 1), null, false);
sendPacket(new SystemMessage(SystemMessageId.FALL_DAMAGE_S1).addNumber(_fallingDamage));
}
_hasDismountedWyvern = false;
_fallingDamageSum = 0;
_fallingDamage = 0;
_fallingDamageTask = null;
}, 1500);
if (!_hasDismountedWyvern)
{
sendPacket(new ValidateLocation(this));
}
// Prevent falling under ground.
sendPacket(new ValidateLocation(this));
_fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY;

12
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/SystemMessageId.java
View File

@ -2933,6 +2933,12 @@ public enum SystemMessageId
*/
WOULD_YOU_LIKE_TO_CLOSE_THE_GATE(1141),
/**
* ID: 1158<br>
* Message: You cannot dismount from this elevation.
*/
YOU_CANNOT_DISMOUNT_FROM_THIS_ELEVATION(1158),
/**
* ID: 1176<br>
* Message: This is a quest event period.
@ -3365,6 +3371,12 @@ public enum SystemMessageId
*/
S1_HAS_BECOME_A_PARTY_LEADER(1384),
/**
* ID: 1385<br>
* Message: You are not allowed to dismount at this location.
*/
YOU_ARE_NOT_ALLOWED_TO_DISMOUNT_IN_THIS_LOCATION(1385),
/**
* ID: 1388<br>
* Message: A party room has been created.

6
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
View File

@ -147,11 +147,7 @@ public final class ValidatePosition extends L2GameClientPacket
{
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if (activeChar.hasDismountedWyvern())
{
activeChar.setXYZ(_x, _y, _z);
}
else if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - activeChar.getClientZ()) < 800))
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - activeChar.getClientZ()) < 800))
{
activeChar.setXYZ(realX, realY, _z);
realZ = _z;