Skip to content

SERVER: fix free perk powerup crashing game in Gun Game if player had all perks but Mule Kick #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MotoLegacy merged 1 commit into from
Jan 31, 2026
Merged

SERVER: fix free perk powerup crashing game in Gun Game if player had all perks but Mule Kick #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions source/server/entities/powerups.qc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,11 @@ void() PU_FreePerk =

while(players) {

if (players.downed || players.perks >= 255) {
// don't to anything if any of these conditions is true
// 1. player is down
// 2. player has already all perks
// 3. player has all perks useful for Gun Game mode (all but mule kick)
if (players.downed || players.perks >= P_ALL || (cvar("sv_gamemode") == GAMEMODE_GUNGAME && players.perks >= P_ALL_GUNGAME)) {
players = find(players, classname, "player");
continue;
}
Expand All @@ -673,7 +677,7 @@ void() PU_FreePerk =
else if (perk_rand < (5/8) && !(players.perks & P_STAMIN)) { self.sequence = 5; perk_to_give = P_STAMIN; }
else if (perk_rand < (6/8) && !(players.perks & P_FLOP)) { self.sequence = 6; perk_to_give = P_FLOP; }
else if (perk_rand < (7/8) && !(players.perks & P_DEAD)) { self.sequence = 7; perk_to_give = P_DEAD; }
else if (!(players.perks & P_MULE) && cvar("sv_gamemode") != 2) { self.sequence = 8; perk_to_give = P_MULE; }
else if (!(players.perks & P_MULE) && cvar("sv_gamemode") != GAMEMODE_GUNGAME) { self.sequence = 8; perk_to_give = P_MULE; }

if (perk_to_give != 0)
found_perk_for_player = true;
Expand Down
5 changes: 5 additions & 0 deletions source/shared/shared_defs.qc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,11 @@ float map_compatibility_mode;
#define P_DEAD 64
#define P_MULE 128

// all perks
#define P_ALL (P_JUG | P_DOUBLE | P_SPEED | P_REVIVE | P_FLOP | P_STAMIN | P_DEAD | P_MULE)
// all perks useful in Gun Game (all but no mule kick)
#define P_ALL_GUNGAME (P_JUG | P_DOUBLE | P_SPEED | P_REVIVE | P_FLOP | P_STAMIN | P_DEAD)

#define STAT_VIEWZOOM 21

#define STAT_CURRENTMAG 50
Expand Down