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 server NRE on clicking alerts with no OnClick #2748

Merged
merged 2 commits into from
Dec 16, 2020
Merged

Fix server NRE on clicking alerts with no OnClick #2748

merged 2 commits into from
Dec 16, 2020

Conversation

chairbender
Copy link
Contributor

@chairbender chairbender commented Dec 16, 2020

Fixes #2744

also makes it so the client won't send a click message unless there's an onclick for the alert.

note that there actually wasn't any pre-existing logic for uncuffing by clicking the alert, and this is not adding any such logic, it is just fixing the NRE

…click

message unless the alert has an onclick
…click

message unless the alert has an onclick
@gradientvera gradientvera merged commit 27d5019 into space-wizards:master Dec 16, 2020
collinlunn pushed a commit to collinlunn/space-station-14 that referenced this pull request Dec 20, 2020
* space-wizards#2744 fix NRE on clicking alerts with no OnClick, and don't send the click
message unless the alert has an onclick

* space-wizards#2744 fix NRE on clicking alerts with no OnClick, and don't send the click
message unless the alert has an onclick
collinlunn pushed a commit to collinlunn/space-station-14 that referenced this pull request Jan 6, 2021
* space-wizards#2744 fix NRE on clicking alerts with no OnClick, and don't send the click
message unless the alert has an onclick

* space-wizards#2744 fix NRE on clicking alerts with no OnClick, and don't send the click
message unless the alert has an onclick
Fildrance pushed a commit to Fildrance/space-station-14 that referenced this pull request Dec 2, 2024
Kirus59 pushed a commit to Kirus59/space-station-14 that referenced this pull request Dec 29, 2024
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
stalengd pushed a commit to SerbiaStrong-220/space-station-14 that referenced this pull request Dec 30, 2024
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>

* fix locale (space-wizards#2688)

* Fix morgue.ftl locale (space-wizards#2707)

* Translate Upstream space-wizards#2718 (space-wizards#2719)

Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: mhamster <81412348+mhamsterr@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>

* fix arrivals gender locale (space-wizards#2723)

* fix law locale (space-wizards#2734)

* Фикс законов боргов. (space-wizards#2754)

* replace zzz (space-wizards#2758)

* Translate Upstream space-wizards#2785 (space-wizards#2797)

Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>

* translate borer names (space-wizards#2835)

* Перевод Upstream space-wizards#2830  (space-wizards#2836)

Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>

* Translate Upstream space-wizards#2748 (space-wizards#2837)

Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>

* duplicates fix

* duplicates fix 2

* duplicates fix 3

* gender fix

* change timers desc

* delete corvax locale

* delete corvax comment

* SS220 antimov law

* Lost soul tweaks

* change comments

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Co-authored-by: mhamster <81412348+mhamsterr@users.noreply.github.com>
Co-authored-by: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com>
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Alerts exception when uncuffing
2 participants