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

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

@@ -107,7 +107,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ChangeMoveType;
import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType;
import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadSpelledInfo;
import org.l2jmobius.gameserver.network.serverpackets.MagicEffectIcons;
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.MoveToLocation;
@@ -4899,7 +4899,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
}
/**
* 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()
{
@@ -4907,7 +4907,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
}
/**
* 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.
* @param force the force
*/
public void abortCast(boolean force)
@@ -4940,7 +4940,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
getAI().notifyEvent(CtrlEvent.EVT_FINISH_CASTING); // setting back previous intention
}
broadcastPacket(new MagicSkillCanceld(getObjectId())); // broadcast packet to stop animations client-side
broadcastPacket(new MagicSkillCanceled(getObjectId())); // broadcast packet to stop animations client-side
sendPacket(ActionFailed.STATIC_PACKET); // send an "action failed" packet to the caster
}
}
@@ -6165,7 +6165,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
// damage can only cancel magical skills
if (isCastingNow() && canAbortCast() && (_lastSkillCast != null) && _lastSkillCast.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.
abortCast();
if (this instanceof Player)

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -193,7 +193,7 @@ import org.l2jmobius.gameserver.network.serverpackets.HennaInfo;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.ItemList;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillCanceld;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillCanceled;
import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.NpcInfo;
@@ -7113,7 +7113,7 @@ public class Player extends Playable
* <b><u>Actions</u>:</b><br>
* <li>Set the Intention of the AI to AI_INTENTION_IDLE</li>
* <li>Enable all skills (set _allSkillsDisabled to False)</li>
* <li>Send a Server->Client Packet MagicSkillCanceld to the Player and all Player in the _KnownPlayers of the Creature (broadcast)</li>
* <li>Send a Server->Client Packet MagicSkillCanceled to the Player and all Player in the _KnownPlayers of the Creature (broadcast)</li>
*/
public void cancelCastMagic()
{
@@ -7123,10 +7123,10 @@ public class Player extends Playable
// Enable all skills (set _allSkillsDisabled to False)
enableAllSkills();
// Send a Server->Client Packet MagicSkillCanceld to the Player and all Player in the _KnownPlayers of the Creature (broadcast)
// Send a Server->Client Packet MagicSkillCanceled to the Player and all Player in the _KnownPlayers of the Creature (broadcast)
// Broadcast the packet to self and known players.
Broadcast.toSelfAndKnownPlayersInRadius(this, new MagicSkillCanceld(getObjectId()), 810000/* 900 */);
Broadcast.toSelfAndKnownPlayersInRadius(this, new MagicSkillCanceled(getObjectId()), 810000/* 900 */);
}
/**

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java → L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceled.java
View File

@@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @version $Revision: 1.2.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
public class MagicSkillCanceld extends ServerPacket
public class MagicSkillCanceled extends ServerPacket
{
private final int _objectId;
public MagicSkillCanceld(int objectId)
public MagicSkillCanceled(int objectId)
{
_objectId = objectId;
}