flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into MobSpawner

Browse Source 
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
This commit is contained in:
Howaner
2014-12-01 14:43:03 +01:00
parent 6adf749164 36500f88b2
commit 677dde51bd
7 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mobs/Monster.cpp
View File

@@ -63,16 +63,6 @@ static const struct
eMonsterType StringToMobType(const AString & a_MobString)
{
LOGWARNING("%s: Function is obsolete, use cMonster::StringToMobType() instead", __FUNCTION__);
return cMonster::StringToMobType(a_MobString);
}
////////////////////////////////////////////////////////////////////////////////
// cMonster: