summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorMat <mail@mathias.is>2020-03-23 01:05:47 +0100
committerGitHub <noreply@github.com>2020-03-23 01:05:47 +0100
commit7700116330534d7129cb1aeeb10b1b8ad20b3c8f (patch)
treeea4f392ead2f7dd832c7bd805118a1e6a18f091f /src/Entities
parentDon't push blocks outside world height limits (#4516) (diff)
downloadcuberite-7700116330534d7129cb1aeeb10b1b8ad20b3c8f.tar
cuberite-7700116330534d7129cb1aeeb10b1b8ad20b3c8f.tar.gz
cuberite-7700116330534d7129cb1aeeb10b1b8ad20b3c8f.tar.bz2
cuberite-7700116330534d7129cb1aeeb10b1b8ad20b3c8f.tar.lz
cuberite-7700116330534d7129cb1aeeb10b1b8ad20b3c8f.tar.xz
cuberite-7700116330534d7129cb1aeeb10b1b8ad20b3c8f.tar.zst
cuberite-7700116330534d7129cb1aeeb10b1b8ad20b3c8f.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 90683271a..209c10b44 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -972,7 +972,7 @@ void cEntity::HandlePhysics(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
}
}
}
- else if (!(IsMinecart() || IsTNT()))
+ else if (!(IsMinecart() || IsTNT() || (IsPickup() && (m_TicksAlive < 15))))
{
// Push out entity.
BLOCKTYPE GotBlock;