Skip to content
GitLab
Menu
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
58115566
Commit
58115566
authored
May 24, 2022
by
logictc
Committed by
Melledy
May 24, 2022
Browse files
don't take effect if energyUsage is false
parent
af381dcf
Changes
1
Show whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/game/avatar/Avatar.java
View file @
58115566
...
@@ -360,8 +360,10 @@ public class Avatar {
...
@@ -360,8 +360,10 @@ public class Avatar {
}
}
public
void
setCurrentEnergy
()
{
public
void
setCurrentEnergy
()
{
if
(
GAME_OPTIONS
.
energyUsage
)
{
this
.
setCurrentEnergy
(
this
.
currentEnergy
);
this
.
setCurrentEnergy
(
this
.
currentEnergy
);
}
}
}
public
void
setCurrentEnergy
(
float
currentEnergy
)
{
public
void
setCurrentEnergy
(
float
currentEnergy
)
{
if
(
this
.
getSkillDepot
()
!=
null
&&
this
.
getSkillDepot
().
getEnergySkillData
()
!=
null
)
{
if
(
this
.
getSkillDepot
()
!=
null
&&
this
.
getSkillDepot
().
getEnergySkillData
()
!=
null
)
{
...
@@ -378,10 +380,12 @@ public class Avatar {
...
@@ -378,10 +380,12 @@ public class Avatar {
}
}
public
void
setCurrentEnergy
(
FightProperty
curEnergyProp
,
float
currentEnergy
)
{
public
void
setCurrentEnergy
(
FightProperty
curEnergyProp
,
float
currentEnergy
)
{
if
(
GAME_OPTIONS
.
energyUsage
)
{
this
.
setFightProperty
(
curEnergyProp
,
currentEnergy
);
this
.
setFightProperty
(
curEnergyProp
,
currentEnergy
);
this
.
currentEnergy
=
currentEnergy
;
this
.
currentEnergy
=
currentEnergy
;
this
.
save
();
this
.
save
();
}
}
}
public
Int2FloatOpenHashMap
getFightProperties
()
{
public
Int2FloatOpenHashMap
getFightProperties
()
{
return
fightProp
;
return
fightProp
;
...
...
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