prevent duplicate enchantment source

NyaaCat · Aug 17, 2016 · 883d010 · 883d010
1 parent 08a7ae7
commit 883d010
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/cat/nyaa/nyaautils/CommandHandler.java b/src/main/java/cat/nyaa/nyaautils/CommandHandler.java
@@ -33,6 +33,10 @@ public String getHelpPrefix() {
     @SubCommand(value = "addenchsrc", permission = "nu.addenchsrc")
     public void commandAddEnchSrc(CommandSender sender, Arguments args) {
         ItemStack item = getItemInHand(sender);
+        if(BasicItemMatcher.containsMatch(NyaaUtils.instance.cfg.enchantSrc, item)){
+            sender.sendMessage(I18n._("user.enchant.enchantsrc_already_exists"));
+            return;
+        }
         BasicItemMatcher matcher = new BasicItemMatcher();
         matcher.itemTemplate = item.clone();
         matcher.enchantMatch = BasicItemMatcher.MatchingMode.ARBITRARY;

diff --git a/src/main/java/cat/nyaa/utils/CommandReceiver.java b/src/main/java/cat/nyaa/utils/CommandReceiver.java
@@ -197,8 +197,8 @@ public void printHelp(CommandSender sender, Arguments args) {
         List<String> cmds = getSubcommands();
         String tmp = "";
         for (String cmd : cmds) {
-            tmp += "\n    " + cmd + ":\t" + getHelpContent("description", getHelpPrefix(), cmd);
-            tmp += "\n    " + cmd + ":\t" + getHelpContent("usage", getHelpPrefix(), cmd);
+            tmp += "\n    " + cmd + ":  " + getHelpContent("description", getHelpPrefix(), cmd);
+            tmp += "\n    " + cmd + ":  " + getHelpContent("usage", getHelpPrefix(), cmd);
         }
         sender.sendMessage(tmp);
     }

diff --git a/src/main/resources/lang/en_US.yml b/src/main/resources/lang/en_US.yml
@@ -26,6 +26,7 @@ user:
     max_level: "(Max level: %d)"
     success: "Enchantment success"
     fail: "Enchantment failed"
+    enchantsrc_already_exists: "The enchantment source already exists"
   launch:
     usage: |
       /nu launch <Yaw> <Pitch> <Speed> <Delay> [Player]