summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGargaj <gargaj@conspiracy.hu>2015-12-10 20:41:51 +0100
committerBenjamin Mintz <bmintz@users.noreply.github.com>2015-12-11 01:06:36 +0100
commit56e7329f297cd8852e344bfebc5761fd4183ed79 (patch)
tree38ec9cffbf8d55580741dadbbef13d60c7312c91 /src
parentPut the entire compile.sh script in a code block for security (diff)
downloadcuberite-56e7329f297cd8852e344bfebc5761fd4183ed79.tar
cuberite-56e7329f297cd8852e344bfebc5761fd4183ed79.tar.gz
cuberite-56e7329f297cd8852e344bfebc5761fd4183ed79.tar.bz2
cuberite-56e7329f297cd8852e344bfebc5761fd4183ed79.tar.lz
cuberite-56e7329f297cd8852e344bfebc5761fd4183ed79.tar.xz
cuberite-56e7329f297cd8852e344bfebc5761fd4183ed79.tar.zst
cuberite-56e7329f297cd8852e344bfebc5761fd4183ed79.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Floater.cpp2
-rw-r--r--src/WorldStorage/NBTChunkSerializer.cpp1
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");