Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-23 16:16:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92 from Grasscutters/account-fix

Browse Source 
Fixes for the error in the revive command
This commit is contained in:
Melledy 2022-04-21 14:48:18 -07:00 committed by GitHub
commit 9cf49c3a76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/grasscutter/Grasscutter.java
View File

@ -86,8 +86,10 @@ public final class Grasscutter {
public static void loadConfig() {
try (FileReader file = new FileReader(configFile)) {
config = gson.fromJson(file, Config.class);
saveConfig();
} catch (Exception e) {
Grasscutter.config = new Config(); saveConfig();
Grasscutter.config = new Config();
saveConfig();
}
}

66
src/main/java/emu/grasscutter/command/commands/Revive.java → src/main/java/emu/grasscutter/command/commands/ReviveCommand.java
View File

@ -1,33 +1,33 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.GenshinPlayer;
import emu.grasscutter.game.TeamManager;
//import emu.grasscutter.game.avatar.GenshinAvatar;
//import emu.grasscutter.game.TeamInfo;
import emu.grasscutter.game.entity.EntityAvatar;
import emu.grasscutter.game.props.FightProperty;
import emu.grasscutter.server.packet.send.PacketAvatarFightPropUpdateNotify;
import emu.grasscutter.server.packet.send.PacketAvatarLifeStateChangeNotify;
import java.util.List;
@Command(label = "revive", aliases = {"rev"},
usage = "revive|rev", description = "Revive character(s) that died)")
public class Revive implements CommandHandler {
//private Object teamId;
@Override
public void execute(GenshinPlayer player, List<String> args) {
for (EntityAvatar entity2 : TeamManager.getActiveTeam()) {
entity2.setFightProperty(
FightProperty.FIGHT_PROP_CUR_HP,
entity2.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP) * .4f
);
player.sendPacket(new PacketAvatarFightPropUpdateNotify(entity2.getAvatar(), FightProperty.FIGHT_PROP_CUR_HP));
player.sendPacket(new PacketAvatarLifeStateChangeNotify(entity2.getAvatar()));
}
player.dropMessage("Character revived.");
}
}
package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.GenshinPlayer;
import emu.grasscutter.game.TeamManager;
//import emu.grasscutter.game.avatar.GenshinAvatar;
//import emu.grasscutter.game.TeamInfo;
import emu.grasscutter.game.entity.EntityAvatar;
import emu.grasscutter.game.props.FightProperty;
import emu.grasscutter.server.packet.send.PacketAvatarFightPropUpdateNotify;
import emu.grasscutter.server.packet.send.PacketAvatarLifeStateChangeNotify;
import java.util.List;
@Command(label = "revive", aliases = {"rev"},
usage = "revive|rev", description = "Revive character(s) that died)")
public class ReviveCommand implements CommandHandler {
//private Object teamId;
@Override
public void execute(GenshinPlayer player, List<String> args) {
for (EntityAvatar entity2 : player.getTeamManager().getActiveTeam()) {
entity2.setFightProperty(
FightProperty.FIGHT_PROP_CUR_HP,
entity2.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP) * .4f
);
player.sendPacket(new PacketAvatarFightPropUpdateNotify(entity2.getAvatar(), FightProperty.FIGHT_PROP_CUR_HP));
player.sendPacket(new PacketAvatarLifeStateChangeNotify(entity2.getAvatar()));
}
player.dropMessage("Character revived.");
}
}