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' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ai

Browse Source 
# Conflicts:
#	FFXIVClassic Map Server/Database.cs
#	FFXIVClassic Map Server/WorldManager.cs
#	FFXIVClassic Map Server/actors/area/Area.cs
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
This commit is contained in:
Tahir Akhlaq
2017-08-26 20:17:16 +01:00
parent 922f3ccd1e 52da0a671f
commit 6f5a480cbd
68 changed files with 907 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FFXIVClassic Map Server/WorldManager.cs
View File

@@ -1139,7 +1139,6 @@ namespace FFXIVClassic_Map_Server
else
return null;
}
public void LoadStatusEffects()
{
effectList = Database.LoadGlobalStatusEffectList();
@@ -1163,5 +1162,4 @@ namespace FFXIVClassic_Map_Server
return abilityList.TryGetValue((ushort)id, out ability) ? ability.Clone() : null;
}
}
}