zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-07-20 17:45:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

add ion's fix for BattleActionX10Packet crashing client

Browse source 
- add blizzara spell lua
This commit is contained in:
Tahir Akhlaq 2017-08-26 06:47:07 +01:00
parent 9024f3fad6
commit 1ae15df64c
9 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
FFXIVClassic Map Server/actors/chara/ai/state/MagicState.cs
View file

@ -32,8 +32,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
// todo: Azia can fix, check the recast time and send error
OnStart();
}
if (interrupt || errorPacket != null)
else if (interrupt || errorPacket != null)
{
if (owner is Player && errorPacket != null)
((Player)owner).QueuePacket(errorPacket);
@ -50,7 +49,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
if (returnCode != 0)
{
interrupt = true;
errorPacket = BattleActionX01Packet.BuildPacket(owner.actorId, owner.actorId, owner.actorId, 0, 0, (ushort)(returnCode == -1 ? 32539 : returnCode), spell.id, 0, 1);
errorPacket = BattleActionX01Packet.BuildPacket(owner.actorId, owner.actorId, owner.actorId, 0, 0, (ushort)(returnCode == -1 ? 32558 : returnCode), spell.id, 0, 1);
}
else
{
@ -120,9 +119,9 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
action.amount = (ushort)lua.LuaEngine.CallLuaAbilityFunction(owner, spell, "spells", "onSpellFinish", owner, chara, spell, action);
actions[i++] = action;
packets.Add(BattleActionX01Packet.BuildPacket(chara.actorId, owner.actorId, action.targetId, spell.battleAnimation, action.effectId, action.worldMasterTextId, spell.id, action.amount, action.param));
//packets.Add(BattleActionX01Packet.BuildPacket(chara.actorId, owner.actorId, action.targetId, spell.battleAnimation, action.effectId, action.worldMasterTextId, spell.id, action.amount, action.param));
}
//packets.Add(BattleActionX10Packet.BuildPacket(player.actorId, owner.actorId, spell.battleAnimation, spell.id, actions));
packets.Add(BattleActionX10Packet.BuildPacket(owner.target.actorId, owner.actorId, spell.battleAnimation, spell.id, actions));
owner.zone.BroadcastPacketsAroundActor(owner, packets);
}