mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-21 20:27:47 +00:00
Code Activity

Merge branch 'packet_actortarget_rewrite' into guildleve

Browse source 
# Conflicts:
#	FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs
This commit is contained in:
Filip Maj 2017-07-06 22:02:14 -04:00
commit a77a90578f
4 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
FFXIVClassic Map Server/WorldManager.cs
View file

@ -613,7 +613,7 @@ namespace FFXIVClassic_Map_Server
//Send packets //Send packets
player.playerSession.QueuePacket(DeleteAllActorsPacket.BuildPacket(player.actorId)); player.playerSession.QueuePacket(DeleteAllActorsPacket.BuildPacket(player.actorId));
player.playerSession.QueuePacket(_0xE2Packet.BuildPacket(player.actorId, 0x10)); player.playerSession.QueuePacket(_0xE2Packet.BuildPacket(player.actorId, 0x2));
player.SendZoneInPackets(this, spawnType); player.SendZoneInPackets(this, spawnType);
player.playerSession.ClearInstance(); player.playerSession.ClearInstance();
player.SendInstanceUpdate(); player.SendInstanceUpdate();

26
FFXIVClassic Map Server/actors/chara/player/Player.cs
View file

@ -344,6 +344,11 @@ namespace FFXIVClassic_Map_Server.Actors
subpackets.Add(Database.GetAchievementsPacket(this)); subpackets.Add(Database.GetAchievementsPacket(this));
} }
if (mountState == 1)
subpackets.Add(SetCurrentMountChocoboPacket.BuildPacket(actorId, chocoboAppearance));
else if (mountState == 2)
subpackets.Add(SetCurrentMountGoobbuePacket.BuildPacket(actorId, 1));
return subpackets; return subpackets;
} }
@ -621,13 +626,19 @@ namespace FFXIVClassic_Map_Server.Actors
public void BroadcastPacket(SubPacket packet, bool sendToSelf) public void BroadcastPacket(SubPacket packet, bool sendToSelf)
{ {
if (sendToSelf)
{
SubPacket clonedPacket = new SubPacket(packet, actorId);
QueuePacket(clonedPacket);
}
foreach (Actor a in playerSession.actorInstanceList) foreach (Actor a in playerSession.actorInstanceList)
{ {
if (a is Player) if (a is Player)
{ {
Player p = (Player)a; Player p = (Player)a;
if (p.Equals(this) && !sendToSelf) if (p.Equals(this))
continue; continue;
SubPacket clonedPacket = new SubPacket(packet, a.actorId); SubPacket clonedPacket = new SubPacket(packet, a.actorId);
@ -744,19 +755,18 @@ namespace FFXIVClassic_Map_Server.Actors
QueuePacket(SetMusicPacket.BuildPacket(actorId, musicId, 1)); QueuePacket(SetMusicPacket.BuildPacket(actorId, musicId, 1));
} }
public void SendChocoboAppearance() public void SendMountAppearance()
{ {
BroadcastPacket(SetCurrentMountChocoboPacket.BuildPacket(actorId, chocoboAppearance), true); if (mountState == 1)
} BroadcastPacket(SetCurrentMountChocoboPacket.BuildPacket(actorId, chocoboAppearance), true);
else if (mountState == 2)
public void SendGoobbueAppearance() BroadcastPacket(SetCurrentMountGoobbuePacket.BuildPacket(actorId, 1), true);
{
BroadcastPacket(SetCurrentMountGoobbuePacket.BuildPacket(actorId, 1), true);
} }
public void SetMountState(byte mountState) public void SetMountState(byte mountState)
{ {
this.mountState = mountState; this.mountState = mountState;
SendMountAppearance();
} }
public byte GetMountState() public byte GetMountState()

1
FFXIVClassic Map Server/dataobjects/Session.cs
View file

@ -28,7 +28,6 @@ namespace FFXIVClassic_Map_Server.dataobjects
{ {
this.id = sessionId; this.id = sessionId;
playerActor = new Player(this, sessionId); playerActor = new Player(this, sessionId);
actorInstanceList.Add(playerActor);
} }
public void QueuePacket(List<SubPacket> packets) public void QueuePacket(List<SubPacket> packets)

2
data/scripts/commands/ChocoboRideCommand.lua
View file

@ -14,12 +14,10 @@ function onEventStarted(player, actor, triggerName, isGoobbue)
if (isGoobbue ~= true) then if (isGoobbue ~= true) then
player:ChangeMusic(83); player:ChangeMusic(83);
player:SendChocoboAppearance();
player:SendGameMessage(player, worldMaster, 26001, 0x20); player:SendGameMessage(player, worldMaster, 26001, 0x20);
player:SetMountState(1); player:SetMountState(1);
else else
player:ChangeMusic(98); player:ChangeMusic(98);
player:SendGoobbueAppearance();
player:SendGameMessage(player, worldMaster, 26019, 0x20); player:SendGameMessage(player, worldMaster, 26019, 0x20);
player:SetMountState(2); player:SetMountState(2);
end end