diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java index 9a3ab7be53..e457caf6e4 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java @@ -126,6 +126,10 @@ public InventoryCommand() { // - inventory exclude origin:stick|stone // // @Usage + // Use to clear the player's inventory entirely. + // - inventory clear + // + // @Usage // Use to swap two players' inventories. // - inventory swap d:<[playerOne].inventory> o:<[playerTwo].inventory> // diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java index fe69f94b0b..9f02e59dfe 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java @@ -94,15 +94,15 @@ public ModifyBlockCommand() { // // @Usage // Use to modify an entire cuboid to half stone, half dirt. - // - modifyblock |]> stone|dirt + // - modifyblock ]> stone|dirt // // @Usage // Use to modify an entire cuboid to some stone, some dirt, and some left as it is. - // - modifyblock |]> stone|dirt 25|25 + // - modifyblock ]> stone|dirt 25|25 // // @Usage // Use to modify the ground beneath the player's feet. - // - modifyblock |]> RED_WOOL + // - modifyblock ]> RED_WOOL // --> @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java index 0e25fe899e..e4c4652ee8 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java +++ b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java @@ -1530,12 +1530,15 @@ else if (recipe instanceof CookingRecipe) { return; } for (Player player : Bukkit.getOnlinePlayers()) { - if (CoreUtilities.equalsIgnoreCase(player.getName(), matchInput)) { + String nameLow = CoreUtilities.toLowerCase(player.getName()); + if (nameLow.equals(matchInput)) { matchPlayer = player; break; } - else if (CoreUtilities.toLowerCase(player.getName()).contains(matchInput) && matchPlayer == null) { - matchPlayer = player; + else if (nameLow.contains(matchInput)) { + if (matchPlayer == null || nameLow.startsWith(matchInput)) { + matchPlayer = player; + } } } @@ -1561,12 +1564,15 @@ else if (CoreUtilities.toLowerCase(player.getName()).contains(matchInput) && mat return; } for (Map.Entry entry : PlayerTag.getAllPlayers().entrySet()) { - if (CoreUtilities.equalsIgnoreCase(entry.getKey(), matchInput)) { + String nameLow = CoreUtilities.toLowerCase(entry.getKey()); + if (nameLow.equals(matchInput)) { matchPlayer = entry.getValue(); break; } - else if (CoreUtilities.toLowerCase(entry.getKey()).contains(matchInput) && matchPlayer == null) { - matchPlayer = entry.getValue(); + else if (nameLow.contains(matchInput)) { + if (matchPlayer == null || nameLow.startsWith(matchInput)) { + matchPlayer = entry.getValue(); + } } } if (matchPlayer != null) {