diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-04-13 23:02:10 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-04-13 23:02:10 +0200 |
| commit | a49c004278b0e300521e9cedf44a46ac843a958b (patch) | |
| tree | cc268ccbd5b938be93923d9aced847572364e263 /source/Pawn.cpp | |
| parent | Fixed a bit of coding style and function names in cItem (diff) | |
| download | cuberite-a49c004278b0e300521e9cedf44a46ac843a958b.tar cuberite-a49c004278b0e300521e9cedf44a46ac843a958b.tar.gz cuberite-a49c004278b0e300521e9cedf44a46ac843a958b.tar.bz2 cuberite-a49c004278b0e300521e9cedf44a46ac843a958b.tar.lz cuberite-a49c004278b0e300521e9cedf44a46ac843a958b.tar.xz cuberite-a49c004278b0e300521e9cedf44a46ac843a958b.tar.zst cuberite-a49c004278b0e300521e9cedf44a46ac843a958b.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/Pawn.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/Pawn.cpp b/source/Pawn.cpp index 960f95de3..b3cba7ab0 100644 --- a/source/Pawn.cpp +++ b/source/Pawn.cpp @@ -288,11 +288,11 @@ void cPawn::TeleportTo(double a_PosX, double a_PosY, double a_PosZ) -void cPawn::Tick(float a_Dt, MTRand & a_TickRandom) +void cPawn::Tick(float a_Dt, cChunk & a_Chunk) { - CheckMetaDataBurn(); // Check to see if pawn should burn based on block they are on + CheckMetaDataBurn(a_Chunk); // Check to see if pawn should burn based on block they are on - if (GetMetaData() == BURNING) + if (IsBurning()) { InStateBurning(a_Dt); } @@ -315,8 +315,10 @@ void cPawn::SetMetaData(MetaData a_MetaData) //----Change Entity MetaData -void cPawn::CheckMetaDataBurn(void) +void cPawn::CheckMetaDataBurn(cChunk & a_Chunk) { + // TODO: Rewrite this function to use a_Chunk instead of m_World + if ((GetPosY() < 1) || (GetPosY() >= 254)) { // Y coord out of range |