1
0

Merge branch 'MobSpawning' of https://github.com/mgueydan/MCServer into MobSpawning

Conflicts:
	source/Mobs/Bat.h
	source/Mobs/Monster.h
	source/World.cpp
This commit is contained in:
Samuel Barney
2013-10-14 10:03:47 -06:00
29 changed files with 1346 additions and 228 deletions

View File

@@ -9,6 +9,7 @@
#include "../Entities/Player.h"
#include "../Defines.h"
#include "../MonsterConfig.h"
#include "../MobTypesManager.h"
#include "../MersenneTwister.h"
#include "../Vector3f.h"
@@ -17,6 +18,7 @@
#include "../Tracer.h"
#include "../Chunk.h"
// #include "../../iniFile/iniFile.h"
@@ -510,3 +512,7 @@ void cMonster::HandleDaylightBurning(cChunk & a_Chunk)
cMonster::eFamily cMonster::GetMobFamily(void) const
{
return cMobTypesManager::getFamilyFromType(GetMobTypeAsEnum());
}