close #60

NyaaCat · Feb 12, 2016 · 623ae03 · 623ae03
1 parent bbe125f
commit 623ae03
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/main/java/think/rpgitems/Handler.java b/src/main/java/think/rpgitems/Handler.java
@@ -193,6 +193,10 @@ public void getItemDamage(CommandSender sender, RPGItem item) {
     @CommandDocumentation("$command.rpgitem.damage.set")
     @CommandGroup("item_damage")
     public void setItemDamage(CommandSender sender, RPGItem item, int damage) {
+        if (damage > 32767) {
+            sender.sendMessage(ChatColor.RED + Locale.get("message.error.damagetolarge"));
+            return;
+        }
         item.setDamage(damage, damage);
         sender.sendMessage(ChatColor.AQUA + String.format(Locale.get("message.damage.set"), item.getName(), item.getDamageMin()));
         ItemManager.save(Plugin.plugin);
@@ -202,6 +206,10 @@ public void setItemDamage(CommandSender sender, RPGItem item, int damage) {
     @CommandDocumentation("$command.rpgitem.damage.set.range")
     @CommandGroup("item_damage")
     public void setItemDamage(CommandSender sender, RPGItem item, int min, int max) {
+        if (min > 32767 || max > 32767) {
+            sender.sendMessage(ChatColor.RED + Locale.get("message.error.damagetolarge"));
+            return;
+        }
         item.setDamage(min, max);
         sender.sendMessage(ChatColor.AQUA + String.format(Locale.get("message.damage.set.range"), item.getName(), item.getDamageMin(), item.getDamageMax()));
         ItemManager.save(Plugin.plugin);

diff --git a/src/main/resources/locale/en_GB.lang b/src/main/resources/locale/en_GB.lang
@@ -172,6 +172,7 @@ message.error.permission=You do not have permission
 message.error.player=Cannot find player %s
 message.error.string.length='%s' in longer than max length %d
 message.error.unknown.command=Error: Unknown command %s
+message.error.damagetolarge=Damage TOO large. MAX: 32767
 message.give.console=Cannot give console items
 message.hand.get=Item '%s' hand is '%s'
 message.hand.set=Item '%s' hand set to '%s'