Skip to content
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.

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

Fix players dying when mantling on props or embarking Titans in mp_complex3 #709

Merged
merged 7 commits into from
Oct 2, 2023

Conversation

Zanieon
Copy link
Contributor

@Zanieon Zanieon commented Sep 13, 2023

There's a whole trigger_hurt right below the ground in the inner large hallway which whenever a player tries to mantle on any of the props in there either intentionally or by accident they will instantly die. This also applies to when you embark your titan in there. This does not happen on vanilla servers.

This PR removes the trigger that kills the player.

image
image

Copy link
Contributor

@ASpoonPlaysGames ASpoonPlaysGames left a comment

Choose a reason for hiding this comment

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

This is a bit hacky, but I'd say that it is preferable to shipping the entire .ent file just to remove/edit the trigger in there.

Also saw this working in testing on discord

@ASpoonPlaysGames ASpoonPlaysGames added the needs testing Changes from the PR still need to be tested label Sep 13, 2023
@ASpoonPlaysGames
Copy link
Contributor

Adding "needs testing" because I would kinda like a second person to test this (the person I saw testing in discord was @Zanieon who is the author of the PR)

@Zanieon
Copy link
Contributor Author

Zanieon commented Sep 14, 2023

Alright changed method of fixing the problem to what @ASpoonPlaysGames suggested, now it really needs a testing from another person other than me to see if everything is still alright.

@ASpoonPlaysGames ASpoonPlaysGames added the commits vanilla file For PRs that commit vanilla files from VPKs label Sep 14, 2023
Copy link
Contributor

@uniboi uniboi left a comment

Choose a reason for hiding this comment

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

code looks good and I didn't find the brush in the map

@ASpoonPlaysGames ASpoonPlaysGames added READY TO MERGE This mergeable right now and removed needs testing Changes from the PR still need to be tested labels Oct 1, 2023
@GeckoEidechse GeckoEidechse changed the title Fix players dying when mantling on props or embarking titans in mp_complex3 Fix players dying when mantling on props or embarking titans in mp_complex3 Oct 2, 2023
@GeckoEidechse GeckoEidechse changed the title Fix players dying when mantling on props or embarking titans in mp_complex3 Fix players dying when mantling on props or embarking Titans in mp_complex3 Oct 2, 2023
Copy link
Member

@GeckoEidechse GeckoEidechse left a comment

Choose a reason for hiding this comment

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

Confirmed working in testing. I simply replicated the bug without the PR shown in the screenshot by mantling the couch table and getting killed by the trigger in the process.

With the PR installed I no longer get killed.

I did not look at the actual ent file so no "code review" done by me..

@GeckoEidechse GeckoEidechse removed the commits vanilla file For PRs that commit vanilla files from VPKs label Oct 2, 2023
@GeckoEidechse
Copy link
Member

Original vanilla file has been committed in c7149b7

@GeckoEidechse GeckoEidechse merged commit 9605106 into R2Northstar:main Oct 2, 2023
3 checks passed
@Zanieon Zanieon deleted the mp_complex3_triggerfix branch October 2, 2023 22:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
READY TO MERGE This mergeable right now
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants