-
Notifications
You must be signed in to change notification settings - Fork 63
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: morpheus not properly waking players, not awarding buffs for sleeping #412
Merged
Dream-Master
merged 6 commits into
GTNewHorizons:master
from
leumasme:fix-morpheus-waking
Sep 1, 2024
Merged
fix: morpheus not properly waking players, not awarding buffs for sleeping #412
Dream-Master
merged 6 commits into
GTNewHorizons:master
from
leumasme:fix-morpheus-waking
Sep 1, 2024
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
0031929.mp4 |
glowredman
reviewed
Aug 29, 2024
src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/WorldServerAccessor.java
Outdated
Show resolved
Hide resolved
glowredman
reviewed
Sep 1, 2024
src/main/java/com/mitchej123/hodgepodge/mixins/late/morpheus/MixinMorpheusWakePlayers.java
Outdated
Show resolved
Hide resolved
Alexdoru
requested changes
Sep 1, 2024
src/main/java/com/mitchej123/hodgepodge/mixins/late/morpheus/MixinMorpheusWakePlayers.java
Outdated
Show resolved
Hide resolved
src/main/java/com/mitchej123/hodgepodge/mixins/late/morpheus/MixinMorpheusWakePlayers.java
Outdated
Show resolved
Hide resolved
leumasme
force-pushed
the
fix-morpheus-waking
branch
from
September 1, 2024 10:44
98a0fbc
to
8140d63
Compare
looks good to me |
glowredman
approved these changes
Sep 1, 2024
Alexdoru
approved these changes
Sep 1, 2024
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.
Closes GTNewHorizons/GT-New-Horizons-Modpack#16893
Morpheus doesn't actually wake players when a new day starts, it only sets the day time.
This causes players to instead wake up automatically on the next tick as they're in a bed while its day.
This isn't good, and causes the
GT5-Unofficial
buff you get after sleeping to not be awarded.This uses an Accessor mixin to call
wakeAllPlayers
. Because this has to run early but the actual Morpheus fix has to run late, they're split into two mixins.Maybe reorganize the Accessor mixin to be in the general/minecraft section instead of Morpheus (+change description)? Not sure; this is my first hodgepodge PR
Transforms the Morpheus Method
into the equivalent of
The return before the call to
resetRainAndThunder
is intentional, aswakeAllPlayers
also callsresetRainAndThunder
Tested ingame to verify that it works. The behavior is now