lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed /bloodmagic network get not having a network to get from, (#1604)

Browse source 
added translation keys for tickethistory
This commit is contained in:
Tobias 2019-05-19 15:36:05 +00:00 committed by Nick Ignoffo
parent 7f5a5a24ff
commit a5a5899b7c
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java
View file

@ -85,11 +85,11 @@ public class SubCommandNetwork extends CommandTreeBase {
@Override
public final void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) {
sender.sendMessage(new TextComponentTranslation(getHelp()));
return;
}
if (!getName().equals("get")) {
if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) {
sender.sendMessage(new TextComponentTranslation(getHelp()));
return;
}
this.player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]);
this.uuid = PlayerHelper.getUUIDFromPlayer(player).toString();
this.network = NetworkHelper.getSoulNetwork(uuid);
@ -164,11 +164,9 @@ public class SubCommandNetwork extends CommandTreeBase {
@Override
public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) {
sender.sendMessage(new TextComponentTranslation(getHelp()));
return;
}
this.player = args.length < 1 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]);
this.uuid = PlayerHelper.getUUIDFromPlayer(player).toString();
this.network = NetworkHelper.getSoulNetwork(uuid);
sender.sendMessage(new TextComponentString((player != sender ? player.getDisplayName().getFormattedText() + " " : "" + new TextComponentTranslation("tooltip.bloodmagic.sigil.divination.currentEssence", network.getCurrentEssence()).getFormattedText())));
}
}
@ -216,7 +214,7 @@ public class SubCommandNetwork extends CommandTreeBase {
@Override
public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
List<SoulTicket> tickethistory = network.getTicketHistory();
if (tickethistory.isEmpty())
if (!tickethistory.isEmpty())
for (SoulTicket i : network.getTicketHistory())
sender.sendMessage(i.getDescription());
sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success", player.getDisplayName().getFormattedText()));

4
src/main/resources/assets/bloodmagic/lang/en_US.lang
View file

@ -832,6 +832,7 @@ commands.bloodmagic.help.help=Displays the help information for the "/bloodmagic
commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap] player [amount]
commands.bloodmagic.network.help=LP network utilities
commands.bloodmagic.network.syphon.help=Removes the given amount of LP from the given player's LP network.
commands.bloodmagic.network.syphon.success=Successfully syphoned %d LP from %s.
commands.bloodmagic.network.syphon.usage=/bloodmagic network syphon [player] [amount]
@ -850,7 +851,8 @@ commands.bloodmagic.network.fill.success=Successfully filled %s's LP network.
commands.bloodmagic.network.cap.help=Fills the given player's LP network to the max that their highest Blood Orb can store.
commands.bloodmagic.network.cap.usage=/bloodmagic network cap [player]
commands.bloodmagic.network.cap.success=Successfully capped off %s's LP network.
commands.bloodmagic.network.tickethistory.help=Shows the soul ticket history containing information about LP consumers for the player
commands.bloodmagic.network.tickethistory.usage=/bloodmagic network tickethistory [player]
commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [player] ("?" or "help" for help)
commands.bloodmagic.bind.help=Attempts to (un)bind the currently held item.