summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorMat <mail@mathias.is>2020-03-22 16:33:36 +0100
committerGitHub <noreply@github.com>2020-03-22 16:33:36 +0100
commitc968f1f7da722eddb291c8ef474f1e0394621911 (patch)
tree74dbb39578e20e5b3ac9aa648bf093ab4ecf490d /src/Entities
parentFix invalid explosion damage (#4529) (diff)
downloadcuberite-c968f1f7da722eddb291c8ef474f1e0394621911.tar
cuberite-c968f1f7da722eddb291c8ef474f1e0394621911.tar.gz
cuberite-c968f1f7da722eddb291c8ef474f1e0394621911.tar.bz2
cuberite-c968f1f7da722eddb291c8ef474f1e0394621911.tar.lz
cuberite-c968f1f7da722eddb291c8ef474f1e0394621911.tar.xz
cuberite-c968f1f7da722eddb291c8ef474f1e0394621911.tar.zst
cuberite-c968f1f7da722eddb291c8ef474f1e0394621911.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.cpp2
-rw-r--r--src/Entities/TNTEntity.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 99f8b56b8..90683271a 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
+ else if (!(IsMinecart() || IsTNT()))
{
// Push out entity.
BLOCKTYPE GotBlock;
diff --git a/src/Entities/TNTEntity.cpp b/src/Entities/TNTEntity.cpp
index a86aa40e3..6ee56b92a 100644
--- a/src/Entities/TNTEntity.cpp
+++ b/src/Entities/TNTEntity.cpp
@@ -36,7 +36,7 @@ void cTNTEntity::Explode(void)
m_FuseTicks = 0;
Destroy();
FLOGD("BOOM at {0}", GetPosition());
- m_World->DoExplosionAt(4.0, GetPosX() + 0.49, GetPosY() + 0.49, GetPosZ() + 0.49, true, esPrimedTNT, this);
+ m_World->DoExplosionAt(4.0, GetPosX(), GetPosY(), GetPosZ(), true, esPrimedTNT, this);
}