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

Merge branch 'master' into MobSpawner

Browse Source 
Conflicts:
	MCServer/Plugins/Core
This commit is contained in:
Howaner
2014-11-18 14:56:32 +01:00
parent 5e71d5299c 9ece37e8f1
commit 42120e2ea5
415 changed files with 11981 additions and 12491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MobSpawner.cpp
View File

@@ -302,7 +302,7 @@ bool cMobSpawner::CanSpawnHere(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_R
cMonster* cMobSpawner::TryToSpawnHere(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_RelZ, EMCSBiome a_Biome, int& a_MaxPackSize)
{
cMonster* toReturn = NULL;
cMonster* toReturn = nullptr;
if (m_NewPack)
{
m_MobType = ChooseMobType(a_Biome);