edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kept hook when needed

Browse source
This commit is contained in:
Kyle Bradley 2021-04-10 17:29:20 +02:00
parent b1c4148e9c
commit b4a5956f72
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game/server/entities/character.cpp
View file

@ -742,7 +742,6 @@ void CCharacter::ResetHook()
m_Core.m_HookedPlayer = -1; m_Core.m_HookedPlayer = -1;
m_Core.m_HookState = HOOK_RETRACTED; m_Core.m_HookState = HOOK_RETRACTED;
m_Core.m_TriggeredEvents |= COREEVENT_HOOK_RETRACT; m_Core.m_TriggeredEvents |= COREEVENT_HOOK_RETRACT;
GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
m_Core.m_HookPos = m_Core.m_Pos; m_Core.m_HookPos = m_Core.m_Pos;
} }
@ -1915,6 +1914,7 @@ void CCharacter::HandleTiles(int Index)
if(!g_Config.m_SvTeleportHoldHook) if(!g_Config.m_SvTeleportHoldHook)
{ {
ResetHook(); ResetHook();
GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
} }
if(g_Config.m_SvTeleportLoseWeapons) if(g_Config.m_SvTeleportLoseWeapons)
{ {
@ -1939,6 +1939,7 @@ void CCharacter::HandleTiles(int Index)
if(!g_Config.m_SvTeleportHoldHook) if(!g_Config.m_SvTeleportHoldHook)
{ {
ResetHook(); ResetHook();
GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
} }
return; return;
@ -1954,6 +1955,7 @@ void CCharacter::HandleTiles(int Index)
if(!g_Config.m_SvTeleportHoldHook) if(!g_Config.m_SvTeleportHoldHook)
{ {
ResetHook(); ResetHook();
GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
} }
} }
return; return;
@ -2264,6 +2266,7 @@ void CCharacter::Pause(bool Pause)
if(m_Core.m_HookedPlayer != -1) // Keeping hook would allow cheats if(m_Core.m_HookedPlayer != -1) // Keeping hook would allow cheats
{ {
ResetHook(); ResetHook();
GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
} }
} }
else else

1
src/game/server/teams.cpp
View file

@ -751,6 +751,7 @@ void CGameTeams::SwapTeamCharacters(CPlayer *pPlayer, CPlayer *pTargetPlayer, in
if(m_Core.Team(i) == Team && GameServer()->m_apPlayers[i]) if(m_Core.Team(i) == Team && GameServer()->m_apPlayers[i])
{ {
GameServer()->m_apPlayers[i]->GetCharacter()->ResetHook(); GameServer()->m_apPlayers[i]->GetCharacter()->ResetHook();
GameServer()->m_World.ReleaseHooked(i);
} }
} }