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
8b5d7855
Commit
8b5d7855
authored
Apr 21, 2022
by
Melledy
Committed by
GitHub
Apr 21, 2022
Browse files
Merge pull request #92 from Grasscutters/account-fix
Fixes for the error in the revive command
parents
db1c4cd4
04791b68
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/Grasscutter.java
View file @
8b5d7855
...
@@ -86,8 +86,10 @@ public final class Grasscutter {
...
@@ -86,8 +86,10 @@ public final class Grasscutter {
public
static
void
loadConfig
()
{
public
static
void
loadConfig
()
{
try
(
FileReader
file
=
new
FileReader
(
configFile
))
{
try
(
FileReader
file
=
new
FileReader
(
configFile
))
{
config
=
gson
.
fromJson
(
file
,
Config
.
class
);
config
=
gson
.
fromJson
(
file
,
Config
.
class
);
saveConfig
();
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
Grasscutter
.
config
=
new
Config
();
saveConfig
();
Grasscutter
.
config
=
new
Config
();
saveConfig
();
}
}
}
}
...
...
src/main/java/emu/grasscutter/command/commands/Revive.java
→
src/main/java/emu/grasscutter/command/commands/Revive
Command
.java
View file @
8b5d7855
package
emu.grasscutter.command.commands
;
package
emu.grasscutter.command.commands
;
import
emu.grasscutter.command.Command
;
import
emu.grasscutter.command.Command
;
import
emu.grasscutter.command.CommandHandler
;
import
emu.grasscutter.command.CommandHandler
;
import
emu.grasscutter.game.GenshinPlayer
;
import
emu.grasscutter.game.GenshinPlayer
;
import
emu.grasscutter.game.TeamManager
;
import
emu.grasscutter.game.TeamManager
;
//import emu.grasscutter.game.avatar.GenshinAvatar;
//import emu.grasscutter.game.avatar.GenshinAvatar;
//import emu.grasscutter.game.TeamInfo;
//import emu.grasscutter.game.TeamInfo;
import
emu.grasscutter.game.entity.EntityAvatar
;
import
emu.grasscutter.game.entity.EntityAvatar
;
import
emu.grasscutter.game.props.FightProperty
;
import
emu.grasscutter.game.props.FightProperty
;
import
emu.grasscutter.server.packet.send.PacketAvatarFightPropUpdateNotify
;
import
emu.grasscutter.server.packet.send.PacketAvatarFightPropUpdateNotify
;
import
emu.grasscutter.server.packet.send.PacketAvatarLifeStateChangeNotify
;
import
emu.grasscutter.server.packet.send.PacketAvatarLifeStateChangeNotify
;
import
java.util.List
;
import
java.util.List
;
@Command
(
label
=
"revive"
,
aliases
=
{
"rev"
},
@Command
(
label
=
"revive"
,
aliases
=
{
"rev"
},
usage
=
"revive|rev"
,
description
=
"Revive character(s) that died)"
)
usage
=
"revive|rev"
,
description
=
"Revive character(s) that died)"
)
public
class
Revive
implements
CommandHandler
{
public
class
Revive
Command
implements
CommandHandler
{
//private Object teamId;
//private Object teamId;
@Override
@Override
public
void
execute
(
GenshinPlayer
player
,
List
<
String
>
args
)
{
public
void
execute
(
GenshinPlayer
player
,
List
<
String
>
args
)
{
for
(
EntityAvatar
entity2
:
TeamManager
.
getActiveTeam
())
{
for
(
EntityAvatar
entity2
:
player
.
get
TeamManager
()
.
getActiveTeam
())
{
entity2
.
setFightProperty
(
entity2
.
setFightProperty
(
FightProperty
.
FIGHT_PROP_CUR_HP
,
FightProperty
.
FIGHT_PROP_CUR_HP
,
entity2
.
getFightProperty
(
FightProperty
.
FIGHT_PROP_MAX_HP
)
*
.
4
f
entity2
.
getFightProperty
(
FightProperty
.
FIGHT_PROP_MAX_HP
)
*
.
4
f
);
);
player
.
sendPacket
(
new
PacketAvatarFightPropUpdateNotify
(
entity2
.
getAvatar
(),
FightProperty
.
FIGHT_PROP_CUR_HP
));
player
.
sendPacket
(
new
PacketAvatarFightPropUpdateNotify
(
entity2
.
getAvatar
(),
FightProperty
.
FIGHT_PROP_CUR_HP
));
player
.
sendPacket
(
new
PacketAvatarLifeStateChangeNotify
(
entity2
.
getAvatar
()));
player
.
sendPacket
(
new
PacketAvatarLifeStateChangeNotify
(
entity2
.
getAvatar
()));
}
}
player
.
dropMessage
(
"Character revived."
);
player
.
dropMessage
(
"Character revived."
);
}
}
}
}
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