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

13
source/Mobs/Squid.cpp
View File

@@ -3,13 +3,14 @@
#include "Squid.h"
#include "../Vector3d.h"
#include "../Chunk.h"
cSquid::cSquid(void) :
super("Squid", 94, "", "")
super("Squid", 94, "", "", 0.95, 0.95)
{
}
@@ -17,7 +18,7 @@ cSquid::cSquid(void) :
void cSquid::GetDrops(cItems & a_Drops, cPawn * a_Killer)
void cSquid::GetDrops(cItems & a_Drops, cEntity * a_Killer)
{
// Drops 0-3 Ink Sacs
AddRandomDropItem(a_Drops, 0, 3, E_ITEM_DYE, E_META_DYE_BLACK);
@@ -29,15 +30,17 @@ void cSquid::GetDrops(cItems & a_Drops, cPawn * a_Killer)
void cSquid::Tick(float a_Dt, cChunk & a_Chunk)
{
// TODO: Rewrite this function to use a_Chunk instead of m_World
super::Tick(a_Dt, a_Chunk);
Vector3d Pos = GetPosition();
// TODO: Not a real behavior, but cool :D
if (!IsBlockWater(GetWorld()->GetBlock((int) Pos.x, (int) Pos.y, (int) Pos.z)) && !IsBurning())
int RelX = (int)floor(Pos.x + 0.5) - a_Chunk.GetPosX() * cChunkDef::Width;
int RelZ = (int)floor(Pos.z + 0.5) - a_Chunk.GetPosZ() * cChunkDef::Width;
if (!IsBlockWater(a_Chunk.GetBlock(RelX, (int)Pos.y, RelZ)) && !IsOnFire())
{
SetMetaData(BURNING);
// Burn for 10 ticks, then decide again
StartBurning(10);
}
}