diff options
| author | Mat <mail@mathias.is> | 2020-03-22 16:33:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 16:33:36 +0100 |
| commit | c968f1f7da722eddb291c8ef474f1e0394621911 (patch) | |
| tree | 74dbb39578e20e5b3ac9aa648bf093ab4ecf490d /src/Simulator | |
| parent | Fix invalid explosion damage (#4529) (diff) | |
| download | cuberite-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/Simulator')
| -rw-r--r-- | src/Simulator/FireSimulator.cpp | 2 | ||||
| -rw-r--r-- | src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp index 2b603315e..304450b3c 100644 --- a/src/Simulator/FireSimulator.cpp +++ b/src/Simulator/FireSimulator.cpp @@ -385,7 +385,7 @@ void cFireSimulator::RemoveFuelNeighbors(cChunk * a_Chunk, Vector3i a_RelPos) if (BlockType == E_BLOCK_TNT) { neighbor->SetBlock(relPos, E_BLOCK_AIR, 0); - m_World.SpawnPrimedTNT(absPos, 0); + m_World.SpawnPrimedTNT(Vector3d(absPos) + Vector3d(0.5, 0.5, 0.5)); // 80 ticks to boom return; } diff --git a/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h b/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h index b7a4664cc..5c739baba 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h @@ -37,9 +37,8 @@ public: // LOGD("Evaluating explodinator the trinitrotoluene (%d %d %d)", a_Position.x, a_Position.y, a_Position.z); if (a_PoweringData.PowerLevel != 0) { - a_World.BroadcastSoundEffect("entity.tnt.primed", a_Position, 0.5f, 0.6f); a_World.SetBlock(a_Position.x, a_Position.y, a_Position.z, E_BLOCK_AIR, 0); - a_World.SpawnPrimedTNT(a_Position + Vector3d(0.5, 0.5, 0.5)); // 80 ticks to boom + a_World.SpawnPrimedTNT(Vector3d(a_Position) + Vector3d(0.5, 0.5, 0.5)); // 80 ticks to boom } return {}; } |