Better command handling in console

src/main/java/pw/kaboom/extras/commands/CommandConsole.java

@@ -11,10 +11,8 @@ import org.bukkit.entity.Player;
 
 class CommandConsole implements CommandExecutor {
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		final Player player = (Player) sender;
-
 		if (args.length == 0) {
-			player.sendMessage(ChatColor.RED + "Usage: /" + label + " <message ..>");
+			sender.sendMessage(ChatColor.RED + "Usage: /" + label + " <message ..>");
 		} else {
 			Bukkit.dispatchCommand(
 				Bukkit.getConsoleSender(),

src/main/java/pw/kaboom/extras/commands/CommandDestroyEntities.java

@@ -13,7 +13,6 @@ import org.bukkit.entity.Player;
 
 class CommandDestroyEntities implements CommandExecutor {
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		final Player player = (Player) sender;
 		int entityCount = 0;
 		int worldCount = 0;
 
@@ -26,7 +25,7 @@ class CommandDestroyEntities implements CommandExecutor {
 			}
 			worldCount++;
 		}
-		player.sendMessage("Successfully destroyed " + entityCount + " entities in " + worldCount + " worlds");
+		sender.sendMessage("Successfully destroyed " + entityCount + " entities in " + worldCount + " worlds");
 		return true;
 	}
 }

src/main/java/pw/kaboom/extras/commands/CommandEnchantAll.java

@@ -5,6 +5,7 @@ import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 
 import org.bukkit.enchantments.Enchantment;
 
@@ -14,6 +15,9 @@ import org.bukkit.inventory.ItemStack;
 
 class CommandEnchantAll implements CommandExecutor {
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+		if (sender instanceof ConsoleCommandSender) {
+			sender.sendMessage("Command has to be run by a player");
+		} else {
 			final Player player = (Player) sender;
 			final ItemStack item = player.getInventory().getItemInMainHand();
 	
@@ -52,6 +56,7 @@ class CommandEnchantAll implements CommandExecutor {
 				item.addUnsafeEnchantment(Enchantment.WATER_WORKER, 32767);
 				player.sendMessage("I killed Tim.");
 			}
+		}
 		return true;
 	}
 }

src/main/java/pw/kaboom/extras/commands/CommandJumpscare.java

@@ -20,23 +20,21 @@ class CommandJumpscare implements CommandExecutor {
 	}
 
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		final Player player = (Player) sender;
-
 		if (args.length == 0) {
-			player.sendMessage(ChatColor.RED + "Usage: /" + label + " <player>");
+			sender.sendMessage(ChatColor.RED + "Usage: /" + label + " <player>");
 		} else {
 			if (args[0].equals("*") || args[0].equals("**")) {
 				for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
 					createJumpscare(onlinePlayer);
 				}
-				player.sendMessage("Successfully created jumpscare for every player");
+				sender.sendMessage("Successfully created jumpscare for every player");
 			} else {
 				final Player target = Bukkit.getPlayer(args[0]);
 				if (target != null) {
 					createJumpscare(target);
-					player.sendMessage("Successfully created jumpscare for player \"" + target.getName() + "\"");
+					sender.sendMessage("Successfully created jumpscare for player \"" + target.getName() + "\"");
 				} else {
-					player.sendMessage("Player \"" + target.getName() + "\" not found");
+					sender.sendMessage("Player \"" + target.getName() + "\" not found");
 				}
 			}	
 		}

src/main/java/pw/kaboom/extras/commands/CommandPrefix.java

@@ -5,6 +5,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 
 import org.bukkit.entity.Player;
 
@@ -15,6 +16,9 @@ class CommandPrefix implements CommandExecutor {
 	}
 
 	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+		if (sender instanceof ConsoleCommandSender) {
+			sender.sendMessage("Command has to be run by a player");
+		} else {
 			final Player player = (Player) sender;
 	
 			if (args.length == 0) {
@@ -28,6 +32,7 @@ class CommandPrefix implements CommandExecutor {
 				main.saveConfig();
 				player.sendMessage("You now have the tag: " + ChatColor.translateAlternateColorCodes('&', String.join(" ", args)));
 			}
+		}
 		return true;
 	}
 }

src/main/java/pw/kaboom/extras/commands/CommandPumpkin.java

@@ -18,23 +18,21 @@ class CommandPumpkin implements CommandExecutor {
 	}
 
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		final Player player = (Player) sender;
-
 		if (args.length == 0) {
-			player.sendMessage(ChatColor.RED + "Usage: /" + label + " <player>");
+			sender.sendMessage(ChatColor.RED + "Usage: /" + label + " <player>");
 		} else {
 			if (args[0].equals("*") || args[0].equals("**")) {
 				for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
 					placePumpkin(onlinePlayer);
 				}
-				player.sendMessage("Everyone is now a pumpkin");
+				sender.sendMessage("Everyone is now a pumpkin");
 			} else {
 				final Player target = Bukkit.getPlayer(args[0]);
 				if (target != null) {
 					placePumpkin(target);
-					player.sendMessage("Player \"" + target.getName() + "\" is now a pumpkin");
+					sender.sendMessage("Player \"" + target.getName() + "\" is now a pumpkin");
 				} else {
-					player.sendMessage("Player \"" + target.getName() + "\" not found");
+					sender.sendMessage("Player \"" + target.getName() + "\" not found");
 				}
 			}	
 		}

src/main/java/pw/kaboom/extras/commands/CommandSkin.java

@@ -10,6 +10,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 
 import org.bukkit.entity.Player;
 
@@ -28,6 +29,9 @@ class CommandSkin implements CommandExecutor {
 	}
 
 	public boolean onCommand(CommandSender sender, Command command, String label, final String[] args) {
+		if (sender instanceof ConsoleCommandSender) {
+			sender.sendMessage("Command has to be run by a player");
+		} else {
 			final Player player = (Player) sender;
 	
 			if (args.length == 0) {
@@ -70,6 +74,7 @@ class CommandSkin implements CommandExecutor {
 					}
 				}.runTaskAsynchronously(main);
 			}
+		}
 		return true;
 	}
 }

src/main/java/pw/kaboom/extras/commands/CommandSpawn.java

@@ -10,11 +10,15 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 
 import org.bukkit.entity.Player;
 
 class CommandSpawn implements CommandExecutor {
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+		if (sender instanceof ConsoleCommandSender) {
+			sender.sendMessage("Command has to be run by a player");
+		} else {
 			final Player player = (Player) sender;
 			final World world = Bukkit.getWorld("world");
 			final Location spawnLocation = world.getSpawnLocation();
@@ -31,6 +35,7 @@ class CommandSpawn implements CommandExecutor {
 			}
 	
 			player.sendMessage("Successfully moved to spawn");
+		}
 		return true;
 	}
 }

src/main/java/pw/kaboom/extras/commands/CommandSpidey.java

@@ -6,6 +6,7 @@ import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 
 import org.bukkit.entity.Player;
 
@@ -14,6 +15,9 @@ import org.bukkit.util.Vector;
 
 class CommandSpidey implements CommandExecutor {
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+		if (sender instanceof ConsoleCommandSender) {
+			sender.sendMessage("Command has to be run by a player");
+		} else {
 			final Player player = (Player) sender;
 			final Location eyePos = player.getEyeLocation();
 			final Vector playerPos = new Vector(eyePos.getX(), eyePos.getY(), eyePos.getZ());
@@ -27,6 +31,7 @@ class CommandSpidey implements CommandExecutor {
 				blockIterator.next().getType() == Material.CAVE_AIR)) {
 				blockIterator.next().setType(Material.COBWEB);
 			}
+		}
 		return true;
 	}
 }

src/main/java/pw/kaboom/extras/commands/CommandTellraw.java

@@ -11,10 +11,8 @@ import org.bukkit.entity.Player;
 
 class CommandTellraw implements CommandExecutor {
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		final Player player = (Player) sender;
-
 		if (args.length == 0) {
-			player.sendMessage(ChatColor.RED + "Usage: /" + label + " <message ..>");
+			sender.sendMessage(ChatColor.RED + "Usage: /" + label + " <message ..>");
 		} else {
 			for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
 				onlinePlayer.sendMessage(ChatColor.translateAlternateColorCodes('&', String.join(" ", args)));

src/main/java/pw/kaboom/extras/commands/CommandUnloadChunks.java

@@ -12,7 +12,6 @@ import org.bukkit.entity.Player;
 
 class CommandUnloadChunks implements CommandExecutor {
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		final Player player = (Player) sender;
 		int chunkCount = 0;
 
 		for (World world : Bukkit.getServer().getWorlds()) {
@@ -23,7 +22,7 @@ class CommandUnloadChunks implements CommandExecutor {
 			}
 		}
 
-		player.sendMessage("Unloaded " + chunkCount + " unused chunks");
+		sender.sendMessage("Unloaded " + chunkCount + " unused chunks");
 		return true;
 	}
 }

src/main/java/pw/kaboom/extras/commands/CommandUsername.java

@@ -10,6 +10,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 
 import org.bukkit.entity.Player;
 
@@ -28,6 +29,9 @@ class CommandUsername implements CommandExecutor {
 	}
 
 	public boolean onCommand(CommandSender sender, Command command, String label, final String[] args) {
+		if (sender instanceof ConsoleCommandSender) {
+			sender.sendMessage("Command has to be run by a player");
+		} else {
 			final Player player = (Player) sender;
 		
 			if (args.length == 0) {
@@ -80,6 +84,7 @@ class CommandUsername implements CommandExecutor {
 					}
 				}.runTaskAsynchronously(main);
 			}
+		}
 		return true;
 	}
 }

src/main/java/pw/kaboom/extras/modules/player/PlayerChat.java

@@ -25,7 +25,7 @@ class PlayerChat implements Listener {
 		if (main.commandMillisList.get(playerUuid) != null) {
 			final long millisDifference = System.currentTimeMillis() - main.commandMillisList.get(playerUuid);
 	
-			if (millisDifference < 20) {
+			if (millisDifference < 5) {
 				event.setCancelled(true);
 			}
 		}

src/main/java/pw/kaboom/extras/modules/player/PlayerCommand.java

@@ -14,116 +14,6 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 
 import org.bukkit.scheduler.BukkitRunnable;
 
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.Permission;
-
-import org.bukkit.permissions.PermissionAttachment;
-
-import org.bukkit.permissions.PermissionAttachmentInfo;
-import org.bukkit.Server;
-import org.bukkit.plugin.Plugin;
-
-import java.util.Set;
-
-class WrappedSender implements CommandSender {
-    private final CommandSender sender;
-
-    public WrappedSender(CommandSender sender) {
-        this.sender = sender;
-    }
-
-    @Override
-    public void sendMessage(String message) {
-        sender.sendMessage(message);/*.substring(0, Math.min(256, message.length())));*/
-    }
-
-    @Override
-    public void sendMessage(String[] messages) {
-        sender.sendMessage(messages);
-    }
-
-    @Override
-    public Server getServer() {
-        return sender.getServer();
-    }
-
-    @Override
-    public String getName() {
-        return sender.getName();
-    }
-
-    @Override
-    public boolean isPermissionSet(String name) {
-        return sender.isPermissionSet(name);
-    }
-
-    @Override
-    public boolean isPermissionSet(Permission perm) {
-        return sender.isPermissionSet(perm);
-    }
-
-    @Override
-    public boolean hasPermission(String name) {
-        return sender.hasPermission(name);
-    }
-
-    @Override
-    public boolean hasPermission(Permission perm) {
-        return sender.hasPermission(perm);
-    }
-
-    @Override
-    public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value) {
-        return sender.addAttachment(plugin, name, value);
-    }
-
-    @Override
-    public PermissionAttachment addAttachment(Plugin plugin) {
-        return sender.addAttachment(plugin);
-    }
-
-    @Override
-    public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value, int ticks) {
-        return sender.addAttachment(plugin, name, value, ticks);
-    }
-
-    @Override
-    public PermissionAttachment addAttachment(Plugin plugin, int ticks) {
-        return sender.addAttachment(plugin, ticks);
-    }
-
-    @Override
-    public void removeAttachment(PermissionAttachment attachment) {
-        sender.removeAttachment(attachment);
-    }
-
-    @Override
-    public void recalculatePermissions() {
-        sender.recalculatePermissions();
-    }
-
-    @Override
-    public Set<PermissionAttachmentInfo> getEffectivePermissions() {
-        return sender.getEffectivePermissions();
-    }
-
-    @Override
-    public boolean isOp() {
-        return sender.isOp();
-    }
-
-    @Override
-    public void setOp(boolean value) {
-        sender.setOp(value);
-    }
-	
-    @Override
-    public Spigot spigot() {
-		return null;
-	}
-}
-
 class PlayerCommand implements Listener {
 	private Main main;
 	public PlayerCommand(Main main) {
@@ -139,7 +29,7 @@ class PlayerCommand implements Listener {
 		if (main.commandMillisList.get(playerUuid) != null) {
 			final long millisDifference = System.currentTimeMillis() - main.commandMillisList.get(playerUuid);
 	
-			if (millisDifference < 200) {
+			if (millisDifference < 75) {
 				event.setCancelled(true);
 			}
 		}
@@ -233,11 +123,5 @@ class PlayerCommand implements Listener {
 			event.setCancelled(true);
 			Command.broadcastCommandMessage(event.getPlayer(), "Stopping the server");
 		}
-		
-		/*if (!event.isCancelled()) {
-			WrappedSender wrapped = new WrappedSender(event.getPlayer());
-			Bukkit.getServer().dispatchCommand(wrapped, event.getMessage().substring(1));
-			event.setCancelled(true);
-		}*/
 	}
 }