Ensure doDaylightCycle is set to correct value on match start#917
Merged
Conversation
Signed-off-by: BT (calcastor/mame) <43831917+calcastor@users.noreply.github.com>
Co-authored-by: William Jeffcock <jeffcockw@gmail.com> Signed-off-by: BT (calcastor/mame) <43831917+calcastor@users.noreply.github.com>
Member
|
Double-check that gamerules module has world module as a dependency, otherwise the world time module may silently just be null |
Member
Yea, a quick check shows that the dependency is not setup properly. |
Signed-off-by: BT (calcastor/mame) <43831917+calcastor@users.noreply.github.com>
Electroid
approved these changes
Sep 9, 2021
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
#879 ensures that game rules like
doDaylightCycleanddoFireTickare only enabled once a match starts, if the map has them enabled. However, it seems that the definition ofdoDaylightCyclefrom thelevel.datfiles of maps unintentionally takes precedence over the default setting of<timelock>to off, when<timelock>anddoDaylightCycleare both undefined within a map's XML. This PR ensures that the default<timelock>setting ofoffagain takes precedence over the map world's setting, while also fixing an overlooked albeit small error that ensuresdoFireTickis disabled once a match ends.