1
0

Prevent suffocation in plantlike nodes

(cherry picked from commit 73680423f5994e73fdb2e49289309fcf41c6ccfb)
This commit is contained in:
luk3yx 2023-07-31 04:57:03 +12:00 committed by mckaygerhard
parent 4157a8c8e1
commit 2714e5d0f6

View File

@ -177,7 +177,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
const ContentFeatures &c = m_env->getGameDef()->ndef()->get(n); const ContentFeatures &c = m_env->getGameDef()->ndef()->get(n);
// If node generates drown // If node generates drown
const bool noclip = m_privs.count("noclip") && (!m_is_singleplayer || g_settings->getBool("noclip")); const bool noclip = m_privs.count("noclip") && (!m_is_singleplayer || g_settings->getBool("noclip"));
int drowning = (c.walkable && c.drawtype != NDT_NODEBOX && c.drawtype != NDT_AIRLIKE) ? 1 : c.drowning; int drowning = (c.walkable && c.drawtype != NDT_NODEBOX && c.drawtype != NDT_AIRLIKE && c.drawtype != NDT_PLANTLIKE) ? 1 : c.drowning;
if (drowning > 0 && m_hp > 0 && !noclip) { if (drowning > 0 && m_hp > 0 && !noclip) {
if (m_breath > 0) if (m_breath > 0)
setBreath(m_breath - 1); setBreath(m_breath - 1);