Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-21 03:15:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #802 from Grasscutters/better-config

Browse Source 
Implement a better config structure
This commit is contained in:
Magix
2022-05-11 01:23:43 -04:00
committed by GitHub
parent 54cf45a72e 812f4b372c
commit 22cbe74875
40 changed files with 673 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java
View File

@@ -21,6 +21,8 @@ import org.jetbrains.annotations.NotNull;
import java.lang.Math;
import java.util.*;
import static emu.grasscutter.Configuration.*;
public class StaminaManager {
// TODO: Skiff state detection?
@@ -293,9 +295,10 @@ public class StaminaManager {
// Returns new stamina and sends PlayerPropNotify
public int setStamina(GameSession session, String reason, int newStamina) {
if (!Grasscutter.getConfig().OpenStamina) {
if (!GAME_OPTIONS.staminaUsage) {
newStamina = player.getProperty(PlayerProperty.PROP_MAX_STAMINA);
}
// set stamina
player.setProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA, newStamina);
session.send(new PacketPlayerPropNotify(player, PlayerProperty.PROP_CUR_PERSIST_STAMINA));