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

Merge pull request #7474 from ChillerDragon/pr_mod_crash

Browse source 
Fix crash in mod controller
This commit is contained in:
Dennis Felsing 2023-11-18 19:59:22 +00:00 committed by GitHub
parent 43a58f05ae f0aae73b1f
commit ccd767aea4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/server/gamecontroller.cpp
View file

@ -731,8 +731,10 @@ int IGameController::ClampTeam(int Team)
CClientMask IGameController::GetMaskForPlayerWorldEvent(int Asker, int ExceptID) CClientMask IGameController::GetMaskForPlayerWorldEvent(int Asker, int ExceptID)
{ {
// Send all world events to everyone by default if(Asker == -1)
return CClientMask().set().reset(ExceptID); return CClientMask().set().reset(ExceptID);
return Teams().TeamMask(GameServer()->GetDDRaceTeam(Asker), ExceptID, Asker);
} }
void IGameController::InitTeleporter() void IGameController::InitTeleporter()

2
src/game/server/gamecontroller.h
View file

@ -146,7 +146,7 @@ public:
virtual bool CanJoinTeam(int Team, int NotThisID); virtual bool CanJoinTeam(int Team, int NotThisID);
int ClampTeam(int Team); int ClampTeam(int Team);
virtual CClientMask GetMaskForPlayerWorldEvent(int Asker, int ExceptID = -1); CClientMask GetMaskForPlayerWorldEvent(int Asker, int ExceptID = -1);
virtual void InitTeleporter(); virtual void InitTeleporter();
// DDRace // DDRace

8
src/game/server/gamemodes/DDRace.cpp
View file

@ -200,11 +200,3 @@ void CGameControllerDDRace::DoTeamChange(class CPlayer *pPlayer, int Team, bool
IGameController::DoTeamChange(pPlayer, Team, DoChatMsg); IGameController::DoTeamChange(pPlayer, Team, DoChatMsg);
} }
CClientMask CGameControllerDDRace::GetMaskForPlayerWorldEvent(int Asker, int ExceptID)
{
if(Asker == -1)
return CClientMask().set().reset(ExceptID);
return Teams().TeamMask(GameServer()->GetDDRaceTeam(Asker), ExceptID, Asker);
}

2
src/game/server/gamemodes/DDRace.h
View file

@ -24,8 +24,6 @@ public:
void DoTeamChange(class CPlayer *pPlayer, int Team, bool DoChatMsg = true) override; void DoTeamChange(class CPlayer *pPlayer, int Team, bool DoChatMsg = true) override;
CClientMask GetMaskForPlayerWorldEvent(int Asker, int ExceptID = -1) override;
std::shared_ptr<CScoreLoadBestTimeResult> m_pLoadBestTimeResult; std::shared_ptr<CScoreLoadBestTimeResult> m_pLoadBestTimeResult;
}; };
#endif // GAME_SERVER_GAMEMODES_DDRACE_H #endif // GAME_SERVER_GAMEMODES_DDRACE_H