mirror of
https://bitbucket.org/Ioncannon/project-meteor-server.git
synced 2025-06-08 21:44:35 +02:00
Merge branch 'develop'
# Conflicts: # FFXIVClassic Map Server/FFXIVClassic Map Server.csproj # FFXIVClassic Map Server/Server.cs # data/scripts/player.lua # scripts/zones/193/npcs/pplStd_11@0C100.lua
This commit is contained in:
commit
3d5fa45730
134 changed files with 1926 additions and 242 deletions
|
@ -69,7 +69,7 @@ function onEventStarted(player, actor, triggerName, invActionInfo, param1, param
|
|||
end
|
||||
end
|
||||
|
||||
player:endEvent();
|
||||
player:endCommand();
|
||||
end
|
||||
|
||||
function loadGearset(player, classId)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue