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

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -4098,7 +4098,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
final SkillCaster skillCaster = getSkillCaster(SkillCaster::isAnyNormalType);
if ((skillCaster != null) && skillCaster.getSkill().isMagic())
{
// 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.
skillCaster.stopCasting(true);
if (isPlayer())

4
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
View File

@@ -73,7 +73,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExRotation;
import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillCanceld;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillCanceled;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import org.l2jmobius.gameserver.network.serverpackets.MoveToPawn;
@@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
// If aborted, broadcast casting aborted.
if (aborted)
{
caster.broadcastPacket(new MagicSkillCanceld(caster.getObjectId())); // broadcast packet to stop animations client-side
caster.broadcastPacket(new MagicSkillCanceled(caster.getObjectId())); // broadcast packet to stop animations client-side
caster.sendPacket(ActionFailed.get(_castingType)); // send an "action failed" packet to the caster
}

4
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java → L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceled.java
View File

@@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.gameserver.network.ServerPackets;
public class MagicSkillCanceld extends ServerPacket
public class MagicSkillCanceled extends ServerPacket
{
private final int _objectId;
public MagicSkillCanceld(int objectId)
public MagicSkillCanceled(int objectId)
{
_objectId = objectId;
}

40
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java
View File

@@ -16,21 +16,15 @@
*/
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.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.interfaces.IPositionable;
import org.l2jmobius.gameserver.model.skill.SkillCastingType;
import org.l2jmobius.gameserver.network.ServerPackets;
/**
* MagicSkillUse server packet implementation.
* @author UnAfraid, NosBit
* @author UnAfraid, NosBit, Mobius
*/
public class MagicSkillUse extends ServerPacket
{
@@ -43,12 +37,11 @@ public class MagicSkillUse extends ServerPacket
private final SkillCastingType _castingType; // Defines which client bar is going to use.
private final Creature _creature;
private final WorldObject _target;
private final List<Integer> _unknown = Collections.emptyList();
private final List<Location> _groundLocations;
private final Location _groundLocation;
public MagicSkillUse(Creature creature, WorldObject target, int skillId, int skillLevel, int hitTime, int reuseDelay, int reuseGroup, int actionId, SkillCastingType castingType)
{
super(75);
super(83);
_creature = creature;
_target = target;
_skillId = skillId;
@@ -58,16 +51,7 @@ public class MagicSkillUse extends ServerPacket
_reuseDelay = reuseDelay;
_actionId = actionId;
_castingType = castingType;
Location skillWorldPos = null;
if (creature.isPlayer())
{
final Player player = creature.getActingPlayer();
if (player.getCurrentSkillWorldPosition() != null)
{
skillWorldPos = player.getCurrentSkillWorldPosition();
}
}
_groundLocations = skillWorldPos != null ? Arrays.asList(skillWorldPos) : Collections.emptyList();
_groundLocation = creature.isPlayer() ? creature.getActingPlayer().getCurrentSkillWorldPosition() : null;
}
public MagicSkillUse(Creature creature, WorldObject target, int skillId, int skillLevel, int hitTime, int reuseDelay)
@@ -95,17 +79,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());