From 55430a31a20c9eccb7a5f6edc9d386d5e70cdf3d Mon Sep 17 00:00:00 2001 From: Benau Date: Wed, 2 Jan 2019 11:37:28 +0800 Subject: [PATCH] Add invulnerability depends on kart for live join --- src/karts/kart.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp index ad460db89..1029f9758 100644 --- a/src/karts/kart.cpp +++ b/src/karts/kart.cpp @@ -1411,6 +1411,7 @@ void Kart::update(int ticks) m_xyz_front = getTrans()(front); // Hover the kart above reset position before entering the game + // Add invulnerability depends on kart if (m_live_join_util != 0 && (m_live_join_util > World::getWorld()->getTicksSinceStart() || World::getWorld()->isLiveJoinWorld())) @@ -1424,6 +1425,8 @@ void Kart::update(int ticks) m_starting_transform.getBasis().getColumn(1) * 3.0f); body->proceedToTransform(hovering); setTrans(hovering); + float time = getKartProperties()->getExplosionInvulnerabilityTime(); + m_invulnerable_ticks = stk_config->time2Ticks(time); } // Update the locally maintained speed of the kart (m_speed), which