mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2025-01-09 17:32:53 +08:00
Merge pull request #37 from memetrollsXD/restart-command
Restart command
This commit is contained in:
Melledy
GitHub
commit
f52a1ae183
File diff suppressed because one or more lines are too long
@ -20,7 +20,9 @@ import emu.grasscutter.game.props.ActionReason;
|
||||
import emu.grasscutter.game.props.FightProperty;
|
||||
import emu.grasscutter.game.props.PlayerProperty;
|
||||
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.PacketPlayerLoginRsp;
|
||||
import emu.grasscutter.utils.Position;
|
||||
|
||||
import java.util.LinkedList;
|
||||
@ -57,7 +59,8 @@ public final class PlayerCommands {
|
||||
target = Integer.parseInt(args.get(0));
|
||||
|
||||
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));
|
||||
} else {
|
||||
item = Integer.parseInt(args.get(1));
|
||||
@ -73,7 +76,8 @@ public final class PlayerCommands {
|
||||
target = Integer.parseInt(args.get(0));
|
||||
|
||||
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));
|
||||
@ -89,12 +93,14 @@ public final class PlayerCommands {
|
||||
GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
|
||||
|
||||
if (targetPlayer == null) {
|
||||
CommandHandler.sendMessage(player, "Player not found."); return;
|
||||
CommandHandler.sendMessage(player, "Player not found.");
|
||||
return;
|
||||
}
|
||||
|
||||
ItemData itemData = GenshinData.getItemDataMap().get(item);
|
||||
if (itemData == null) {
|
||||
CommandHandler.sendMessage(player, "Invalid item id."); return;
|
||||
CommandHandler.sendMessage(player, "Invalid item id.");
|
||||
return;
|
||||
}
|
||||
|
||||
this.item(targetPlayer, itemData, amount);
|
||||
@ -103,7 +109,8 @@ public final class PlayerCommands {
|
||||
/**
|
||||
* give [player] [itemId|itemName] [amount]
|
||||
*/
|
||||
@Override public void execute(List<String> args) {
|
||||
@Override
|
||||
public void execute(List<String> args) {
|
||||
if (args.size() < 2) {
|
||||
CommandHandler.sendMessage(null, "Usage: give <player> <itemId|itemName> [amount]");
|
||||
return;
|
||||
@ -112,17 +119,21 @@ public final class PlayerCommands {
|
||||
try {
|
||||
int target = Integer.parseInt(args.get(0));
|
||||
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);
|
||||
|
||||
if (targetPlayer == null) {
|
||||
CommandHandler.sendMessage(null, "Player not found."); return;
|
||||
CommandHandler.sendMessage(null, "Player not found.");
|
||||
return;
|
||||
}
|
||||
|
||||
ItemData itemData = GenshinData.getItemDataMap().get(item);
|
||||
if (itemData == null) {
|
||||
CommandHandler.sendMessage(null, "Invalid item id."); return;
|
||||
CommandHandler.sendMessage(null, "Invalid item id.");
|
||||
return;
|
||||
}
|
||||
|
||||
this.item(targetPlayer, itemData, amount);
|
||||
@ -137,7 +148,8 @@ public final class PlayerCommands {
|
||||
List<GenshinItem> items = new LinkedList<>();
|
||||
for (int i = 0; i < amount; i++) {
|
||||
items.add(genshinItem);
|
||||
} player.getInventory().addItems(items);
|
||||
}
|
||||
player.getInventory().addItems(items);
|
||||
player.sendPacket(new PacketItemAddHintNotify(items, ActionReason.SubfieldDrop));
|
||||
} else {
|
||||
genshinItem.setCount(amount);
|
||||
@ -146,7 +158,6 @@ public final class PlayerCommands {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Command(label = "drop", aliases = {"d", "dropitem"},
|
||||
usage = "drop <itemId|itemName> [amount]",
|
||||
execution = Command.Execution.PLAYER, description = "Drops an item near you", permission = "server.drop")
|
||||
@ -161,22 +172,27 @@ public final class PlayerCommands {
|
||||
|
||||
try {
|
||||
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);
|
||||
if (itemData == null) {
|
||||
CommandHandler.sendMessage(player, "Invalid item id."); return;
|
||||
CommandHandler.sendMessage(player, "Invalid item id.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (itemData.isEquip()) {
|
||||
float range = (5f + (.1f * amount));
|
||||
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);
|
||||
player.getScene().addEntity(entity);
|
||||
}
|
||||
} 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);
|
||||
}
|
||||
} catch (NumberFormatException ignored) {
|
||||
@ -188,7 +204,8 @@ public final class PlayerCommands {
|
||||
@Command(label = "givechar", aliases = { "givec" }, usage = "givechar <playerId> <avatarId> [level]",
|
||||
description = "Gives the player a specified character", permission = "player.givechar")
|
||||
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;
|
||||
|
||||
if (args.size() < 1) {
|
||||
@ -220,7 +237,8 @@ public final class PlayerCommands {
|
||||
try {
|
||||
target = Integer.parseInt(args.get(0));
|
||||
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));
|
||||
@ -235,12 +253,14 @@ public final class PlayerCommands {
|
||||
|
||||
GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
|
||||
if (targetPlayer == null) {
|
||||
CommandHandler.sendMessage(player, "Player not found."); return;
|
||||
CommandHandler.sendMessage(player, "Player not found.");
|
||||
return;
|
||||
}
|
||||
|
||||
AvatarData avatarData = GenshinData.getAvatarDataMap().get(avatarId);
|
||||
if (avatarData == null) {
|
||||
CommandHandler.sendMessage(player, "Invalid avatar id."); return;
|
||||
CommandHandler.sendMessage(player, "Invalid avatar id.");
|
||||
return;
|
||||
}
|
||||
|
||||
// Calculate ascension level.
|
||||
@ -270,17 +290,21 @@ public final class PlayerCommands {
|
||||
try {
|
||||
int target = Integer.parseInt(args.get(0));
|
||||
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;
|
||||
|
||||
GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
|
||||
if (targetPlayer == null) {
|
||||
CommandHandler.sendMessage(null, "Player not found."); return;
|
||||
CommandHandler.sendMessage(null, "Player not found.");
|
||||
return;
|
||||
}
|
||||
|
||||
AvatarData avatarData = GenshinData.getAvatarDataMap().get(avatarID);
|
||||
if (avatarData == null) {
|
||||
CommandHandler.sendMessage(null, "Invalid avatar id."); return;
|
||||
CommandHandler.sendMessage(null, "Invalid avatar id.");
|
||||
return;
|
||||
}
|
||||
|
||||
// Calculate ascension level.
|
||||
@ -317,17 +341,23 @@ public final class PlayerCommands {
|
||||
|
||||
try {
|
||||
int entity = Integer.parseInt(args.get(0));
|
||||
int level = 1; if(args.size() > 1) level = Integer.parseInt(args.get(1));
|
||||
int amount = 1; if(args.size() > 2) amount = Integer.parseInt(args.get(2));
|
||||
int level = 1;
|
||||
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);
|
||||
if (entityData == null) {
|
||||
CommandHandler.sendMessage(null, "Invalid entity id."); return;
|
||||
CommandHandler.sendMessage(null, "Invalid entity id.");
|
||||
return;
|
||||
}
|
||||
|
||||
float range = (5f + (.1f * amount));
|
||||
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);
|
||||
player.getScene().addEntity(monster);
|
||||
}
|
||||
@ -353,7 +383,8 @@ public final class PlayerCommands {
|
||||
@Override
|
||||
public void execute(List<String> args) {
|
||||
if (args.size() < 2) {
|
||||
CommandHandler.sendMessage(null, "Usage: killall [playerUid] [sceneId]"); return;
|
||||
CommandHandler.sendMessage(null, "Usage: killall [playerUid] [sceneId]");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
@ -400,7 +431,8 @@ public final class PlayerCommands {
|
||||
GenshinAvatar avatar = entity.getAvatar();
|
||||
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.");
|
||||
}
|
||||
}
|
||||
|
||||
@ -431,7 +463,8 @@ public final class PlayerCommands {
|
||||
@Override
|
||||
public void execute(GenshinPlayer player, List<String> args) {
|
||||
if (args.size() < 1) {
|
||||
CommandHandler.sendMessage(null, "Usage: sethealth <hp>"); return;
|
||||
CommandHandler.sendMessage(null, "Usage: sethealth <hp>");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
@ -441,7 +474,8 @@ public final class PlayerCommands {
|
||||
return;
|
||||
|
||||
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 + ".");
|
||||
} catch (NumberFormatException ignored) {
|
||||
CommandHandler.sendMessage(null, "Invalid health value.");
|
||||
@ -456,7 +490,8 @@ public final class PlayerCommands {
|
||||
@Override
|
||||
public void execute(GenshinPlayer player, List<String> args) {
|
||||
if (args.size() < 1) {
|
||||
CommandHandler.sendMessage(player, "Usage: setworldlevel <level>"); return;
|
||||
CommandHandler.sendMessage(player, "Usage: setworldlevel <level>");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
@ -494,7 +529,8 @@ public final class PlayerCommands {
|
||||
@Override
|
||||
public void execute(GenshinPlayer player, List<String> args) {
|
||||
if (args.size() < 1) {
|
||||
CommandHandler.sendMessage(player, "Usage: changescene <scene id>"); return;
|
||||
CommandHandler.sendMessage(player, "Usage: changescene <scene id>");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
@ -505,7 +541,8 @@ public final class PlayerCommands {
|
||||
CommandHandler.sendMessage(null, "Scene does not exist or you are already in it");
|
||||
}
|
||||
} 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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user