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

MagicSkill packet related cleanups.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-12-24 22:03:24 +00:00
parent 4632ecc3a8
commit 0ab71457ca
161 changed files with 1316 additions and 1658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -4034,7 +4034,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
/**
* Abort the cast of the Creature and send Server->Client MagicSkillCanceld/ActionFailed packet.
* Abort the cast of the Creature and send Server->Client MagicSkillCanceled/ActionFailed packet.
*/
public void abortCast()
{
@@ -5098,7 +5098,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// damage can only cancel magical & static skills
if (_isCastingNow && canAbortCast() && (_lastSkillCast != null) && (_lastSkillCast.isMagic() || _lastSkillCast.isStatic()))
{
// Abort the cast of the Creature and send Server->Client MagicSkillCanceld/ActionFailed packet.
// Abort the cast of the Creature and send Server->Client MagicSkillCanceled/ActionFailed packet.
abortCast();
if (isPlayer())

30
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java
View File

@@ -16,18 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.interfaces.IPositionable;
import org.l2jmobius.gameserver.network.ServerPackets;
/**
* MagicSkillUse server packet implementation.
* @author UnAfraid, NosBit
* @author UnAfraid, NosBit, Mobius
*/
public class MagicSkillUse extends ServerPacket
{
@@ -37,19 +32,18 @@ public class MagicSkillUse extends ServerPacket
private final int _reuseDelay;
private final Creature _creature;
private final Creature _target;
private final List<Integer> _unknown = Collections.emptyList();
private final List<Location> _groundLocations;
private final Location _groundLocation;
public MagicSkillUse(Creature creature, Creature target, int skillId, int skillLevel, int hitTime, int reuseDelay)
{
super(55);
super(67);
_creature = creature;
_target = target;
_skillId = skillId;
_skillLevel = skillLevel;
_hitTime = hitTime;
_reuseDelay = reuseDelay;
_groundLocations = creature.isPlayer() && (creature.getActingPlayer().getCurrentSkillWorldPosition() != null) ? Arrays.asList(creature.getActingPlayer().getCurrentSkillWorldPosition()) : Collections.<Location> emptyList();
_groundLocation = creature.isPlayer() ? creature.getActingPlayer().getCurrentSkillWorldPosition() : null;
}
public MagicSkillUse(Creature creature, int skillId, int skillLevel, int hitTime, int reuseDelay)
@@ -70,17 +64,17 @@ public class MagicSkillUse extends ServerPacket
writeInt(_creature.getX());
writeInt(_creature.getY());
writeInt(_creature.getZ());
writeShort(_unknown.size()); // TODO: Implement me!
for (int unknown : _unknown)
writeShort(0); // isGroundTargetSkill ? 65535 : 0
if (_groundLocation == null)
{
writeShort(unknown);
writeShort(0);
}
writeShort(_groundLocations.size());
for (IPositionable target : _groundLocations)
else
{
writeInt(target.getX());
writeInt(target.getY());
writeInt(target.getZ());
writeShort(1);
writeInt(_groundLocation.getX());
writeInt(_groundLocation.getY());
writeInt(_groundLocation.getZ());
}
writeInt(_target.getX());
writeInt(_target.getY());