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

Fixed #904

Browse Source
This commit is contained in:
Tiger Wang 2014-04-18 12:54:17 +01:00
parent 193dcca1e3
commit 200ea6254c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mobs/Monster.cpp
View File

@ -540,7 +540,7 @@ void cMonster::KilledBy(cEntity * a_Killer)
break; break;
} }
} }
if (a_Killer != NULL) if ((a_Killer != NULL) && (!IsBaby())
{ {
m_World->SpawnExperienceOrb(GetPosX(), GetPosY(), GetPosZ(), Reward); m_World->SpawnExperienceOrb(GetPosX(), GetPosY(), GetPosZ(), Reward);
} }

5
src/World.cpp
View File

@ -1691,6 +1691,11 @@ int cWorld::SpawnFallingBlock(int a_X, int a_Y, int a_Z, BLOCKTYPE BlockType, NI
int cWorld::SpawnExperienceOrb(double a_X, double a_Y, double a_Z, int a_Reward) int cWorld::SpawnExperienceOrb(double a_X, double a_Y, double a_Z, int a_Reward)
{ {
if (a_Reward < 1)
{
return -1;
}
cExpOrb * ExpOrb = new cExpOrb(a_X, a_Y, a_Z, a_Reward); cExpOrb * ExpOrb = new cExpOrb(a_X, a_Y, a_Z, a_Reward);
ExpOrb->Initialize(this); ExpOrb->Initialize(this);
return ExpOrb->GetUniqueID(); return ExpOrb->GetUniqueID();