cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up the emotes code.

Browse Source
This commit is contained in:
Filip Maj
2017-06-15 00:19:18 -04:00
parent 0e8de966a9
commit 1d9f57a385
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FFXIVClassic Map Server/actors/chara/player/Player.cs
View File

@@ -771,9 +771,9 @@ namespace FFXIVClassic_Map_Server.Actors
return mountState;
}
public void DoEmote(uint animId, uint descId)
public void DoEmote(uint targettedActor, uint animId, uint descId)
{
BroadcastPacket(ActorDoEmotePacket.BuildPacket(actorId, actorId, currentTarget, animId, descId), true);
BroadcastPacket(ActorDoEmotePacket.BuildPacket(actorId, actorId, targettedActor, animId, descId), true);
}
public void SendGameMessage(Actor sourceActor, Actor textIdOwner, ushort textId, byte log, params object[] msgParams)

10
FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs
View File

@@ -14,16 +14,18 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
{
byte[] data = new byte[PACKET_SIZE - 0x20];
if (targettedActorId == 0xC0000000)
if (targettedActorId == 0)
{
targettedActorId = sourceActorId;
if (descriptionId != 10105)
descriptionId++;
}
using (MemoryStream mem = new MemoryStream(data))
{
using (BinaryWriter binWriter = new BinaryWriter(mem))
{
uint realAnimID = 0x5000000 | (animationId << 12);
if (descriptionId != 10105 && targettedActorId == sourceActorId)
descriptionId++;
uint realAnimID = 0x5000000 | (animationId << 12);
binWriter.Write((UInt32)realAnimID);
binWriter.Write((UInt32)targettedActorId);
binWriter.Write((UInt32)descriptionId);