StaminaManager update #680
Merged
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
ghost
suggested changes
May 8, 2022
| int maxDelay = 200; | ||
| long actualDelay = System.currentTimeMillis() - cachedLandingTimeMillisecond; | ||
| Grasscutter.getLogger().debug("MOTION_FALL_ON_GROUND received after " + actualDelay + "/" + maxDelay + "ms." + (actualDelay > maxDelay ? " Discard" : "")); | ||
| Grasscutter.getLogger().trace("MOTION_FALL_ON_GROUND received after " + actualDelay + "/" + maxDelay + "ms." + (actualDelay > maxDelay ? " Discard" : "")); |
There was a problem hiding this comment.
This one should be left as DEBUG actually.
| float newHP = currentHP - damage; | ||
| if (newHP < 0) { | ||
| newHP = 0; | ||
| } | ||
| Grasscutter.getLogger().debug(currentHP + "/" + maxHP + "\t" + "\tDamage: " + damage + "\tnewHP: " + newHP); | ||
| if (damageFactor > 0) { | ||
| Grasscutter.getLogger().debug(currentHP + "/" + maxHP + "\tLandingSpeed: " + cachedLandingSpeed + |
There was a problem hiding this comment.
Don't see particular reason to keep DEBUG here specifically for damageFactor > 0, however regardless of whether it'll be kept or not, there should be some indication on where the log message is coming from, as it is otherwise not clear at all (just bunch of numbers).
| } | ||
|
|
||
| private boolean isPlayerMoving() { | ||
| float diffX = currentCoordinates.getX() - previousCoordinates.getX(); | ||
| float diffY = currentCoordinates.getY() - previousCoordinates.getY(); | ||
| float diffZ = currentCoordinates.getZ() - previousCoordinates.getZ(); | ||
| Grasscutter.getLogger().debug("isPlayerMoving: " + previousCoordinates + ", " + currentCoordinates + | ||
| Grasscutter.getLogger().trace("isPlayerMoving: " + previousCoordinates + ", " + currentCoordinates + |
There was a problem hiding this comment.
Also needs indication on where it came from, I propose StaminaManager::isPlayerMoving. isPlayerMoving alone is pretty generic name that I don't doubt will be reused.
| int playerMaxStamina = player.getProperty(PlayerProperty.PROP_MAX_STAMINA); | ||
| Grasscutter.getLogger().debug(currentStamina + "/" + playerMaxStamina + "\t" + currentState + "\t" + | ||
| Grasscutter.getLogger().trace(currentStamina + "/" + playerMaxStamina + "\t" + currentState + "\t" + |
| for (Map.Entry<String, BeforeUpdateStaminaListener> listener : beforeUpdateStaminaListeners.entrySet()) { | ||
| int overriddenNewStamina = listener.getValue().onBeforeUpdateStamina(reason, newStamina); | ||
| if (overriddenNewStamina != newStamina) { | ||
| Grasscutter.getLogger().debug("[StaminaManager] Stamina update absolute(" + |
| if (!player.isPaused() && sustainedStaminaHandlerTimer == null) { | ||
| sustainedStaminaHandlerTimer = new Timer(); | ||
| sustainedStaminaHandlerTimer.scheduleAtFixedRate(new SustainedStaminaHandler(), 0, 200); | ||
| Grasscutter.getLogger().debug("[MovementManager] SustainedStaminaHandlerTimer started"); |
| sustainedStaminaHandlerTimer.cancel(); | ||
| // Grasscutter.getLogger().debug("[MovementManager] SustainedStaminaHandlerTimer stopped"); | ||
| sustainedStaminaHandlerTimer = null; | ||
| Grasscutter.getLogger().debug("[MovementManager] SustainedStaminaHandlerTimer stopped"); |
| @@ -218,22 +292,30 @@ public void run() { | |||
| int currentStamina = player.getProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA); | |||
| int maxStamina = player.getProperty(PlayerProperty.PROP_MAX_STAMINA); | |||
| if (moving || (currentStamina < maxStamina)) { | |||
| Grasscutter.getLogger().debug("Player moving: " + moving + ", stamina full: " + | |||
| Grasscutter.getLogger().trace("Player moving: " + moving + ", stamina full: " + | |||
ghost
approved these changes
May 8, 2022
ghost
merged commit
This pull request was closed.
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.
Fix stamina consumption log flooding problem.
Changes for allowing stamina consumption override.
Add TODO's in StaminaManager.
Type of changes
Checklist: