diff options
| author | Alexander Harkness <me@bearbin.net> | 2015-12-10 22:04:45 +0100 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2015-12-10 22:04:45 +0100 |
| commit | 4b10146b2ee7c6f8f1040d39dbb19194cbebdc69 (patch) | |
| tree | a34ab94fc73c193ec62a41b4af5070d230b0f2b4 | |
| parent | Merge pull request #2720 from cuberite/OreNestsFix (diff) | |
| parent | Test for correct coordinates when fishing (diff) | |
| download | cuberite-4b10146b2ee7c6f8f1040d39dbb19194cbebdc69.tar cuberite-4b10146b2ee7c6f8f1040d39dbb19194cbebdc69.tar.gz cuberite-4b10146b2ee7c6f8f1040d39dbb19194cbebdc69.tar.bz2 cuberite-4b10146b2ee7c6f8f1040d39dbb19194cbebdc69.tar.lz cuberite-4b10146b2ee7c6f8f1040d39dbb19194cbebdc69.tar.xz cuberite-4b10146b2ee7c6f8f1040d39dbb19194cbebdc69.tar.zst cuberite-4b10146b2ee7c6f8f1040d39dbb19194cbebdc69.zip | |
| -rw-r--r-- | src/Entities/Floater.cpp | 2 | ||||
| -rw-r--r-- | src/WorldStorage/NBTChunkSerializer.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/Entities/Floater.cpp b/src/Entities/Floater.cpp index 29d59e6c4..0b96f12df 100644 --- a/src/Entities/Floater.cpp +++ b/src/Entities/Floater.cpp @@ -155,7 +155,7 @@ void cFloater::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) } m_CountDownTime--; - if (m_World->GetHeight(POSX_TOINT, POSY_TOINT) == POSZ_TOINT) + if (m_World->GetHeight(POSX_TOINT, POSZ_TOINT) == POSY_TOINT) { if (m_World->IsWeatherWet() && m_World->GetTickRandomNumber(3) == 0) // 25% chance of an extra countdown when being rained on. { diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp index 855fcea09..b0451e427 100644 --- a/src/WorldStorage/NBTChunkSerializer.cpp +++ b/src/WorldStorage/NBTChunkSerializer.cpp @@ -922,6 +922,7 @@ void cNBTChunkSerializer::Entity(cEntity * a_Entity) case cEntity::etItemFrame: AddItemFrameEntity (reinterpret_cast<cItemFrame *> (a_Entity)); break; case cEntity::etPainting: AddPaintingEntity (reinterpret_cast<cPainting *> (a_Entity)); break; case cEntity::etPlayer: return; // Players aren't saved into the world + case cEntity::etFloater: return; // Floaters aren't saved either default: { ASSERT(!"Unhandled entity type is being saved"); |