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

Forgot to commit TradeOfferCommand changes. Added removing the active ls if you are kicked/retired.

Browse Source
This commit is contained in:
Filip Maj 2019-06-08 17:28:09 -04:00
parent f5ebb3fb3b
commit eb43a7523d
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
FFXIVClassic World Server/DataObjects/Group/Linkshell.cs
View File

@ -222,6 +222,14 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
SendGroupPacketsAll(GetMemberIds()); SendGroupPacketsAll(GetMemberIds());
ResendWorkValues(); ResendWorkValues();
//If active, remove it
if (requestSession.activeLinkshellName.Equals(name))
{
SubPacket activeLsPacket = SetActiveLinkshellPacket.BuildPacket(requestSession.sessionId, 0);
requestSession.clientConnection.QueuePacket(activeLsPacket);
requestSession.SetActiveLS("");
}
//Delete group for kicked guy //Delete group for kicked guy
SendDeletePacket(requestSession); SendDeletePacket(requestSession);
} }
@ -260,6 +268,14 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
SendGroupPacketsAll(GetMemberIds()); SendGroupPacketsAll(GetMemberIds());
ResendWorkValues(); ResendWorkValues();
//If active, remove it
if (requestSession.activeLinkshellName.Equals(name))
{
SubPacket activeLsPacket = SetActiveLinkshellPacket.BuildPacket(requestSession.sessionId, 0);
requestSession.clientConnection.QueuePacket(activeLsPacket);
requestSession.SetActiveLS("");
}
//Delete group for kicked guy //Delete group for kicked guy
SendDeletePacket(kickedSession); SendDeletePacket(kickedSession);

9
data/scripts/commands/TradeOfferCommand.lua
View File

@ -10,10 +10,12 @@ function onEventStarted(player, actor, triggerName, name, arg1, arg2, arg3, acto
local otherActor = nil; local otherActor = nil;
if (name ~= nil) then --ActorID Search
otherActor = player:GetZone():FindPCInZone(name); if (actorId ~= nil) then
elseif (actorId ~= nil) then
otherActor = player:GetZone():FindActorInArea(actorId); otherActor = player:GetZone():FindActorInArea(actorId);
--Name Search
elseif (name ~= nil) then
otherActor = player:GetZone():FindPCInZone(name);
end end
if (otherActor ~= nil) then if (otherActor ~= nil) then
@ -22,5 +24,4 @@ function onEventStarted(player, actor, triggerName, name, arg1, arg2, arg3, acto
end end
player:EndEvent(); player:EndEvent();
end end