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

Removed redundant queuepacket func.

Browse Source
This commit is contained in:
Filip Maj 2017-06-27 21:40:49 -04:00
parent ab3e152b7d
commit 33e580ed38
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -512,7 +512,7 @@ namespace FFXIVClassic_Map_Server.Actors
QueuePacket(SetMapPacket.BuildPacket(actorId, zone.regionId, zone.actorId)); QueuePacket(SetMapPacket.BuildPacket(actorId, zone.regionId, zone.actorId));
QueuePacket(GetSpawnPackets(this, spawnType)); QueuePackets(GetSpawnPackets(this, spawnType));
//GetSpawnPackets(actorId, spawnType).DebugPrintPacket(); //GetSpawnPackets(actorId, spawnType).DebugPrintPacket();
#region Inventory & Equipment #region Inventory & Equipment
@ -558,8 +558,8 @@ namespace FFXIVClassic_Map_Server.Actors
foreach (Director director in ownedDirectors) foreach (Director director in ownedDirectors)
{ {
QueuePacket(director.GetSpawnPackets()); QueuePackets(director.GetSpawnPackets());
QueuePacket(director.GetInitPackets()); QueuePackets(director.GetInitPackets());
} }
if (currentContentGroup != null) if (currentContentGroup != null)
@ -594,11 +594,6 @@ namespace FFXIVClassic_Map_Server.Actors
return actorId == otherActorId; return actorId == otherActorId;
} }
public void QueuePacket(List<SubPacket> packets)
{
playerSession.QueuePacket(packets);
}
public void QueuePacket(SubPacket packet) public void QueuePacket(SubPacket packet)
{ {
playerSession.QueuePacket(packet); playerSession.QueuePacket(packet);
@ -606,8 +601,7 @@ namespace FFXIVClassic_Map_Server.Actors
public void QueuePackets(List<SubPacket> packets) public void QueuePackets(List<SubPacket> packets)
{ {
foreach (SubPacket subpacket in packets) playerSession.QueuePacket(packets);
playerSession.QueuePacket(subpacket);
} }
public void SendPacket(string path) public void SendPacket(string path)
@ -1447,8 +1441,8 @@ namespace FFXIVClassic_Map_Server.Actors
public void SendDirectorPackets(Director director) public void SendDirectorPackets(Director director)
{ {
QueuePacket(director.GetSpawnPackets()); QueuePackets(director.GetSpawnPackets());
QueuePacket(director.GetInitPackets()); QueuePackets(director.GetInitPackets());
} }
public void RemoveDirector(Director director) public void RemoveDirector(Director director)

4
FFXIVClassic Map Server/actors/director/Director.cs
View File

@ -110,8 +110,8 @@ namespace FFXIVClassic_Map_Server.actors.director
{ {
foreach (Player p in GetPlayerMembers()) foreach (Player p in GetPlayerMembers())
{ {
p.QueuePacket(GetSpawnPackets()); p.QueuePackets(GetSpawnPackets());
p.QueuePacket(GetInitPackets()); p.QueuePackets(GetInitPackets());
} }
} }

6
FFXIVClassic Map Server/dataobjects/Session.cs
View File

@ -81,7 +81,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
playerActor.rotation = rot; playerActor.rotation = rot;
playerActor.moveState = moveState; playerActor.moveState = moveState;
GetActor().zone.UpdateActorPosition(GetActor()); GetActor().GetZone().UpdateActorPosition(GetActor());
} }
long lastMilis = 0; long lastMilis = 0;
@ -108,7 +108,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
if (npc.GetUniqueId().Equals("1") && milliseconds - lastMilis > 1000) if (npc.GetUniqueId().Equals("1") && milliseconds - lastMilis > 1000)
{ {
lastMilis = milliseconds; lastMilis = milliseconds;
GetActor().QueuePacket(RemoveActorPacket.BuildPacket(actorInstanceList[i].actorId)); QueuePacket(RemoveActorPacket.BuildPacket(actorInstanceList[i].actorId));
actorInstanceList.RemoveAt(i); actorInstanceList.RemoveAt(i);
continue; continue;
} }
@ -116,7 +116,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
if (!list.Contains(actorInstanceList[i])) if (!list.Contains(actorInstanceList[i]))
{ {
GetActor().QueuePacket(RemoveActorPacket.BuildPacket(actorInstanceList[i].actorId)); QueuePacket(RemoveActorPacket.BuildPacket(actorInstanceList[i].actorId));
actorInstanceList.RemoveAt(i); actorInstanceList.RemoveAt(i);
} }

3
FFXIVClassic Map Server/lua/LuaEngine.cs
View File

@ -605,9 +605,8 @@ namespace FFXIVClassic_Map_Server.lua
if (player == null) if (player == null)
return; return;
List<SubPacket> SendError = new List<SubPacket>(); List<SubPacket> SendError = new List<SubPacket>();
SendError.Add(EndEventPacket.BuildPacket(player.actorId, player.currentEventOwner, player.currentEventName));
player.SendMessage(SendMessagePacket.MESSAGE_TYPE_SYSTEM_ERROR, "", message); player.SendMessage(SendMessagePacket.MESSAGE_TYPE_SYSTEM_ERROR, "", message);
player.playerSession.QueuePacket(SendError); player.QueuePacket(EndEventPacket.BuildPacket(player.actorId, player.currentEventOwner, player.currentEventName));
} }
} }