zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-08-04 16:51:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Abandoning/Completing GLs now marks them correctly in the Journal.

Browse source
This commit is contained in:
Filip Maj 2017-06-25 23:02:20 -04:00
parent 573b9a7202
commit b5db036d71
3 changed files with 64 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1141,6 +1141,23 @@ namespace FFXIVClassic_Map_Server.Actors
SendGuildleveClientUpdate(freeSlot);
}
public void MarkGuildleve(uint id, bool abandoned, bool completed)
{
if (HasGuildleve(id))
{
for (int i = 0; i < questGuildleve.Length; i++)
{
if (questGuildleve[i] != null && questGuildleve[i] == id)
{
work.guildleveChecked[i] = abandoned;
work.guildleveDone[i] = completed;
Database.MarkGuildleve(this, id, abandoned, completed);
SendGuildleveClientUpdate(i);
}
}
}
}
public void RemoveGuildleve(uint id)
{
if (HasGuildleve(id))
@ -1409,6 +1426,14 @@ namespace FFXIVClassic_Map_Server.Actors
QueuePackets(propPacketUtil.Done());
}
private void SendGuildleveMarkClientUpdate(int slot)
{
ActorPropertyPacketUtil propPacketUtil = new ActorPropertyPacketUtil("work/guildleve", this, actorId);
propPacketUtil.AddProperty(String.Format("work.guildleveDone[{0}]", slot));
propPacketUtil.AddProperty(String.Format("work.guildleveChecked[{0}]", slot));
QueuePackets(propPacketUtil.Done());
}
public void SetLoginDirector(Director director)
{
if (ownedDirectors.Contains(director))

4
FFXIVClassic Map Server/actors/director/GuildleveDirector.cs
View file

@ -94,6 +94,7 @@ namespace FFXIVClassic_Map_Server.actors.director
foreach (Actor a in GetPlayerMembers())
{
Player player = (Player)a;
player.MarkGuildleve(guildleveId, false, true);
player.PlayAnimation(0x02000002);
player.ChangeMusic(81);
player.SendGameMessage(Server.GetWorldManager().GetActor(), 50023, 0x20, (object)(int)guildleveId);
@ -128,7 +129,8 @@ namespace FFXIVClassic_Map_Server.actors.director
foreach (Actor p in GetPlayerMembers())
{
Player player = (Player)p;
player.SendGameMessage(Server.GetWorldManager().GetActor(), 50147, 0x20, (object)guildleveId);
player.SendGameMessage(Server.GetWorldManager().GetActor(), 50147, 0x20, (object)guildleveId);
player.MarkGuildleve(guildleveId, true, false);
}
EndGuildleve(false);