Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
ST-Chara committed Feb 17, 2024
1 parent 94cb1fb commit 964bd13
Show file tree
Hide file tree
Showing 3 changed files with 199 additions and 181 deletions.
5 changes: 1 addition & 4 deletions src/game/server/entities/hearth.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ void CLifeHearth::Tick()
m_Pos = GameServer()->GetPlayerChar(m_Owner)->m_Pos;
}

if (GameServer()->Collision()->IsSolid(m_Pos.x, m_Pos.y))
return Reset();

if (!pTarget)
{
if (!StopTickLef)
Expand All @@ -90,7 +87,7 @@ void CLifeHearth::Tick()

if (distance(pTarget->m_Pos, m_Pos) < pTarget->m_ProximityRadius + 2.0f && GameServer()->m_apPlayers[m_Owner]->m_LifeActives)
{
pTarget->m_BurnTick = Server()->TickSpeed() * 2;
pTarget->m_BurnTick = Server()->TickSpeed() * 4;
return Reset();
}
}
Expand Down
Loading

0 comments on commit 964bd13

Please sign in to comment.