From a2823142675008b1e6a7a2cbe448f6aa3301c65c Mon Sep 17 00:00:00 2001 From: Lord_Cambion Date: Sat, 28 Mar 2026 14:03:56 +0100 Subject: [PATCH] used the entity method instead of my controls for primed tnt --- Minecraft.World/PrimedTnt.cpp | 64 ++++++++++++----------------------- 1 file changed, 21 insertions(+), 43 deletions(-) diff --git a/Minecraft.World/PrimedTnt.cpp b/Minecraft.World/PrimedTnt.cpp index 51ce81d7..c10f3f4e 100644 --- a/Minecraft.World/PrimedTnt.cpp +++ b/Minecraft.World/PrimedTnt.cpp @@ -63,59 +63,37 @@ bool PrimedTnt::isPickable() void PrimedTnt::tick() { - xo = x; - yo = y; - zo = z; - this->updateInWaterState(); - bool inWater = this->isInWater() || this->isInLava(); + xo = x; + yo = y; + zo = z; - - if (inWater) - { - yd -= 0.0392f; - } - else - { - yd -= 0.04f; - } + yd -= 0.04f; move(xd, yd, zd); + xd *= 0.98f; + yd *= 0.98f; + zd *= 0.98f; - if (inWater) + if (onGround) { - xd *= 0.8f; - yd *= 0.8f; - zd *= 0.8f; + xd *= 0.7f; + zd *= 0.7f; + yd *= -0.5f; + } + + this->updateInWaterState(); + + if (life-- <= 0) + { + remove(); + if (!level->isClientSide) + explode(); } else { - xd *= 0.98f; - yd *= 0.98f; - zd *= 0.98f; + level->addParticle(eParticleType_smoke, x, y + 0.5f, z, 0, 0, 0); } - - - if (onGround) - { - xd *= 0.7f; - zd *= 0.7f; - yd *= -0.5f; - } - - if (life-- <= 0) - { - remove(); - if (!level->isClientSide) - { - explode(); - } - } - else - { - level->addParticle(eParticleType_smoke, x, y + 0.5f, z, 0, 0, 0); - } - }