diff --git a/server/src/main/java/dev/plex/command/impl/MobPurgeCMD.java b/server/src/main/java/dev/plex/command/impl/MobPurgeCMD.java index 52e4394..3159d2d 100644 --- a/server/src/main/java/dev/plex/command/impl/MobPurgeCMD.java +++ b/server/src/main/java/dev/plex/command/impl/MobPurgeCMD.java @@ -55,14 +55,21 @@ public class MobPurgeCMD extends PlexCommand { int count = purgeMobs(type); if (type != null) { PlexUtils.broadcast(messageComponent("removedEntitiesOfTypes", sender.getName(), count, mobName)); - PlexLog.debug("All " + count + " valid mobs were removed"); + PlexLog.debug("All " + count + " of " + mobName + " were removed"); } else { PlexUtils.broadcast(messageComponent("removedMobs", sender.getName(), count)); PlexLog.debug("All " + count + " valid mobs were removed"); } + sender.sendMessage(messageComponent("amountOfMobsRemoved", count, (type != null ? mobName : "mob") + multipleS(count))); return null; } + public static String multipleS(int count) { + return (count == 1 ? "" : "s"); + } + + // Removes the mobs. + public int purgeMobs(EntityType type) { int removed = 0; for (World world : Bukkit.getWorlds()) { diff --git a/server/src/main/resources/messages.yml b/server/src/main/resources/messages.yml index 1d9e800..d9021ac 100644 --- a/server/src/main/resources/messages.yml +++ b/server/src/main/resources/messages.yml @@ -160,7 +160,9 @@ removedEntitiesOfType: "Removed {1} {2}" # 0 - Entity type that is invalid invalidEntityType: "Notice: Entity type {0} is invalid!" noRemovedEntities: "No entities were removed." -noRemovedMobs: "No mobs were removed." +# 0 - Number of mobs removed +# 1 - Type of mob removed +amountOfMobsRemoved: "{0} {1} removed." notAValidMob: "That is not a valid mob." notAValidMobButValidEntity: "That is a valid entity, but is not a valid mob." # 0 - The command sender