diff options
| author | lapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-12-28 03:10:05 +0100 |
|---|---|---|
| committer | lapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-12-28 03:10:05 +0100 |
| commit | 1e9af56a67ae3765291361d9bf01e9009cfb4dcc (patch) | |
| tree | 65878a8c373ec163eed3439b7db0fc440810d95b /source/cSquid.cpp | |
| parent | Fixed some things in Core to work for multiple worlds (diff) | |
| download | cuberite-1e9af56a67ae3765291361d9bf01e9009cfb4dcc.tar cuberite-1e9af56a67ae3765291361d9bf01e9009cfb4dcc.tar.gz cuberite-1e9af56a67ae3765291361d9bf01e9009cfb4dcc.tar.bz2 cuberite-1e9af56a67ae3765291361d9bf01e9009cfb4dcc.tar.lz cuberite-1e9af56a67ae3765291361d9bf01e9009cfb4dcc.tar.xz cuberite-1e9af56a67ae3765291361d9bf01e9009cfb4dcc.tar.zst cuberite-1e9af56a67ae3765291361d9bf01e9009cfb4dcc.zip | |
Diffstat (limited to 'source/cSquid.cpp')
| -rw-r--r-- | source/cSquid.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source/cSquid.cpp b/source/cSquid.cpp index af4b167f2..7ff964ce5 100644 --- a/source/cSquid.cpp +++ b/source/cSquid.cpp @@ -35,16 +35,9 @@ void cSquid::Tick(float a_Dt) //TODO Not a real behavior, but cool :D
- if(!IsBlockWater(GetWorld()->GetBlock(Pos.x, Pos.y, Pos.z)))
+ if(!IsBlockWater(GetWorld()->GetBlock((int) Pos.x, (int) Pos.y, (int) Pos.z)) && GetMetaData() != BURNING)
{
- //Die slowly Muhahaha :D (To prevent all this squids on the land :D)
- m_NoWater += a_Dt;
-
- if(m_NoWater > 1000.f)
- {
- m_NoWater -= 1000.f;
- TakeDamage(1, this);
- }
+ SetMetaData(BURNING);
}
}
\ No newline at end of file |