Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-09 17:32:53 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37 from memetrollsXD/restart-command

Browse Source 
Restart command
This commit is contained in:
Melledy 2022-04-20 02:14:32 -07:00 committed by GitHub
commit f52a1ae183
2 changed files with 148 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/query_cur_region.txt
View File

File diff suppressed because one or more lines are too long

249
src/main/java/emu/grasscutter/commands/PlayerCommands.java
View File

@ -20,7 +20,9 @@ import emu.grasscutter.game.props.ActionReason;
import emu.grasscutter.game.props.FightProperty; import emu.grasscutter.game.props.FightProperty;
import emu.grasscutter.game.props.PlayerProperty; import emu.grasscutter.game.props.PlayerProperty;
import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify; import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
import emu.grasscutter.server.packet.send.PacketGetPlayerTokenRsp;
import emu.grasscutter.server.packet.send.PacketItemAddHintNotify; import emu.grasscutter.server.packet.send.PacketItemAddHintNotify;
import emu.grasscutter.server.packet.send.PacketPlayerLoginRsp;
import emu.grasscutter.utils.Position; import emu.grasscutter.utils.Position;
import java.util.LinkedList; import java.util.LinkedList;
@ -38,7 +40,7 @@ public final class PlayerCommands {
public void execute(GenshinPlayer player, List<String> args) { public void execute(GenshinPlayer player, List<String> args) {
int target, item, amount = 1; int target, item, amount = 1;
switch(args.size()) { switch (args.size()) {
default: default:
CommandHandler.sendMessage(player, "Usage: give <player> <itemId|itemName> [amount]"); CommandHandler.sendMessage(player, "Usage: give <player> <itemId|itemName> [amount]");
return; return;
@ -56,8 +58,9 @@ public final class PlayerCommands {
try { try {
target = Integer.parseInt(args.get(0)); target = Integer.parseInt(args.get(0));
if(Grasscutter.getGameServer().getPlayerByUid(target) == null) { if (Grasscutter.getGameServer().getPlayerByUid(target) == null) {
target = player.getUid(); amount = Integer.parseInt(args.get(1)); target = player.getUid();
amount = Integer.parseInt(args.get(1));
item = Integer.parseInt(args.get(0)); item = Integer.parseInt(args.get(0));
} else { } else {
item = Integer.parseInt(args.get(1)); item = Integer.parseInt(args.get(1));
@ -71,9 +74,10 @@ public final class PlayerCommands {
case 3: case 3:
try { try {
target = Integer.parseInt(args.get(0)); target = Integer.parseInt(args.get(0));
if(Grasscutter.getGameServer().getPlayerByUid(target) == null) { if (Grasscutter.getGameServer().getPlayerByUid(target) == null) {
CommandHandler.sendMessage(player, "Invalid player ID."); return; CommandHandler.sendMessage(player, "Invalid player ID.");
return;
} }
item = Integer.parseInt(args.get(1)); item = Integer.parseInt(args.get(1));
@ -88,23 +92,26 @@ public final class PlayerCommands {
GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target); GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
if(targetPlayer == null) { if (targetPlayer == null) {
CommandHandler.sendMessage(player, "Player not found."); return; CommandHandler.sendMessage(player, "Player not found.");
return;
} }
ItemData itemData = GenshinData.getItemDataMap().get(item); ItemData itemData = GenshinData.getItemDataMap().get(item);
if(itemData == null) { if (itemData == null) {
CommandHandler.sendMessage(player, "Invalid item id."); return; CommandHandler.sendMessage(player, "Invalid item id.");
return;
} }
this.item(targetPlayer, itemData, amount); this.item(targetPlayer, itemData, amount);
} }
/** /**
* give [player] [itemId|itemName] [amount] * give [player] [itemId|itemName] [amount]
*/ */
@Override public void execute(List<String> args) { @Override
if(args.size() < 2) { public void execute(List<String> args) {
if (args.size() < 2) {
CommandHandler.sendMessage(null, "Usage: give <player> <itemId|itemName> [amount]"); CommandHandler.sendMessage(null, "Usage: give <player> <itemId|itemName> [amount]");
return; return;
} }
@ -112,32 +119,37 @@ public final class PlayerCommands {
try { try {
int target = Integer.parseInt(args.get(0)); int target = Integer.parseInt(args.get(0));
int item = Integer.parseInt(args.get(1)); int item = Integer.parseInt(args.get(1));
int amount = 1; if(args.size() > 2) amount = Integer.parseInt(args.get(2)); int amount = 1;
if (args.size() > 2)
amount = Integer.parseInt(args.get(2));
GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target); GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
if(targetPlayer == null) { if (targetPlayer == null) {
CommandHandler.sendMessage(null, "Player not found."); return; CommandHandler.sendMessage(null, "Player not found.");
return;
} }
ItemData itemData = GenshinData.getItemDataMap().get(item); ItemData itemData = GenshinData.getItemDataMap().get(item);
if(itemData == null) { if (itemData == null) {
CommandHandler.sendMessage(null, "Invalid item id."); return; CommandHandler.sendMessage(null, "Invalid item id.");
return;
} }
this.item(targetPlayer, itemData, amount); this.item(targetPlayer, itemData, amount);
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
CommandHandler.sendMessage(null, "Invalid item or player ID."); CommandHandler.sendMessage(null, "Invalid item or player ID.");
} }
} }
private void item(GenshinPlayer player, ItemData itemData, int amount) { private void item(GenshinPlayer player, ItemData itemData, int amount) {
GenshinItem genshinItem = new GenshinItem(itemData); GenshinItem genshinItem = new GenshinItem(itemData);
if(itemData.isEquip()) { if (itemData.isEquip()) {
List<GenshinItem> items = new LinkedList<>(); List<GenshinItem> items = new LinkedList<>();
for(int i = 0; i < amount; i++) { for (int i = 0; i < amount; i++) {
items.add(genshinItem); items.add(genshinItem);
} player.getInventory().addItems(items); }
player.getInventory().addItems(items);
player.sendPacket(new PacketItemAddHintNotify(items, ActionReason.SubfieldDrop)); player.sendPacket(new PacketItemAddHintNotify(items, ActionReason.SubfieldDrop));
} else { } else {
genshinItem.setCount(amount); genshinItem.setCount(amount);
@ -146,7 +158,6 @@ public final class PlayerCommands {
} }
} }
} }
@Command(label = "drop", aliases = {"d", "dropitem"}, @Command(label = "drop", aliases = {"d", "dropitem"},
usage = "drop <itemId|itemName> [amount]", usage = "drop <itemId|itemName> [amount]",
execution = Command.Execution.PLAYER, description = "Drops an item near you", permission = "server.drop") execution = Command.Execution.PLAYER, description = "Drops an item near you", permission = "server.drop")
@ -154,29 +165,34 @@ public final class PlayerCommands {
@Override @Override
public void execute(GenshinPlayer player, List<String> args) { public void execute(GenshinPlayer player, List<String> args) {
if(args.size() < 1) { if (args.size() < 1) {
CommandHandler.sendMessage(player, "Usage: drop <itemId|itemName> [amount]"); CommandHandler.sendMessage(player, "Usage: drop <itemId|itemName> [amount]");
return; return;
} }
try { try {
int item = Integer.parseInt(args.get(0)); int item = Integer.parseInt(args.get(0));
int amount = 1; if(args.size() > 1) amount = Integer.parseInt(args.get(1)); int amount = 1;
if (args.size() > 1)
amount = Integer.parseInt(args.get(1));
ItemData itemData = GenshinData.getItemDataMap().get(item); ItemData itemData = GenshinData.getItemDataMap().get(item);
if(itemData == null) { if (itemData == null) {
CommandHandler.sendMessage(player, "Invalid item id."); return; CommandHandler.sendMessage(player, "Invalid item id.");
return;
} }
if (itemData.isEquip()) { if (itemData.isEquip()) {
float range = (5f + (.1f * amount)); float range = (5f + (.1f * amount));
for (int i = 0; i < amount; i++) { for (int i = 0; i < amount; i++) {
Position pos = player.getPos().clone().addX((float) (Math.random() * range) - (range / 2)).addY(3f).addZ((float) (Math.random() * range) - (range / 2)); Position pos = player.getPos().clone().addX((float) (Math.random() * range) - (range / 2))
.addY(3f).addZ((float) (Math.random() * range) - (range / 2));
EntityItem entity = new EntityItem(player.getScene(), player, itemData, pos, 1); EntityItem entity = new EntityItem(player.getScene(), player, itemData, pos, 1);
player.getScene().addEntity(entity); player.getScene().addEntity(entity);
} }
} else { } else {
EntityItem entity = new EntityItem(player.getScene(), player, itemData, player.getPos().clone().addY(3f), amount); EntityItem entity = new EntityItem(player.getScene(), player, itemData,
player.getPos().clone().addY(3f), amount);
player.getScene().addEntity(entity); player.getScene().addEntity(entity);
} }
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
@ -188,23 +204,24 @@ public final class PlayerCommands {
@Command(label = "givechar", aliases = { "givec" }, usage = "givechar <playerId> <avatarId> [level]", @Command(label = "givechar", aliases = { "givec" }, usage = "givechar <playerId> <avatarId> [level]",
description = "Gives the player a specified character", permission = "player.givechar") description = "Gives the player a specified character", permission = "player.givechar")
public static class GiveCharCommand implements CommandHandler { public static class GiveCharCommand implements CommandHandler {
@Override public void execute(GenshinPlayer player, List<String> args) { @Override
public void execute(GenshinPlayer player, List<String> args) {
int target, avatarId, level = 1, ascension = 1; int target, avatarId, level = 1, ascension = 1;
if(args.size() < 1) { if (args.size() < 1) {
CommandHandler.sendMessage(player, "Usage: givechar <player> <avatarId> [level]"); CommandHandler.sendMessage(player, "Usage: givechar <player> <avatarId> [level]");
return; return;
} }
switch(args.size()) { switch (args.size()) {
default: default:
CommandHandler.sendMessage(player, "Usage: givechar <player> <avatarId> [level]"); CommandHandler.sendMessage(player, "Usage: givechar <player> <avatarId> [level]");
return; return;
case 2: case 2:
try { try {
target = Integer.parseInt(args.get(0)); target = Integer.parseInt(args.get(0));
if(Grasscutter.getGameServer().getPlayerByUid(target) == null) { if (Grasscutter.getGameServer().getPlayerByUid(target) == null) {
target = player.getUid(); target = player.getUid();
level = Integer.parseInt(args.get(1)); level = Integer.parseInt(args.get(1));
avatarId = Integer.parseInt(args.get(0)); avatarId = Integer.parseInt(args.get(0));
} else { } else {
@ -219,8 +236,9 @@ public final class PlayerCommands {
case 3: case 3:
try { try {
target = Integer.parseInt(args.get(0)); target = Integer.parseInt(args.get(0));
if(Grasscutter.getGameServer().getPlayerByUid(target) == null) { if (Grasscutter.getGameServer().getPlayerByUid(target) == null) {
CommandHandler.sendMessage(player, "Invalid player ID."); return; CommandHandler.sendMessage(player, "Invalid player ID.");
return;
} }
avatarId = Integer.parseInt(args.get(1)); avatarId = Integer.parseInt(args.get(1));
@ -234,13 +252,15 @@ public final class PlayerCommands {
} }
GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target); GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
if(targetPlayer == null) { if (targetPlayer == null) {
CommandHandler.sendMessage(player, "Player not found."); return; CommandHandler.sendMessage(player, "Player not found.");
return;
} }
AvatarData avatarData = GenshinData.getAvatarDataMap().get(avatarId); AvatarData avatarData = GenshinData.getAvatarDataMap().get(avatarId);
if(avatarData == null) { if (avatarData == null) {
CommandHandler.sendMessage(player, "Invalid avatar id."); return; CommandHandler.sendMessage(player, "Invalid avatar id.");
return;
} }
// Calculate ascension level. // Calculate ascension level.
@ -253,16 +273,16 @@ public final class PlayerCommands {
GenshinAvatar avatar = new GenshinAvatar(avatarId); GenshinAvatar avatar = new GenshinAvatar(avatarId);
avatar.setLevel(level); avatar.setLevel(level);
avatar.setPromoteLevel(ascension); avatar.setPromoteLevel(ascension);
// This will handle stats and talents // This will handle stats and talents
avatar.recalcStats(); avatar.recalcStats();
targetPlayer.addAvatar(avatar); targetPlayer.addAvatar(avatar);
} }
@Override @Override
public void execute(List<String> args) { public void execute(List<String> args) {
if(args.size() < 2) { if (args.size() < 2) {
CommandHandler.sendMessage(null, "Usage: givechar <player> <itemId|itemName> [amount]"); CommandHandler.sendMessage(null, "Usage: givechar <player> <itemId|itemName> [amount]");
return; return;
} }
@ -270,33 +290,37 @@ public final class PlayerCommands {
try { try {
int target = Integer.parseInt(args.get(0)); int target = Integer.parseInt(args.get(0));
int avatarID = Integer.parseInt(args.get(1)); int avatarID = Integer.parseInt(args.get(1));
int level = 1; if(args.size() > 2) level = Integer.parseInt(args.get(2)); int level = 1;
if (args.size() > 2)
level = Integer.parseInt(args.get(2));
int ascension; int ascension;
GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target); GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
if(targetPlayer == null) { if (targetPlayer == null) {
CommandHandler.sendMessage(null, "Player not found."); return; CommandHandler.sendMessage(null, "Player not found.");
return;
} }
AvatarData avatarData = GenshinData.getAvatarDataMap().get(avatarID); AvatarData avatarData = GenshinData.getAvatarDataMap().get(avatarID);
if(avatarData == null) { if (avatarData == null) {
CommandHandler.sendMessage(null, "Invalid avatar id."); return; CommandHandler.sendMessage(null, "Invalid avatar id.");
return;
} }
// Calculate ascension level. // Calculate ascension level.
if (level <= 40) { if (level <= 40) {
ascension = (int) Math.ceil(level / 20f); ascension = (int) Math.ceil(level / 20f);
} else { } else {
ascension = (int) Math.ceil(level / 10f) - 3; ascension = (int) Math.ceil(level / 10f) - 3;
} }
GenshinAvatar avatar = new GenshinAvatar(avatarID); GenshinAvatar avatar = new GenshinAvatar(avatarID);
avatar.setLevel(level); avatar.setLevel(level);
avatar.setPromoteLevel(ascension); avatar.setPromoteLevel(ascension);
// This will handle stats and talents // This will handle stats and talents
avatar.recalcStats(); avatar.recalcStats();
targetPlayer.addAvatar(avatar); targetPlayer.addAvatar(avatar);
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
CommandHandler.sendMessage(null, "Invalid item or player ID."); CommandHandler.sendMessage(null, "Invalid item or player ID.");
@ -307,27 +331,33 @@ public final class PlayerCommands {
@Command(label = "spawn", execution = Command.Execution.PLAYER, @Command(label = "spawn", execution = Command.Execution.PLAYER,
usage = "spawn <entityId|entityName> [level] [amount]", description = "Spawns an entity near you", permission = "server.spawn") usage = "spawn <entityId|entityName> [level] [amount]", description = "Spawns an entity near you", permission = "server.spawn")
public static class SpawnCommand implements CommandHandler { public static class SpawnCommand implements CommandHandler {
@Override @Override
public void execute(GenshinPlayer player, List<String> args) { public void execute(GenshinPlayer player, List<String> args) {
if(args.size() < 1) { if (args.size() < 1) {
CommandHandler.sendMessage(null, "Usage: spawn <entityId|entityName> [amount]"); CommandHandler.sendMessage(null, "Usage: spawn <entityId|entityName> [amount]");
return; return;
} }
try { try {
int entity = Integer.parseInt(args.get(0)); int entity = Integer.parseInt(args.get(0));
int level = 1; if(args.size() > 1) level = Integer.parseInt(args.get(1)); int level = 1;
int amount = 1; if(args.size() > 2) amount = Integer.parseInt(args.get(2)); if (args.size() > 1)
level = Integer.parseInt(args.get(1));
int amount = 1;
if (args.size() > 2)
amount = Integer.parseInt(args.get(2));
MonsterData entityData = GenshinData.getMonsterDataMap().get(entity); MonsterData entityData = GenshinData.getMonsterDataMap().get(entity);
if(entityData == null) { if (entityData == null) {
CommandHandler.sendMessage(null, "Invalid entity id."); return; CommandHandler.sendMessage(null, "Invalid entity id.");
return;
} }
float range = (5f + (.1f * amount)); float range = (5f + (.1f * amount));
for (int i = 0; i < amount; i++) { for (int i = 0; i < amount; i++) {
Position pos = player.getPos().clone().addX((float) (Math.random() * range) - (range / 2)).addY(3f).addZ((float) (Math.random() * range) - (range / 2)); Position pos = player.getPos().clone().addX((float) (Math.random() * range) - (range / 2)).addY(3f)
.addZ((float) (Math.random() * range) - (range / 2));
EntityMonster monster = new EntityMonster(player.getScene(), entityData, pos, level); EntityMonster monster = new EntityMonster(player.getScene(), entityData, pos, level);
player.getScene().addEntity(monster); player.getScene().addEntity(monster);
} }
@ -349,29 +379,30 @@ public final class PlayerCommands {
.forEach(entity -> scene.killEntity(entity, 0)); .forEach(entity -> scene.killEntity(entity, 0));
CommandHandler.sendMessage(null, "Killing all monsters in scene " + scene.getId()); CommandHandler.sendMessage(null, "Killing all monsters in scene " + scene.getId());
} }
@Override @Override
public void execute(List<String> args) { public void execute(List<String> args) {
if(args.size() < 2) { if (args.size() < 2) {
CommandHandler.sendMessage(null, "Usage: killall [playerUid] [sceneId]"); return; CommandHandler.sendMessage(null, "Usage: killall [playerUid] [sceneId]");
return;
} }
try { try {
int playerUid = Integer.parseInt(args.get(0)); int playerUid = Integer.parseInt(args.get(0));
int sceneId = Integer.parseInt(args.get(1)); int sceneId = Integer.parseInt(args.get(1));
GenshinPlayer player = Grasscutter.getGameServer().getPlayerByUid(playerUid); GenshinPlayer player = Grasscutter.getGameServer().getPlayerByUid(playerUid);
if (player == null) { if (player == null) {
CommandHandler.sendMessage(null, "Player not found or offline."); CommandHandler.sendMessage(null, "Player not found or offline.");
return; return;
} }
GenshinScene scene = player.getWorld().getSceneById(sceneId); GenshinScene scene = player.getWorld().getSceneById(sceneId);
if (scene == null) { if (scene == null) {
CommandHandler.sendMessage(null, "Scene not found in player world"); CommandHandler.sendMessage(null, "Scene not found in player world");
return; return;
} }
scene.getEntities().values().stream() scene.getEntities().values().stream()
.filter(entity -> entity instanceof EntityMonster) .filter(entity -> entity instanceof EntityMonster)
.forEach(entity -> scene.killEntity(entity, 0)); .forEach(entity -> scene.killEntity(entity, 0));
@ -381,29 +412,30 @@ public final class PlayerCommands {
} }
} }
} }
@Command(label = "resetconst", aliases = {"resetconstellation"}, @Command(label = "resetconst", aliases = {"resetconstellation"},
usage = "resetconst [all]", execution = Command.Execution.PLAYER, permission = "player.resetconstellation", usage = "resetconst [all]", execution = Command.Execution.PLAYER, permission = "player.resetconstellation",
description = "Resets the constellation level on your current active character, will need to relog after using the command to see any changes.") description = "Resets the constellation level on your current active character, will need to relog after using the command to see any changes.")
public static class ResetConstellationCommand implements CommandHandler { public static class ResetConstellationCommand implements CommandHandler {
@Override @Override
public void execute(GenshinPlayer player, List<String> args) { public void execute(GenshinPlayer player, List<String> args) {
if(args.size() > 0 && args.get(0).equalsIgnoreCase("all")) { if (args.size() > 0 && args.get(0).equalsIgnoreCase("all")) {
player.getAvatars().forEach(this::resetConstellation); player.getAvatars().forEach(this::resetConstellation);
player.dropMessage("Reset all avatars' constellations."); player.dropMessage("Reset all avatars' constellations.");
} else { } else {
EntityAvatar entity = player.getTeamManager().getCurrentAvatarEntity(); EntityAvatar entity = player.getTeamManager().getCurrentAvatarEntity();
if(entity == null) if (entity == null)
return; return;
GenshinAvatar avatar = entity.getAvatar(); GenshinAvatar avatar = entity.getAvatar();
this.resetConstellation(avatar); this.resetConstellation(avatar);
player.dropMessage("Constellations for " + avatar.getAvatarData().getName() + " have been reset. Please relog to see changes."); player.dropMessage("Constellations for " + avatar.getAvatarData().getName()
+ " have been reset. Please relog to see changes.");
} }
} }
private void resetConstellation(GenshinAvatar avatar) { private void resetConstellation(GenshinAvatar avatar) {
avatar.getTalentIdList().clear(); avatar.getTalentIdList().clear();
avatar.setCoreProudSkillLevel(0); avatar.setCoreProudSkillLevel(0);
@ -411,18 +443,18 @@ public final class PlayerCommands {
avatar.save(); avatar.save();
} }
} }
@Command(label = "godmode", @Command(label = "godmode",
usage = "godmode", execution = Command.Execution.PLAYER, description = "Prevents you from taking damage", permission = "player.godmode") usage = "godmode", execution = Command.Execution.PLAYER, description = "Prevents you from taking damage", permission = "player.godmode")
public static class GodModeCommand implements CommandHandler { public static class GodModeCommand implements CommandHandler {
@Override @Override
public void execute(GenshinPlayer player, List<String> args) { public void execute(GenshinPlayer player, List<String> args) {
player.setGodmode(!player.inGodmode()); player.setGodmode(!player.inGodmode());
player.dropMessage("Godmode is now " + (player.inGodmode() ? "enabled" : "disabled") + "."); player.dropMessage("Godmode is now " + (player.inGodmode() ? "enabled" : "disabled") + ".");
} }
} }
@Command(label = "sethealth", aliases = {"sethp"}, @Command(label = "sethealth", aliases = {"sethp"},
usage = "sethealth <hp>", execution = Command.Execution.PLAYER, description = "Sets your health to the specified value", usage = "sethealth <hp>", execution = Command.Execution.PLAYER, description = "Sets your health to the specified value",
permission = "player.sethealth") permission = "player.sethealth")
@ -430,18 +462,20 @@ public final class PlayerCommands {
@Override @Override
public void execute(GenshinPlayer player, List<String> args) { public void execute(GenshinPlayer player, List<String> args) {
if(args.size() < 1) { if (args.size() < 1) {
CommandHandler.sendMessage(null, "Usage: sethealth <hp>"); return; CommandHandler.sendMessage(null, "Usage: sethealth <hp>");
return;
} }
try { try {
int health = Integer.parseInt(args.get(0)); int health = Integer.parseInt(args.get(0));
EntityAvatar entity = player.getTeamManager().getCurrentAvatarEntity(); EntityAvatar entity = player.getTeamManager().getCurrentAvatarEntity();
if(entity == null) if (entity == null)
return; return;
entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, health); entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, health);
entity.getWorld().broadcastPacket(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_HP)); entity.getWorld().broadcastPacket(
new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_HP));
player.dropMessage("Health set to " + health + "."); player.dropMessage("Health set to " + health + ".");
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
CommandHandler.sendMessage(null, "Invalid health value."); CommandHandler.sendMessage(null, "Invalid health value.");
@ -455,10 +489,11 @@ public final class PlayerCommands {
public static class SetWorldLevelCommand implements CommandHandler { public static class SetWorldLevelCommand implements CommandHandler {
@Override @Override
public void execute(GenshinPlayer player, List<String> args) { public void execute(GenshinPlayer player, List<String> args) {
if(args.size() < 1) { if (args.size() < 1) {
CommandHandler.sendMessage(player, "Usage: setworldlevel <level>"); return; CommandHandler.sendMessage(player, "Usage: setworldlevel <level>");
return;
} }
try { try {
int level = Integer.parseInt(args.get(0)); int level = Integer.parseInt(args.get(0));
@ -472,7 +507,7 @@ public final class PlayerCommands {
} }
} }
} }
@Command(label = "clearartifacts", aliases = {"clearart"}, @Command(label = "clearartifacts", aliases = {"clearart"},
usage = "clearartifacts", execution = Command.Execution.PLAYER, permission = "player.clearartifacts", usage = "clearartifacts", execution = Command.Execution.PLAYER, permission = "player.clearartifacts",
description = "Deletes all unequipped and unlocked level 0 artifacts, including yellow rarity ones from your inventory") description = "Deletes all unequipped and unlocked level 0 artifacts, including yellow rarity ones from your inventory")
@ -493,10 +528,11 @@ public final class PlayerCommands {
public static class ChangeSceneCommand implements CommandHandler { public static class ChangeSceneCommand implements CommandHandler {
@Override @Override
public void execute(GenshinPlayer player, List<String> args) { public void execute(GenshinPlayer player, List<String> args) {
if(args.size() < 1) { if (args.size() < 1) {
CommandHandler.sendMessage(player, "Usage: changescene <scene id>"); return; CommandHandler.sendMessage(player, "Usage: changescene <scene id>");
return;
} }
try { try {
int sceneId = Integer.parseInt(args.get(0)); int sceneId = Integer.parseInt(args.get(0));
boolean result = player.getWorld().transferPlayerToScene(player, sceneId, player.getPos()); boolean result = player.getWorld().transferPlayerToScene(player, sceneId, player.getPos());
@ -505,7 +541,8 @@ public final class PlayerCommands {
CommandHandler.sendMessage(null, "Scene does not exist or you are already in it"); CommandHandler.sendMessage(null, "Scene does not exist or you are already in it");
} }
} catch (Exception e) { } catch (Exception e) {
CommandHandler.sendMessage(player, "Usage: changescene <scene id>"); return; CommandHandler.sendMessage(player, "Usage: changescene <scene id>");
return;
} }
} }
} }
@ -536,4 +573,12 @@ public final class PlayerCommands {
} }
} }
} }
@Command(label = "restart", usage = "Usage: restart", description = "Restarts the current session", execution = Command.Execution.PLAYER, permission = "player.restart")
public static class RestartCommand implements CommandHandler {
@Override
public void execute(GenshinPlayer player, List<String> args) {
player.getSession().close();
}
}
} }