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

Rewritten entity-on-fire management ("forever on fire" bugs)

Browse Source 
Fixes FS #297 and part of FS #403.
Added sizes to all entities.
Moved all damage-related functions from cPawn to cEntity
API change: renamed cPawn:TeleportTo() to cEntity:TeleportToCoords()

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1635 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2013-07-01 10:39:56 +00:00
parent 3cfe865df3
commit 37276a4430
72 changed files with 2640 additions and 2446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/Mobs/Zombie.cpp
View File

@@ -8,7 +8,7 @@
cZombie::cZombie(void) :
super("Zombie", 54, "mob.zombie.hurt", "mob.zombie.death")
super("Zombie", 54, "mob.zombie.hurt", "mob.zombie.death", 0.6, 1.8)
{
}
@@ -21,9 +21,10 @@ void cZombie::Tick(float a_Dt, cChunk & a_Chunk)
super::Tick(a_Dt, a_Chunk);
// TODO Same as in cSkeleton :D
if ((GetWorld()->GetTimeOfDay() < (12000 + 1000)) && !IsBurning())
if ((GetWorld()->GetTimeOfDay() < (12000 + 1000)) && !IsOnFire())
{
SetMetaData(BURNING); // BURN, BABY, BURN! >:D
// Burn for 10 ticks, then decide again
StartBurning(10);
}
}
@@ -31,7 +32,7 @@ void cZombie::Tick(float a_Dt, cChunk & a_Chunk)
void cZombie::GetDrops(cItems & a_Drops, cPawn * a_Killer)
void cZombie::GetDrops(cItems & a_Drops, cEntity * a_Killer)
{
AddRandomDropItem(a_Drops, 0, 2, E_ITEM_ROTTEN_FLESH);