Cleaned up a bit of code

Just some cleanup
kerbybit · Jan 22, 2017 · b564a6d · b564a6d
1 parent dba5103
commit b564a6d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/src/main/java/com/kerbybit/chattriggers/commands/CommandT.java b/src/main/java/com/kerbybit/chattriggers/commands/CommandT.java
@@ -18,12 +18,14 @@ public class CommandT extends CommandBase{
 
 	public void processCommand(ICommandSender sender, String[] args) {
         try {
-            if (global.settings.get(6).equalsIgnoreCase("true")) {
-                CommandTrigger.doCommand(args, false);
-            } else {
-                String send = "";
-                for (String arg : args) {send += arg + " ";}
-                Minecraft.getMinecraft().thePlayer.sendChatMessage("/t " + send.trim());
+            if (global.canUse) {
+                if (global.settings.get(6).equalsIgnoreCase("true")) {
+                    CommandTrigger.doCommand(args, false);
+                } else {
+                    String send = "";
+                    for (String arg : args) {send += arg + " ";}
+                    Minecraft.getMinecraft().thePlayer.sendChatMessage("/t " + send.trim());
+                }
             }
         } catch (Exception e) {
             BugTracker.show(e, "command");

diff --git a/src/main/java/com/kerbybit/chattriggers/commands/CommandTR.java b/src/main/java/com/kerbybit/chattriggers/commands/CommandTR.java
@@ -21,15 +21,17 @@ public class CommandTR extends CommandBase {
 
 	public void processCommand(ICommandSender sender, String[] args) throws CommandException {
         try {
-            if (global.settings.get(7).equalsIgnoreCase("true")) {
-                ArrayList<String> temporary = new ArrayList<String>();
-                temporary.add("run");
-                temporary.addAll(Arrays.asList(args));
-                CommandTrigger.doCommand(temporary.toArray(new String[temporary.size()]), false);
-            } else {
-                String send = "";
-                for (String arg : args) {send += arg + " ";}
-                Minecraft.getMinecraft().thePlayer.sendChatMessage("/tr " + send.trim());
+            if (global.canUse) {
+                if (global.settings.get(7).equalsIgnoreCase("true")) {
+                    ArrayList<String> temporary = new ArrayList<String>();
+                    temporary.add("run");
+                    temporary.addAll(Arrays.asList(args));
+                    CommandTrigger.doCommand(temporary.toArray(new String[temporary.size()]), false);
+                } else {
+                    String send = "";
+                    for (String arg : args) {send += arg + " ";}
+                    Minecraft.getMinecraft().thePlayer.sendChatMessage("/tr " + send.trim());
+                }
             }
         } catch (Exception e) {
             BugTracker.show(e, "command");

diff --git a/src/main/java/com/kerbybit/chattriggers/file/UpdateHandler.java b/src/main/java/com/kerbybit/chattriggers/file/UpdateHandler.java
@@ -39,12 +39,9 @@ public void run() {
 		 					try {
 			 					if (getuuid.equals(Minecraft.getMinecraft().thePlayer.getUniqueID().toString().replace("-", ""))) {
 			 						global.canUse = false;
-			 						ChatHandler.warn(ChatHandler.color("red", "ChatTriggers is currently disabled!"));
-			 						ChatHandler.warn(ChatHandler.color("red", "  Why am I seeing this? clickable(&7[click],open_url,http://www.kerbybit.com/enabledmods/info/,&7Open &7kerbybit.com/EnabledMods/info/)"));
 			 					}
 		 					} catch (Exception e) {
 		 						e.printStackTrace();
-		 						System.out.println("Update not loading. Is www.kerbybit.com down?");
 		 					}
 		 				}
 		 			}
@@ -72,7 +69,6 @@ public void run() {
 			 					}
 		 					} catch (Exception e) {
 		 						e.printStackTrace();
-		 						System.out.println("Could not get list! ChatTriggers may not work properly!");
 		 					}
 		 				}
 		 			}