Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-10 12:42:52 +08: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 8b5d78557f
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() { 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();
} }
} }

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

@ -15,12 +15,12 @@ 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 ReviveCommand 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.getTeamManager().getActiveTeam()) {
entity2.setFightProperty( entity2.setFightProperty(
FightProperty.FIGHT_PROP_CUR_HP, FightProperty.FIGHT_PROP_CUR_HP,
entity2.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP) * .4f entity2.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP) * .4f