mirror of
				https://bitbucket.org/Ioncannon/project-meteor-server.git
				synced 2025-05-20 08:26:59 -04: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:
		| @@ -69,7 +69,7 @@ function onEventStarted(player, actor, triggerName, invActionInfo, param1, param | ||||
| 		end | ||||
| 	end | ||||
| 	 | ||||
| 	player:endEvent();	 | ||||
| 	player:endCommand();	 | ||||
| end | ||||
|  | ||||
| function loadGearset(player, classId)	 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user