Safely handle duplicate punishment commands

Fixed #569
BanManagement · Oct 8, 2017 · 966de82 · 966de82
1 parent 76742c1
commit 966de82
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 28 deletions.
diff --git a/src/main/java/me/confuser/banmanager/commands/BanCommand.java b/src/main/java/me/confuser/banmanager/commands/BanCommand.java
@@ -135,8 +135,8 @@ public void run() {
         try {
           created = plugin.getPlayerBanStorage().ban(ban, isSilent);
         } catch (SQLException e) {
-          sender.sendMessage(Message.get("sender.error.exception").toString());
-          e.printStackTrace();
+          CommandUtils.handlePunishmentCreateException(e, sender, Message.get("ban.error.exists").set("player",
+                  playerName));
           return;
         }
 

diff --git a/src/main/java/me/confuser/banmanager/commands/BanIpCommand.java b/src/main/java/me/confuser/banmanager/commands/BanIpCommand.java
@@ -109,8 +109,8 @@ public void run() {
         try {
           created = plugin.getIpBanStorage().ban(ban, isSilent);
         } catch (SQLException e) {
-          sender.sendMessage(Message.get("sender.error.exception").toString());
-          e.printStackTrace();
+          CommandUtils.handlePunishmentCreateException(e, sender, Message.get("banip.error.exists").set("ip",
+                  ipStr));
           return;
         }
 

diff --git a/src/main/java/me/confuser/banmanager/commands/BanIpRangeCommand.java b/src/main/java/me/confuser/banmanager/commands/BanIpRangeCommand.java
@@ -4,6 +4,7 @@
 import me.confuser.banmanager.data.IpRangeBanData;
 import me.confuser.banmanager.data.PlayerData;
 import me.confuser.banmanager.util.CommandParser;
+import me.confuser.banmanager.util.CommandUtils;
 import me.confuser.banmanager.util.IPUtils;
 import me.confuser.banmanager.util.UUIDUtils;
 import me.confuser.banmanager.util.parsers.Reason;
@@ -91,8 +92,7 @@ public void run() {
         try {
           created = plugin.getIpRangeBanStorage().ban(ban, isSilent);
         } catch (SQLException e) {
-          sender.sendMessage(Message.get("sender.error.exception").toString());
-          e.printStackTrace();
+          CommandUtils.handlePunishmentCreateException(e, sender, Message.get("baniprange.error.exists"));
           return;
         }
 

diff --git a/src/main/java/me/confuser/banmanager/commands/BanNameCommand.java b/src/main/java/me/confuser/banmanager/commands/BanNameCommand.java
@@ -83,8 +83,8 @@ public void run() {
         try {
           created = plugin.getNameBanStorage().ban(ban, isSilent);
         } catch (SQLException e) {
-          sender.sendMessage(Message.get("sender.error.exception").toString());
-          e.printStackTrace();
+          CommandUtils.handlePunishmentCreateException(e, sender, Message.get("banname.error.exists").set("name",
+                  name));
           return;
         }
 

diff --git a/src/main/java/me/confuser/banmanager/commands/MuteCommand.java b/src/main/java/me/confuser/banmanager/commands/MuteCommand.java
@@ -153,8 +153,8 @@ public void run() {
         try {
           created = plugin.getPlayerMuteStorage().mute(mute, isSilent);
         } catch (SQLException e) {
-          sender.sendMessage(Message.get("sender.error.exception").toString());
-          e.printStackTrace();
+          CommandUtils.handlePunishmentCreateException(e, sender, Message.get("mute.error.exists").set("player",
+                  playerName));
           return;
         }
 

diff --git a/src/main/java/me/confuser/banmanager/commands/MuteIpCommand.java b/src/main/java/me/confuser/banmanager/commands/MuteIpCommand.java
@@ -115,8 +115,8 @@ public void run() {
         try {
           created = plugin.getIpMuteStorage().mute(mute, isSilent);
         } catch (SQLException e) {
-          sender.sendMessage(Message.get("sender.error.exception").toString());
-          e.printStackTrace();
+          CommandUtils.handlePunishmentCreateException(e, sender, Message.get("muteip.error.exists").set("ip",
+                  ipStr));
           return;
         }
 

diff --git a/src/main/java/me/confuser/banmanager/commands/TempBanCommand.java b/src/main/java/me/confuser/banmanager/commands/TempBanCommand.java
@@ -152,8 +152,8 @@ public void run() {
         try {
           created = plugin.getPlayerBanStorage().ban(ban, isSilent);
         } catch (SQLException e) {
-          sender.sendMessage(Message.get("sender.error.exception").toString());
-          e.printStackTrace();
+          CommandUtils.handlePunishmentCreateException(e, sender, Message.get("ban.error.exists").set("player",
+                  playerName));
           return;
         }
 

diff --git a/src/main/java/me/confuser/banmanager/commands/TempIpBanCommand.java b/src/main/java/me/confuser/banmanager/commands/TempIpBanCommand.java
@@ -122,8 +122,8 @@ public void run() {
         try {
           created = plugin.getIpBanStorage().ban(ban, isSilent);
         } catch (SQLException e) {
-          sender.sendMessage(Message.get("sender.error.exception").toString());
-          e.printStackTrace();
+          CommandUtils.handlePunishmentCreateException(e, sender, Message.get("banip.error.exists").set("ip",
+                  ipStr));
           return;
         }
 

diff --git a/src/main/java/me/confuser/banmanager/commands/TempIpMuteCommand.java b/src/main/java/me/confuser/banmanager/commands/TempIpMuteCommand.java
@@ -131,8 +131,8 @@ public void run() {
         try {
           created = plugin.getIpMuteStorage().mute(mute, isSilent);
         } catch (SQLException e) {
-          sender.sendMessage(Message.get("sender.error.exception").toString());
-          e.printStackTrace();
+          CommandUtils.handlePunishmentCreateException(e, sender, Message.get("muteip.error.exists").set("ip",
+                  ipStr));
           return;
         }
 

diff --git a/src/main/java/me/confuser/banmanager/commands/TempIpRangeBanCommand.java b/src/main/java/me/confuser/banmanager/commands/TempIpRangeBanCommand.java
@@ -4,10 +4,7 @@
 import me.confuser.banmanager.configs.TimeLimitType;
 import me.confuser.banmanager.data.IpRangeBanData;
 import me.confuser.banmanager.data.PlayerData;
-import me.confuser.banmanager.util.CommandParser;
-import me.confuser.banmanager.util.DateUtils;
-import me.confuser.banmanager.util.IPUtils;
-import me.confuser.banmanager.util.UUIDUtils;
+import me.confuser.banmanager.util.*;
 import me.confuser.bukkitutil.Message;
 import me.confuser.bukkitutil.commands.BukkitCommand;
 import org.bukkit.command.Command;
@@ -108,8 +105,7 @@ public void run() {
         try {
           created = plugin.getIpRangeBanStorage().ban(ban, isSilent);
         } catch (SQLException e) {
-          sender.sendMessage(Message.get("sender.error.exception").toString());
-          e.printStackTrace();
+          CommandUtils.handlePunishmentCreateException(e, sender, Message.get("baniprange.error.exists"));
           return;
         }
 

diff --git a/src/main/java/me/confuser/banmanager/commands/TempMuteCommand.java b/src/main/java/me/confuser/banmanager/commands/TempMuteCommand.java
@@ -160,8 +160,8 @@ public void run() {
         try {
           created = plugin.getPlayerMuteStorage().mute(mute, isSilent);
         } catch (SQLException e) {
-          sender.sendMessage(Message.get("sender.error.exception").toString());
-          e.printStackTrace();
+          CommandUtils.handlePunishmentCreateException(e, sender, Message.get("mute.error.exists").set("player",
+                  playerName));
           return;
         }
 

diff --git a/src/main/java/me/confuser/banmanager/commands/TempNameBanCommand.java b/src/main/java/me/confuser/banmanager/commands/TempNameBanCommand.java
@@ -96,8 +96,8 @@ public void run() {
         try {
           created = plugin.getNameBanStorage().ban(ban, isSilent);
         } catch (SQLException e) {
-          sender.sendMessage(Message.get("sender.error.exception").toString());
-          e.printStackTrace();
+          CommandUtils.handlePunishmentCreateException(e, sender, Message.get("banname.error.exists").set("player",
+                  name));
           return;
         }