mirror of
https://bitbucket.org/Ioncannon/project-meteor-server.git
synced 2025-05-20 08:26:59 -04:00
Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ai
# Conflicts: # FFXIVClassic Map Server/actors/Actor.cs # FFXIVClassic Map Server/dataobjects/Session.cs # FFXIVClassic Map Server/lua/LuaEngine.cs
This commit is contained in:
@@ -9,16 +9,14 @@ namespace FFXIVClassic_Map_Server.utils
|
||||
class ActorPropertyPacketUtil
|
||||
{
|
||||
private Actor forActor;
|
||||
private uint playerActorId;
|
||||
private List<SubPacket> subPackets = new List<SubPacket>();
|
||||
private SetActorPropetyPacket currentActorPropertyPacket;
|
||||
private string currentTarget;
|
||||
|
||||
public ActorPropertyPacketUtil(string firstTarget, Actor forActor, uint playerActorId)
|
||||
public ActorPropertyPacketUtil(string firstTarget, Actor forActor)
|
||||
{
|
||||
currentActorPropertyPacket = new SetActorPropetyPacket(firstTarget);
|
||||
this.forActor = forActor;
|
||||
this.playerActorId = playerActorId;
|
||||
this.currentTarget = firstTarget;
|
||||
}
|
||||
|
||||
@@ -28,7 +26,7 @@ namespace FFXIVClassic_Map_Server.utils
|
||||
{
|
||||
currentActorPropertyPacket.SetIsMore(true);
|
||||
currentActorPropertyPacket.AddTarget();
|
||||
subPackets.Add(currentActorPropertyPacket.BuildPacket(playerActorId, forActor.actorId));
|
||||
subPackets.Add(currentActorPropertyPacket.BuildPacket(forActor.actorId));
|
||||
currentActorPropertyPacket = new SetActorPropetyPacket(currentTarget);
|
||||
currentActorPropertyPacket.AddProperty(forActor, property);
|
||||
}
|
||||
@@ -45,7 +43,7 @@ namespace FFXIVClassic_Map_Server.utils
|
||||
{
|
||||
currentActorPropertyPacket.AddTarget();
|
||||
currentActorPropertyPacket.SetIsMore(false);
|
||||
subPackets.Add(currentActorPropertyPacket.BuildPacket(playerActorId, forActor.actorId));
|
||||
subPackets.Add(currentActorPropertyPacket.BuildPacket(forActor.actorId));
|
||||
return subPackets;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user