Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
9b3ca239
Commit
9b3ca239
authored
2 years ago
by
gentlespoon
Committed by
Melledy
2 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Prepare MovementManager.updateStamina() for external calls.
parent
ff52255a
development
LintRatchet
stable
v1.4.4
v1.4.3
v1.4.2
v1.4.1
v1.4.0
v1.3.1
v1.3.0
v1.2.2-dev
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/emu/grasscutter/game/managers/MovementManager/MovementManager.java
+1
-3
...cutter/game/managers/MovementManager/MovementManager.java
with
1 addition
and
3 deletions
+1
-3
src/main/java/emu/grasscutter/game/managers/MovementManager/MovementManager.java
View file @
9b3ca239
...
...
@@ -179,8 +179,6 @@ public class MovementManager {
return
player
.
getProperty
(
PlayerProperty
.
PROP_MAX_STAMINA
);
}
// Returns new stamina
public
int
updateStamina
(
GameSession
session
,
int
amount
)
{
int
currentStamina
=
session
.
getPlayer
().
getProperty
(
PlayerProperty
.
PROP_CUR_PERSIST_STAMINA
);
...
...
@@ -196,6 +194,7 @@ public class MovementManager {
newStamina
=
playerMaxStamina
;
}
session
.
getPlayer
().
setProperty
(
PlayerProperty
.
PROP_CUR_PERSIST_STAMINA
,
newStamina
);
session
.
send
(
new
PacketPlayerPropNotify
(
player
,
PlayerProperty
.
PROP_CUR_PERSIST_STAMINA
));
return
newStamina
;
}
...
...
@@ -309,7 +308,6 @@ public class MovementManager {
}
Grasscutter
.
getLogger
().
debug
(
getCurrentStamina
()
+
"/"
+
getMaximumStamina
()
+
"\t"
+
currentState
+
"\t"
+
"isMoving: "
+
isPlayerMoving
()
+
"\t("
+
consumption
.
consumptionType
+
","
+
consumption
.
amount
+
")"
);
updateStamina
(
cachedSession
,
consumption
.
amount
);
cachedSession
.
send
(
new
PacketPlayerPropNotify
(
player
,
PlayerProperty
.
PROP_CUR_PERSIST_STAMINA
));
}
// tick triggered
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help