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:
Filip Maj 2016-04-18 13:31:55 -04:00
commit 3d5fa45730
134 changed files with 1926 additions and 242 deletions

View file

@ -6,15 +6,20 @@ Switches between active and passive mode states
--]]
function onEventStarted(player, actor, triggerName)
function onEventStarted(player, command, triggerName)
if (player:getState() == 0) then
player:changeState(2);
elseif (player:getState() == 2) then
player:changeState(0);
end
player:endEvent();
player:endCommand();
--For Opening Tutorial
if (player:hasQuest("Man0l0") or player:hasQuest("Man0g0") or player:hasQuest("Man0u0")) then
player:getDirector():onCommand(command);
end
end