diff options
| author | daniel0916 <theschokolps@gmail.com> | 2014-04-19 20:56:29 +0200 |
|---|---|---|
| committer | daniel0916 <theschokolps@gmail.com> | 2014-04-19 20:56:29 +0200 |
| commit | cb90029f720d867ba6398569c1b1dac2ee76e205 (patch) | |
| tree | d16ea187d087b1e91c5136d349b66aafad02d7d6 /src/Mobs | |
| parent | Fixed Code (2) (diff) | |
| parent | APIDump: Added a ChunkStay article. (diff) | |
| download | cuberite-cb90029f720d867ba6398569c1b1dac2ee76e205.tar cuberite-cb90029f720d867ba6398569c1b1dac2ee76e205.tar.gz cuberite-cb90029f720d867ba6398569c1b1dac2ee76e205.tar.bz2 cuberite-cb90029f720d867ba6398569c1b1dac2ee76e205.tar.lz cuberite-cb90029f720d867ba6398569c1b1dac2ee76e205.tar.xz cuberite-cb90029f720d867ba6398569c1b1dac2ee76e205.tar.zst cuberite-cb90029f720d867ba6398569c1b1dac2ee76e205.zip | |
Diffstat (limited to 'src/Mobs')
| -rw-r--r-- | src/Mobs/Monster.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index d63758b3d..248e88f5d 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -540,7 +540,7 @@ void cMonster::KilledBy(cEntity * a_Killer) break; } } - if (a_Killer != NULL) + if ((a_Killer != NULL) && (!IsBaby())) { m_World->SpawnExperienceOrb(GetPosX(), GetPosY(), GetPosZ(), Reward); } @@ -1003,7 +1003,8 @@ void cMonster::HandleDaylightBurning(cChunk & a_Chunk) (a_Chunk.GetSkyLight(RelX, RelY, RelZ) == 15) && // In the daylight (a_Chunk.GetBlock(RelX, RelY, RelZ) != E_BLOCK_SOULSAND) && // Not on soulsand (GetWorld()->GetTimeOfDay() < (12000 + 1000)) && // It is nighttime - !IsOnFire() // Not already burning + !IsOnFire() && // Not already burning + (GetWorld()->GetWeather() != eWeather_Rain) // Not raining ) { // Burn for 100 ticks, then decide again |