Skip to content

don't spawn if respawns enabled #1227

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

Jump to bottom
Merged
AdamTadeusz merged 3 commits into from
Jul 31, 2025
Merged

don't spawn if respawns enabled #1227

AdamTadeusz merged 3 commits into from
Jul 31, 2025

Conversation

@AdamTadeusz
Copy link
Contributor

@AdamTadeusz AdamTadeusz commented Jul 24, 2025

@AdamTadeusz AdamTadeusz requested a review from a team July 24, 2025 11:53
DESTROYGIRL
DESTROYGIRL approved these changes Jul 24, 2025
View reviewed changes
Copy link
Contributor

@DESTROYGIRL DESTROYGIRL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks

@DESTROYGIRL DESTROYGIRL requested a review from a team July 24, 2025 12:06
@DESTROYGIRL DESTROYGIRL added the Tutorial This needs to work for the tutorial label Jul 24, 2025
@Rainyan Rainyan requested review from Rainyan and removed request for a team July 24, 2025 12:30
Rainyan
Rainyan previously approved these changes Jul 24, 2025
View reviewed changes
@DESTROYGIRL
Copy link
Contributor

DESTROYGIRL commented Jul 24, 2025

Hold up this mightve broken the firing range xd

DESTROYGIRL
DESTROYGIRL requested changes Jul 24, 2025
View reviewed changes
Copy link
Contributor

@DESTROYGIRL DESTROYGIRL left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On any other gamemode with respawns you can no longer spawn it seems
Funny thats the exactly the title of the pr but also a bad thing

@Rainyan
Copy link
Collaborator

Rainyan commented Jul 24, 2025

Maybe the logic could be tied to the NEO_GAME_TYPE_TUT gametype instead of respawning, since we essentially just need a special case for the tutorial map(s)?

sunzenshen
sunzenshen reviewed Jul 25, 2025
View reviewed changes
@AdamTadeusz
Copy link
Contributor Author

AdamTadeusz commented Jul 25, 2025

Ok this works fine, the issue with mp_forcerespawn is present on master as well, most likely since nextbots were first introduced since thats when Actions were added which is where the problem is. Adding some checks whether player is a fake client in CBasePlayer::PlayerDeathThink fixes the problem with mp_forcerespawn set to 0, I want to explore this in more detail, will open a separate pr

Rainyan
Rainyan approved these changes Jul 26, 2025
View reviewed changes
@AdamTadeusz AdamTadeusz merged commit 9b5381b into NeotokyoRebuild:master Jul 31, 2025
7 checks passed
@AdamTadeusz AdamTadeusz deleted the 256_instantSpawnBreakTutorialFix branch July 31, 2025 13:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sunzenshen sunzenshen sunzenshen approved these changes

@Rainyan Rainyan Rainyan approved these changes

@DESTROYGIRL DESTROYGIRL DESTROYGIRL approved these changes

Assignees

No one assigned

Labels

Tutorial This needs to work for the tutorial

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Players are spawned instantly in the tutorial, preventing them from picking a class other than assault

4 participants

@AdamTadeusz @DESTROYGIRL @Rainyan @sunzenshen