Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Grasscutter
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
ziqian zhang
Grasscutter
Commits
94a6a79b
Commit
94a6a79b
authored
3 years ago
by
gentlespoon
Committed by
Melledy
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix null reference on stamina timer when paused player disconnects.
parent
c9e8d6ca
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java
+13
-17
13 additions, 17 deletions
...sscutter/game/managers/StaminaManager/StaminaManager.java
src/main/java/emu/grasscutter/game/player/Player.java
+2
-2
2 additions, 2 deletions
src/main/java/emu/grasscutter/game/player/Player.java
with
15 additions
and
19 deletions
src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java
+
13
−
17
View file @
94a6a79b
...
...
@@ -29,19 +29,16 @@ public class StaminaManager {
private
Position
previousCoordinates
=
new
Position
(
0
,
0
,
0
);
private
MotionState
currentState
=
MotionState
.
MOTION_STANDBY
;
private
MotionState
previousState
=
MotionState
.
MOTION_STANDBY
;
private
Timer
sustainedStaminaHandlerTimer
;
private
final
Timer
sustainedStaminaHandlerTimer
=
new
Timer
();
private
final
SustainedStaminaHandler
handleSustainedStamina
=
new
SustainedStaminaHandler
();
private
boolean
timerRunning
=
false
;
private
GameSession
cachedSession
=
null
;
private
GameEntity
cachedEntity
=
null
;
private
int
staminaRecoverDelay
=
0
;
private
boolean
isInSkillMove
=
false
;
public
boolean
getIsInSkillMove
()
{
return
isInSkillMove
;
}
public
void
setIsInSkillMove
(
boolean
b
)
{
isInSkillMove
=
b
;
}
...
...
@@ -139,24 +136,23 @@ public class StaminaManager {
entity
.
getWorld
().
broadcastPacket
(
new
PacketEntityFightPropUpdateNotify
(
entity
,
FightProperty
.
FIGHT_PROP_CUR_HP
));
entity
.
getWorld
().
broadcastPacket
(
new
PacketLifeStateChangeNotify
(
0
,
entity
,
LifeState
.
LIFE_DEAD
));
player
.
getScene
().
removeEntity
(
entity
);
((
EntityAvatar
)
entity
).
onDeath
(
dieType
,
0
);
((
EntityAvatar
)
entity
).
onDeath
(
dieType
,
0
);
}
public
void
startSustainedStaminaHandler
()
{
if
(!
player
.
isPaused
())
{
if
(
sustainedStaminaHandlerTimer
==
null
)
{
sustainedStaminaHandlerTimer
=
new
Timer
();
sustainedStaminaHandlerTimer
.
scheduleAtFixedRate
(
new
SustainedStaminaHandler
(),
0
,
200
);
Grasscutter
.
getLogger
().
debug
(
"[MovementManager] SustainedStaminaHandlerTimer started"
);
}
if
(!
player
.
isPaused
()
&&
!
timerRunning
)
{
timerRunning
=
true
;
sustainedStaminaHandlerTimer
.
scheduleAtFixedRate
(
handleSustainedStamina
,
0
,
200
);
// Grasscutter.getLogger().debug("[MovementManager] SustainedStaminaHandlerTimer started");
}
}
public
void
stopSustainedStaminaHandler
()
{
Grasscutter
.
getLogger
().
debug
(
"[MovementManager] SustainedStaminaHandlerTimer stopped"
);
sustainedStaminaHandlerTimer
.
cancel
();
sustainedStaminaHandlerTimer
=
null
;
if
(
timerRunning
)
{
timerRunning
=
false
;
sustainedStaminaHandlerTimer
.
cancel
();
// Grasscutter.getLogger().debug("[MovementManager] SustainedStaminaHandlerTimer stopped");
}
}
// Handlers
...
...
This diff is collapsed.
Click to expand it.
src/main/java/emu/grasscutter/game/player/Player.java
+
2
−
2
View file @
94a6a79b
...
...
@@ -872,11 +872,11 @@ public class Player {
}
public
void
onPause
()
{
s
taminaManager
.
stopSustainedStaminaHandler
();
getS
taminaManager
()
.
stopSustainedStaminaHandler
();
}
public
void
onUnpause
()
{
s
taminaManager
.
startSustainedStaminaHandler
();
getS
taminaManager
()
.
startSustainedStaminaHandler
();
}
public
void
sendPacket
(
BasePacket
packet
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment