Emitter stacks fix #13539
Merged
Emitter stacks fix #13539
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
N3X15
added
Bug / Fix
Because 0 is used for machines that don't anchor or deanchor. 1 is used for success in all the machine procs that I wrote in that rewrite, and -1 is used for failure. Anything using wrenchAnchor was written after that fact, and its assumptions are wrong. |
ComicIronic
reviewed
Jan 19, 2017
| @@ -564,7 +564,8 @@ Class Procs: | |||
| to_chat(user, "\The [src] has to be unwelded from the floor first.") | |||
| return -1 //state set to 2, can't do it | |||
| else | |||
| if(wrenchAnchor(user) && machine_flags && FIXED2WORK) //wrenches/unwrenches into place if possible, then updates the power and state if necessary | |||
| // wrenchAnchor returns -1 on check failures, for some reason. | |||
| if(wrenchAnchor(user) == 1 && machine_flags && FIXED2WORK) //wrenches/unwrenches into place if possible, then updates the power and state if necessary | |||
There was a problem hiding this comment.
How long has this check even been like this - that should be a bitwise &.
|
I'll go over the code at some point and replace the -1 and 1 occurances with success and failure defines. |
ihadtoregisterforthis
pushed a commit
to ihadtoregisterforthis/fork4
that referenced
this pull request
Jul 3, 2017
* Exploit fix for machine stacking. * Fixes made during testing. * Fix some minor indentation issues. * honk
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Executive Summary
Fixes a stacking exploit with some machinery.
Technical information
Some fucktard decided that
/obj/wrenchAnchor()should return -1 instead of 0 on failure. Guess what all other code assumes?This also checks to see if we should anchor AFTER the do_after, in case a new dense object is added after the wait.
Changelog
馃啈