cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source 
# 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
parent de7484a931 79eaf5d79e
commit 3d5fa45730
134 changed files with 1926 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FFXIVClassic Map Server/Server.cs
View File

@@ -330,6 +330,7 @@ namespace FFXIVClassic_Lobby_Server
#endregion
public static WorldManager GetWorldManager()
{
return mWorldManager;
@@ -344,5 +345,6 @@ namespace FFXIVClassic_Lobby_Server
{
return gamedataItems;
}
}
}