Anura/AnuraCore
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change code style

Browse Source
This commit is contained in:
kaenganxt
2014-10-27 17:27:11 +01:00
parent a290afdb6a
commit 20f8a38df4
40 changed files with 2089 additions and 2355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/de/anura/core/commands/AdminCommands.java
View File

@@ -18,82 +18,66 @@ public class AdminCommands implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command cmd, String alias, String[] args) {
Player P = null;
if(sender instanceof Player)
{
P = (Player)sender;
if (sender instanceof Player) {
P = (Player) sender;
}
if(cmd.getName().equalsIgnoreCase("clearArrows"))
{
if(P == null)
{
Core.statusMsg(sender,"only_player_cmd",false);
if (cmd.getName().equalsIgnoreCase("clearArrows")) {
if (P == null) {
Core.statusMsg(sender, "only_player_cmd", false);
return true;
}
if(!sender.hasPermission("core.commands.cleararrows"))
{
Core.statusMsg(sender,"no_perms",false);
if (!sender.hasPermission("core.commands.cleararrows")) {
Core.statusMsg(sender, "no_perms", false);
return true;
}
for(Player pl : Core.getMainClass().sittingPlayer.keySet())
{
for (Player pl : Core.getMainClass().sittingPlayer.keySet()) {
Core.endSitting(pl);
}
for(Arrow a : P.getWorld().getEntitiesByClass(Arrow.class))
{
for (Arrow a : P.getWorld().getEntitiesByClass(Arrow.class)) {
a.remove();
}
Core.getTools().sendStatusMsg(sender, "Done!", true);
return true;
} else if(cmd.getName().equalsIgnoreCase("core"))
{
if(!sender.hasPermission("core.commands.core"))
{
Core.statusMsg(sender,"no_perms",false);
} else if (cmd.getName().equalsIgnoreCase("core")) {
if (!sender.hasPermission("core.commands.core")) {
Core.statusMsg(sender, "no_perms", false);
return true;
}
if(args.length != 1)
{
Core.statusMsg(sender,"wrong_args_count",false);
if (args.length != 1) {
Core.statusMsg(sender, "wrong_args_count", false);
return false;
}
if((args[0].equalsIgnoreCase("reload") || args[0].equalsIgnoreCase("rl")) && sender.isOp())
{
if ((args[0].equalsIgnoreCase("reload") || args[0].equalsIgnoreCase("rl")) && sender.isOp()) {
try {
Core.getMainClass().getConfig().load(new File("plugins/Core/","config.yml"));
Core.getMainClass().getConfig().load(new File("plugins/Core/", "config.yml"));
Core.getMainClass().lang = new LanguageSupport(Core.getMainClass());
Core.statusMsg(sender,"config_rl_done",true);
Core.statusMsg(sender, "config_rl_done", true);
} catch (IOException ex) {
Core.statusMsg(sender,"config_rl_error_io",false);
Core.statusMsg(sender, "config_rl_error_io", false);
} catch (InvalidConfigurationException ex) {
Core.statusMsg(sender,"config_rl_invalid",false);
Core.statusMsg(sender, "config_rl_invalid", false);
}
return true;
}
else if(args[0].equalsIgnoreCase("save") && sender.isOp())
{
} else if (args[0].equalsIgnoreCase("save") && sender.isOp()) {
try {
Core.getMainClass().getConfig().save(new File("plugins/Core/","config.yml"));
Core.statusMsg(sender,"config_save",true);
Core.getMainClass().getConfig().save(new File("plugins/Core/", "config.yml"));
Core.statusMsg(sender, "config_save", true);
} catch (IOException ex) {
Core.statusMsg(sender,"config_save_io_err",false);
Core.statusMsg(sender, "config_save_io_err", false);
}
}
else if(args[0].equalsIgnoreCase("debugclosemysql") && sender.isOp())
{
} else if (args[0].equalsIgnoreCase("debugclosemysql") && sender.isOp()) {
AnuraCore.sql.closeConnection();
Core.statusMsg(sender, "debug_mysql_closed", true);
return true;
}
} else if(cmd.getName().equalsIgnoreCase("setspawn"))
{
if(P != null && P.hasPermission("core.commands.setspawn"))
{
} else if (cmd.getName().equalsIgnoreCase("setspawn")) {
if (P != null && P.hasPermission("core.commands.setspawn")) {
Location l = P.getLocation();
l.getWorld().setSpawnLocation((int)l.getX(), (int)l.getY(), (int)l.getZ());
Core.statusMsg(P,"spawn_set",true);
l.getWorld().setSpawnLocation((int) l.getX(), (int) l.getY(), (int) l.getZ());
Core.statusMsg(P, "spawn_set", true);
return true;
}
}
return false;
}
}
}

25
src/de/anura/core/commands/OtherCommands.java
View File

@@ -14,24 +14,29 @@ public class OtherCommands implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command cmd, String alias, String[] args) {
Player P = null;
if(sender instanceof Player) {
P = (Player)sender;
if (sender instanceof Player) {
P = (Player) sender;
}
if(cmd.getName().equalsIgnoreCase("togglecommands")) {
if(!(sender instanceof BlockCommandSender)) {
Core.getTools().sendStatusMsg(sender,"Only command block cmd!",false);
if (cmd.getName().equalsIgnoreCase("togglecommands")) {
if (!(sender instanceof BlockCommandSender)) {
Core.getTools().sendStatusMsg(sender, "Only command block cmd!", false);
return true;
}
if(args.length != 2) return false;
if (args.length != 2) {
return false;
}
String action = args[1];
if(!action.equals("disable") && !action.equals("enable")) return true;
if (!action.equals("disable") && !action.equals("enable")) {
return true;
}
OfflinePlayer op = Bukkit.getOfflinePlayer(args[0]);
if(!op.isOnline()) return true;
if (!op.isOnline()) {
return true;
}
Boolean b = action.equals("disable");
Core.getMainClass().disableCommandsAdventure.put(op.getPlayer(), b);
return true;
} else if(cmd.getName().equalsIgnoreCase("none"))
{
} else if (cmd.getName().equalsIgnoreCase("none")) {
Core.statusMsg(sender, "cmd_not_found", false);
return true;
}

275
src/de/anura/core/commands/PlayerCommands.java
View File

@@ -23,12 +23,11 @@ public class PlayerCommands implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command cmd, String cmdLabel, String[] args) {
Player P = null;
if(sender instanceof Player)
{
P = (Player)sender;
if (sender instanceof Player) {
P = (Player) sender;
}
if(cmd.getName().equalsIgnoreCase("toggledbljump")) {
if(P == null) {
if (cmd.getName().equalsIgnoreCase("toggledbljump")) {
if (P == null) {
Core.statusMsg(sender, "only_player_cmd", false);
return true;
}
@@ -48,13 +47,17 @@ public class PlayerCommands implements CommandExecutor {
}
if (args[0].equalsIgnoreCase("xpbattle")) {
Objective o = Bukkit.getScoreboardManager().getMainScoreboard().getObjective("xpBattleJoin");
if (o == null) return true;
if (o == null) {
return true;
}
o.getScore(P).setScore(1);
Core.statusMsg(sender, "joined_xpBattle", true);
return true;
} else if (args[0].equalsIgnoreCase("pool")) {
Objective o = Bukkit.getScoreboardManager().getMainScoreboard().getObjective("poolJoin");
if (o == null) return true;
if (o == null) {
return true;
}
o.getScore(P).setScore(1);
Core.statusMsg(sender, "joined_pool", true);
return true;
@@ -69,13 +72,17 @@ public class PlayerCommands implements CommandExecutor {
}
if (args[0].equalsIgnoreCase("xpbattle")) {
Objective o = Bukkit.getScoreboardManager().getMainScoreboard().getObjective("xpBattleJoin");
if (o == null) return true;
if (o == null) {
return true;
}
o.getScore(P).setScore(0);
Core.statusMsg(sender, "left_xpBattle", true);
return true;
} else if (args[0].equalsIgnoreCase("pool")) {
Objective o = Bukkit.getScoreboardManager().getMainScoreboard().getObjective("poolJoin");
if (o == null) return true;
if (o == null) {
return true;
}
o.getScore(P).setScore(0);
Core.statusMsg(sender, "left_pool", true);
return true;
@@ -90,7 +97,9 @@ public class PlayerCommands implements CommandExecutor {
}
if (args[0].equalsIgnoreCase("xpbattle")) {
Objective o = Bukkit.getScoreboardManager().getMainScoreboard().getObjective("xpBattleJoin");
if (o == null) return true;
if (o == null) {
return true;
}
if (o.getScore(P).getScore() == 0) {
Bukkit.dispatchCommand(sender, "joinminigame xpBattle");
return true;
@@ -100,7 +109,9 @@ public class PlayerCommands implements CommandExecutor {
}
} else if (args[0].equalsIgnoreCase("pool")) {
Objective o = Bukkit.getScoreboardManager().getMainScoreboard().getObjective("poolJoin");
if (o == null) return true;
if (o == null) {
return true;
}
if (o.getScore(P).getScore() == 0) {
Bukkit.dispatchCommand(sender, "joinminigame pool");
return true;
@@ -109,117 +120,94 @@ public class PlayerCommands implements CommandExecutor {
return true;
}
}
} else if(cmd.getName().equalsIgnoreCase("hilfe"))
{
if(!cmdLabel.equals("hilfe") && !cmdLabel.equals("help") && !cmdLabel.equals("?"))
{
} else if (cmd.getName().equalsIgnoreCase("hilfe")) {
if (!cmdLabel.equals("hilfe") && !cmdLabel.equals("help") && !cmdLabel.equals("?")) {
cmdLabel = "hilfe";
}
if(sender.hasPermission("core.commands.help"))
{
sender.sendMessage(ChatColor.RED + "Achtung: "+ChatColor.YELLOW+"Die echte Hilfe gibts mit "+ChatColor.BLUE+"/?"+ChatColor.YELLOW+"!");
if (sender.hasPermission("core.commands.help")) {
sender.sendMessage(ChatColor.RED + "Achtung: " + ChatColor.YELLOW + "Die echte Hilfe gibts mit " + ChatColor.BLUE + "/?" + ChatColor.YELLOW + "!");
}
if(args.length == 0)
{
sender.sendMessage(ChatColor.YELLOW+"-----------"+ChatColor.AQUA+"Hilfe"+ChatColor.YELLOW+"-----------");
sender.sendMessage(ChatColor.GREEN+"Hilfe zu den Befehlen gibt es mit "+ChatColor.BLUE+"/"+cmdLabel+" commands");
sender.sendMessage(ChatColor.GOLD+"Informationen zu unseren GameModes erhälst du mit "+ChatColor.BLUE+"/"+cmdLabel+" gamemodes");
}
else if(args.length == 1)
{
if(args[0].equalsIgnoreCase("commands"))
{
sender.sendMessage(ChatColor.YELLOW+"-----------"+ChatColor.AQUA+"Befehle"+ChatColor.YELLOW+"-----------");
sender.sendMessage(ChatColor.BLUE+"/lobby "+ChatColor.GREEN+"Bringt dich jederzeit zurück zur Lobby.");
sender.sendMessage(ChatColor.BLUE+"/spawn "+ChatColor.GOLD+"Teleportiert dich zum Spawn.");
sender.sendMessage(ChatColor.BLUE+"/money "+ChatColor.GREEN+"Zeigt dein Geld an.");
sender.sendMessage(ChatColor.RED+"Befehle für den Smash-Gamemode siehst du mit "+ChatColor.BLUE+"/"+cmdLabel+" commands smash");
if (args.length == 0) {
sender.sendMessage(ChatColor.YELLOW + "-----------" + ChatColor.AQUA + "Hilfe" + ChatColor.YELLOW + "-----------");
sender.sendMessage(ChatColor.GREEN + "Hilfe zu den Befehlen gibt es mit " + ChatColor.BLUE + "/" + cmdLabel + " commands");
sender.sendMessage(ChatColor.GOLD + "Informationen zu unseren GameModes erhälst du mit " + ChatColor.BLUE + "/" + cmdLabel + " gamemodes");
} else if (args.length == 1) {
if (args[0].equalsIgnoreCase("commands")) {
sender.sendMessage(ChatColor.YELLOW + "-----------" + ChatColor.AQUA + "Befehle" + ChatColor.YELLOW + "-----------");
sender.sendMessage(ChatColor.BLUE + "/lobby " + ChatColor.GREEN + "Bringt dich jederzeit zurück zur Lobby.");
sender.sendMessage(ChatColor.BLUE + "/spawn " + ChatColor.GOLD + "Teleportiert dich zum Spawn.");
sender.sendMessage(ChatColor.BLUE + "/money " + ChatColor.GREEN + "Zeigt dein Geld an.");
sender.sendMessage(ChatColor.RED + "Befehle für den Smash-Gamemode siehst du mit " + ChatColor.BLUE + "/" + cmdLabel + " commands smash");
} else if (args[0].equalsIgnoreCase("gamemodes")) {
sender.sendMessage(ChatColor.YELLOW + "-----------" + ChatColor.AQUA + "Gamemodes" + ChatColor.YELLOW + "-----------");
sender.sendMessage(ChatColor.GRAY + "----------" + ChatColor.GREEN + "Smash PvP" + ChatColor.GRAY + "-----------");
sender.sendMessage(ChatColor.BLUE + "In Smash PvP geht es darum, mithilfe von verschiedenen Klassen deine "
+ "Gegner ins Wasser, in die Lava oder aus der Welt zu schlagen. "
+ "Du kannst verschiedenen Arenen beitreten. Es gibt keine Begrenzung, wie "
+ "lange du spielen kannst. Jeder Kill gibt dir Münzen. Stirbst du, verlierst du "
+ "eine Münze.");
sender.sendMessage(ChatColor.GOLD + "Mit " + ChatColor.RED + "/" + cmdLabel + " commands smash" + ChatColor.GOLD + " kannst du dir");
sender.sendMessage(ChatColor.GOLD + "alle Befehle des Minigames anzeigen lassen.");
}
else if(args[0].equalsIgnoreCase("gamemodes"))
{
sender.sendMessage(ChatColor.YELLOW+"-----------"+ChatColor.AQUA+"Gamemodes"+ChatColor.YELLOW+"-----------");
sender.sendMessage(ChatColor.GRAY+"----------"+ChatColor.GREEN+"Smash PvP"+ChatColor.GRAY+"-----------");
sender.sendMessage(ChatColor.BLUE+"In Smash PvP geht es darum, mithilfe von verschiedenen Klassen deine "+
"Gegner ins Wasser, in die Lava oder aus der Welt zu schlagen. "+
"Du kannst verschiedenen Arenen beitreten. Es gibt keine Begrenzung, wie "+
"lange du spielen kannst. Jeder Kill gibt dir Münzen. Stirbst du, verlierst du "+
"eine Münze.");
sender.sendMessage(ChatColor.GOLD+"Mit "+ChatColor.RED+"/"+cmdLabel+" commands smash"+ChatColor.GOLD+" kannst du dir");
sender.sendMessage(ChatColor.GOLD+"alle Befehle des Minigames anzeigen lassen.");
}
}
else if(args.length == 2)
{
if(args[0].equalsIgnoreCase("commands") && args[1].equalsIgnoreCase("smash"))
{
sender.sendMessage(ChatColor.YELLOW+"-----------"+ChatColor.AQUA+"Smash Befehle"+ChatColor.YELLOW+"-----------");
sender.sendMessage(ChatColor.BLUE+"/join <Arena> "+ChatColor.GREEN+"Hiermit kannst du einem Smash Game beitreten.");
sender.sendMessage(ChatColor.BLUE+"/leave "+ChatColor.GREEN+"Lässt dich ein Spiel verlassen.");
sender.sendMessage(ChatColor.BLUE+"/class "+ChatColor.GREEN+"Damit kannst du während eines Spiels die Klasse wechseln.");
sender.sendMessage(ChatColor.BLUE+"/classes "+ChatColor.GREEN+"Teleportiert dich in einen Raum, in dem du Klassen kaufen kannst.");
sender.sendMessage(ChatColor.BLUE+"/bug <Beschreibung> "+ChatColor.GREEN+"Wenn du einen Bug gefunden hast, kannst du ihn so reporten.");
} else if (args.length == 2) {
if (args[0].equalsIgnoreCase("commands") && args[1].equalsIgnoreCase("smash")) {
sender.sendMessage(ChatColor.YELLOW + "-----------" + ChatColor.AQUA + "Smash Befehle" + ChatColor.YELLOW + "-----------");
sender.sendMessage(ChatColor.BLUE + "/join <Arena> " + ChatColor.GREEN + "Hiermit kannst du einem Smash Game beitreten.");
sender.sendMessage(ChatColor.BLUE + "/leave " + ChatColor.GREEN + "Lässt dich ein Spiel verlassen.");
sender.sendMessage(ChatColor.BLUE + "/class " + ChatColor.GREEN + "Damit kannst du während eines Spiels die Klasse wechseln.");
sender.sendMessage(ChatColor.BLUE + "/classes " + ChatColor.GREEN + "Teleportiert dich in einen Raum, in dem du Klassen kaufen kannst.");
sender.sendMessage(ChatColor.BLUE + "/bug <Beschreibung> " + ChatColor.GREEN + "Wenn du einen Bug gefunden hast, kannst du ihn so reporten.");
}
}
return true;
} else if(cmd.getName().equalsIgnoreCase("spawn"))
{
if(args.length == 1)
{
if(sender.hasPermission("core.commands.spawn-other") || sender instanceof BlockCommandSender)
{
if(Bukkit.getOfflinePlayer(args[0]).isOnline())
{
} else if (cmd.getName().equalsIgnoreCase("spawn")) {
if (args.length == 1) {
if (sender.hasPermission("core.commands.spawn-other") || sender instanceof BlockCommandSender) {
if (Bukkit.getOfflinePlayer(args[0]).isOnline()) {
P = Bukkit.getPlayer(args[0]);
}
}
}
if(P == null)
{
if (P == null) {
Core.statusMsg(sender, "only_player_cmd", false);
return true;
}
P.teleport(P.getLocation().getWorld().getSpawnLocation());
Core.statusMsg(P,"spawn_tp_done",true);
Core.statusMsg(P, "spawn_tp_done", true);
return true;
} else if(cmd.getName().equalsIgnoreCase("warp"))
{
} else if (cmd.getName().equalsIgnoreCase("warp")) {
try {
if(args.length == 0 || args.length > 2)
{
if (args.length == 0 || args.length > 2) {
Core.statusMsg(P, "wrong_args_count", false);
return false;
}
if(P == null)
{
if(args.length != 2)
{
if (P == null) {
if (args.length != 2) {
Core.statusMsg(P, "wrong_args_count", false);
return false;
}
}
if(args.length == 2)
{
if (args.length == 2) {
String p = args[1];
if(!Bukkit.getOfflinePlayer(p).isOnline())
{
if (!Bukkit.getOfflinePlayer(p).isOnline()) {
Core.statusMsg(P, "player_not_online", false);
return false;
}
P = Bukkit.getPlayer(p);
}
String warpName = args[0];
ResultSet rs = sql.querySelect("SELECT world, X, Y, Z, userWarp, server FROM coreWarps WHERE name = '"+warpName+"'");
ResultSet rs = sql.querySelect("SELECT world, X, Y, Z, userWarp, server FROM coreWarps WHERE name = '" + warpName + "'");
rs.last();
if(rs.getRow() == 0)
{
if (rs.getRow() == 0) {
Core.statusMsg(P, "warp_not_exist", false);
return true;
}
rs.first();
if(P == null) return false;
if(!rs.getBoolean("userWarp") && !P.hasPermission("core.commands.adminWarp"))
{
if (P == null) {
return false;
}
if (!rs.getBoolean("userWarp") && !P.hasPermission("core.commands.adminWarp")) {
Core.statusMsg(P, "no_perms", false);
return true;
}
@@ -228,14 +216,12 @@ public class PlayerCommands implements CommandExecutor {
int Z = rs.getInt("Z");
String server = rs.getString("server");
String world = rs.getString("world");
if(!server.equals(Core.getMainClass().getConfig().getString("server-name")))
{
if (!server.equals(Core.getMainClass().getConfig().getString("server-name"))) {
Core.statusMsg(P, "warp_other_server", false);
return true;
}
World w = Bukkit.getWorld(world);
if(w == null)
{
if (w == null) {
Core.statusMsg(P, "warp_not_avail", false);
return true;
}
@@ -244,103 +230,76 @@ public class PlayerCommands implements CommandExecutor {
Core.statusMsg(P, "warp_tp_done", true);
return true;
} catch (SQLException ex) {
System.out.println("Error: "+ex.getLocalizedMessage());
System.out.println("Error: " + ex.getLocalizedMessage());
}
}
else if(cmd.getName().equalsIgnoreCase("money"))
{
if(args.length == 0)
{
if(P == null)
{
Core.getTools().sendStatusMsg(sender,"only_player_cmd",false);
} else if (cmd.getName().equalsIgnoreCase("money")) {
if (args.length == 0) {
if (P == null) {
Core.getTools().sendStatusMsg(sender, "only_player_cmd", false);
return true;
}
Integer money = Money.getMoney(P);
Core.getTools().sendStatusMsg(P,Core.getl("you_have", P)+" "+money+" "+ Core.getl("coins", P),true);
return true;
}
else if((args[0].equalsIgnoreCase("pay")) && (args.length == 3))
{
Core.getTools().sendStatusMsg(P, Core.getl("you_have", P) + " " + money + " " + Core.getl("coins", P), true);
return true;
} else if ((args[0].equalsIgnoreCase("pay")) && (args.length == 3)) {
Integer money = Integer.parseInt(args[2]);
boolean canPay;
Integer geld = 0;
if(sender.hasPermission("core.money.endless"))
{
if(P != null)
{
if (sender.hasPermission("core.money.endless")) {
if (P != null) {
canPay = P.hasPermission("core.money.endless");
}
else
{
} else {
canPay = true;
}
}
else
{
if(P == null)
{
Core.statusMsg(sender,"only_player_cmd",false);
return true;
} else {
if (P == null) {
Core.statusMsg(sender, "only_player_cmd", false);
return true;
}
if(P.getName().equals(args[1]))
{
Core.statusMsg(P,"money_pay_yourself",false);
return true;
if (P.getName().equals(args[1])) {
Core.statusMsg(P, "money_pay_yourself", false);
return true;
}
if(!(money > 0))
{
Core.statusMsg(P,"number_must_positive",false);
return true;
if (!(money > 0)) {
Core.statusMsg(P, "number_must_positive", false);
return true;
}
int currentMoney = Money.getMoney(P);
if(currentMoney < money)
{
Core.statusMsg(P,"not_enough_money",false);
if (currentMoney < money) {
Core.statusMsg(P, "not_enough_money", false);
canPay = false;
}
else
{
} else {
geld = currentMoney;
canPay = true;
}
}
if(canPay)
{
if (canPay) {
OfflinePlayer oP = Bukkit.getOfflinePlayer(args[1]);
if(!oP.hasPlayedBefore() && !oP.isOnline())
{
if (!oP.hasPlayedBefore() && !oP.isOnline()) {
Core.statusMsg(P, "never_seen_player", false);
return true;
}
int currentMoney2 = Money.getMoney(oP);
if(currentMoney2 != -1)
{
if (currentMoney2 != -1) {
Money.payMoney(oP, money);
if(P == null){}
else if(!P.hasPermission("core.money.endless"))
{
if (P == null) {
} else if (!P.hasPermission("core.money.endless")) {
Money.payMoney(P, -money);
}
Core.getTools().sendStatusMsg(sender,Core.getl("money_payed_1", sender)+" "+args[1]+" "+Core.getl("money_payed_2", sender)+" "+args[2]+" "+Core.getl("money_payed_3", sender),true);
if(oP.isOnline())
{
Core.getTools().sendStatusMsg(oP.getPlayer(),Core.getl("money_got_1", oP.getPlayer())+" "+args[2]+" "+Core.getl("money_got_2", oP.getPlayer())+" "+sender.getName()+" "+Core.getl("money_got_3", oP.getPlayer()),true);
}
return true;
}
else
{
Core.statusMsg(sender,"never_seen_player", false);
Core.getTools().sendStatusMsg(sender, Core.getl("money_payed_1", sender) + " " + args[1] + " " + Core.getl("money_payed_2", sender) + " " + args[2] + " " + Core.getl("money_payed_3", sender), true);
if (oP.isOnline()) {
Core.getTools().sendStatusMsg(oP.getPlayer(), Core.getl("money_got_1", oP.getPlayer()) + " " + args[2] + " " + Core.getl("money_got_2", oP.getPlayer()) + " " + sender.getName() + " " + Core.getl("money_got_3", oP.getPlayer()), true);
}
return true;
}
}
else
{
} else {
Core.statusMsg(sender, "never_seen_player", false);
return true;
}
} else {
return true;
}
}
}
}
}
return false;
}
}
}

293
src/de/anura/core/commands/TeamCommands.java
View File

@@ -33,69 +33,55 @@ public class TeamCommands implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command cmd, String alias, String[] args) {
Player P = null;
if(sender instanceof Player)
{
P = (Player)sender;
if (sender instanceof Player) {
P = (Player) sender;
}
if(cmd.getName().equalsIgnoreCase("setcmd"))
{
if(P == null)
{
Core.statusMsg(sender,"only_player_cmd",false);
if (cmd.getName().equalsIgnoreCase("setcmd")) {
if (P == null) {
Core.statusMsg(sender, "only_player_cmd", false);
return true;
}
if(!sender.hasPermission("core.commands.editcmd"))
{
Core.statusMsg(sender,"no_perms",false);
if (!sender.hasPermission("core.commands.editcmd")) {
Core.statusMsg(sender, "no_perms", false);
return true;
}
if(args.length < 1)
{
Core.statusMsg(sender,"wrong_args_count",false);
if (args.length < 1) {
Core.statusMsg(sender, "wrong_args_count", false);
return false;
}
Block b = P.getTargetBlock(null, 100);
if(b.getType().equals(Material.COMMAND))
{
if (b.getType().equals(Material.COMMAND)) {
String command = "";
for(String arg : args)
{
if(!command.equals(""))
{
for (String arg : args) {
if (!command.equals("")) {
command += " ";
}
command += arg;
}
CommandBlock cb = (CommandBlock)b.getState();
CommandBlock cb = (CommandBlock) b.getState();
cb.setCommand(command);
cb.update();
}
return true;
} else if(cmd.getName().equalsIgnoreCase("addcmd")) {
if(P == null)
{
Core.statusMsg(sender,"only_player_cmd",false);
} else if (cmd.getName().equalsIgnoreCase("addcmd")) {
if (P == null) {
Core.statusMsg(sender, "only_player_cmd", false);
return true;
}
if(!sender.hasPermission("core.commands.editcmd"))
{
Core.statusMsg(sender,"no_perms",false);
if (!sender.hasPermission("core.commands.editcmd")) {
Core.statusMsg(sender, "no_perms", false);
return true;
}
if(args.length != 1)
{
Core.statusMsg(sender,"wrong_args_count",false);
if (args.length != 1) {
Core.statusMsg(sender, "wrong_args_count", false);
return false;
}
Block b = P.getTargetBlock(null, 100);
if(b.getType().equals(Material.COMMAND))
{
CommandBlock cb = (CommandBlock)b.getState();
if (b.getType().equals(Material.COMMAND)) {
CommandBlock cb = (CommandBlock) b.getState();
String command = "";
for(String arg : args)
{
if(!command.equals(""))
{
for (String arg : args) {
if (!command.equals("")) {
command += " ";
}
command += arg;
@@ -105,80 +91,67 @@ public class TeamCommands implements CommandExecutor {
cb.update();
}
return true;
}
else if(cmd.getName().equalsIgnoreCase("gm"))
{
} else if (cmd.getName().equalsIgnoreCase("gm")) {
String command = "gamemode ";
for(String arg : args)
{
command += arg+" ";
for (String arg : args) {
command += arg + " ";
}
Bukkit.dispatchCommand(sender, command);
return true;
}else if(cmd.getName().equalsIgnoreCase("stairmode"))
{
if(P == null)
{
Core.statusMsg(sender,"only_player_cmd",false);
} else if (cmd.getName().equalsIgnoreCase("stairmode")) {
if (P == null) {
Core.statusMsg(sender, "only_player_cmd", false);
return true;
}
if(!P.hasPermission("core.commands.stairmode"))
{
Core.statusMsg(sender,"no_perms",false);
if (!P.hasPermission("core.commands.stairmode")) {
Core.statusMsg(sender, "no_perms", false);
return true;
}
if(Core.getMainClass().stairMode.contains(P)) Core.getMainClass().stairMode.remove(P);
else Core.getMainClass().stairMode.add(P);
if (Core.getMainClass().stairMode.contains(P)) {
Core.getMainClass().stairMode.remove(P);
} else {
Core.getMainClass().stairMode.add(P);
}
Core.getTools().sendStatusMsg(sender, "Done!", true);
return true;
}
else if(cmd.getName().equalsIgnoreCase("flowerpot"))
{
if(P == null)
{
Core.statusMsg(sender,"only_player_cmd",false);
} else if (cmd.getName().equalsIgnoreCase("flowerpot")) {
if (P == null) {
Core.statusMsg(sender, "only_player_cmd", false);
return true;
}
if(!P.hasPermission("core.commands.flowerpot"))
{
Core.statusMsg(sender,"no_perms",false);
if (!P.hasPermission("core.commands.flowerpot")) {
Core.statusMsg(sender, "no_perms", false);
return true;
}
if(args.length != 1)
{
Core.statusMsg(sender,"wrong_args_count",false);
if (args.length != 1) {
Core.statusMsg(sender, "wrong_args_count", false);
return false;
}
Location l = P.getLocation();
if(Core.getMainClass().flowerPots.containsValue(l))
{
if (Core.getMainClass().flowerPots.containsValue(l)) {
Core.statusMsg(sender, "set_arch_exists", false);
return true;
}
Core.getMySql().queryUpdate("INSERT INTO corePots(X,Y,Z,world,url,name,money,type) VALUES('"+l.getBlockX()+"','"+l.getBlockY()+"','"+l.getBlockZ()+"','"+l.getWorld().getName()+"','http://mc-anura.de','"+args[0]+"','1','0')");
ResultSet rs = Core.getMySql().querySelect("SELECT id FROM corePots WHERE X = '"+l.getBlockX()+"' AND Y = '"+l.getBlockY()+"' AND Z = '"+l.getBlockZ()+"' AND world = '"+l.getWorld().getName()+"'");
Core.getMySql().queryUpdate("INSERT INTO corePots(X,Y,Z,world,url,name,money,type) VALUES('" + l.getBlockX() + "','" + l.getBlockY() + "','" + l.getBlockZ() + "','" + l.getWorld().getName() + "','http://mc-anura.de','" + args[0] + "','1','0')");
ResultSet rs = Core.getMySql().querySelect("SELECT id FROM corePots WHERE X = '" + l.getBlockX() + "' AND Y = '" + l.getBlockY() + "' AND Z = '" + l.getBlockZ() + "' AND world = '" + l.getWorld().getName() + "'");
try {
rs.first();
Core.getMainClass().flowerPots.put(rs.getInt("id"), new Location(l.getWorld(),l.getBlockX(),l.getBlockY(),l.getBlockZ()));
Core.getMainClass().flowerPots.put(rs.getInt("id"), new Location(l.getWorld(), l.getBlockX(), l.getBlockY(), l.getBlockZ()));
l.getBlock().setType(Material.BROWN_MUSHROOM);
Core.getMainClass().pots.refreshPot(rs.getInt("id"));
Core.statusMsg(sender, "set_arch_ok", true);
return true;
} catch (SQLException ex) {
System.out.println("Error onCommand. Setpot");
}
}
else if(cmd.getName().equalsIgnoreCase("renderMap"))
{
if(!sender.hasPermission("core.commands.addmap"))
{
Core.statusMsg(sender,"no_perms",false);
} else if (cmd.getName().equalsIgnoreCase("renderMap")) {
if (!sender.hasPermission("core.commands.addmap")) {
Core.statusMsg(sender, "no_perms", false);
return true;
}
if(args.length != 2)
{
Core.statusMsg(sender,"wrong_args_count",false);
if (args.length != 2) {
Core.statusMsg(sender, "wrong_args_count", false);
return false;
}
final CommandSender cs = sender;
@@ -195,7 +168,7 @@ public class TeamCommands implements CommandExecutor {
BufferedImage imgSrc = ImageIO.read(locUrl.openStream());
Image i = imgSrc.getScaledInstance(128, 128, Image.SCALE_SMOOTH);
BufferedImage imgScaled = new BufferedImage(128, 128, BufferedImage.TYPE_INT_ARGB);
imgScaled.getGraphics().drawImage(i, 0, 0 , null);
imgScaled.getGraphics().drawImage(i, 0, 0, null);
AnuraCore.getInstance().renderedImgs.put(name, imgScaled);
Core.getTools().sendStatusMsg(cs, "The rendering has finished!", true);
} catch (MalformedURLException ex) {
@@ -204,126 +177,102 @@ public class TeamCommands implements CommandExecutor {
Core.getTools().sendStatusMsg(cs, "Image rendering not working! Did you provide a valid url?", false);
}
}
}, 1);
return true;
}
else if(cmd.getName().equalsIgnoreCase("addMap"))
{
if(P == null)
{
Core.statusMsg(sender,"only_player_cmd",false);
} else if (cmd.getName().equalsIgnoreCase("addMap")) {
if (P == null) {
Core.statusMsg(sender, "only_player_cmd", false);
return true;
}
if(!P.hasPermission("core.commands.addmap"))
{
Core.statusMsg(sender,"no_perms",false);
if (!P.hasPermission("core.commands.addmap")) {
Core.statusMsg(sender, "no_perms", false);
return true;
}
if(args.length != 1)
{
Core.statusMsg(sender,"wrong_args_count",false);
if (args.length != 1) {
Core.statusMsg(sender, "wrong_args_count", false);
return false;
}
if(!Core.getMainClass().renderedImgs.containsKey(args[0]))
{
if (!Core.getMainClass().renderedImgs.containsKey(args[0])) {
Core.getTools().sendStatusMsg(sender, "The image with the given name does not exist or this not rendered yet.", true);
return true;
}
MapView mv = Bukkit.createMap(P.getWorld());
for(MapRenderer mr : mv.getRenderers())
{
for (MapRenderer mr : mv.getRenderers()) {
mv.removeRenderer(mr);
}
mv.addRenderer(new ImgRenderer(args[0]));
P.setItemInHand(new ItemStack(Material.MAP, 0, mv.getId()));
Core.statusMsg(sender, "addmap_done", true);
return true;
} else if(cmd.getName().equalsIgnoreCase("sun"))
{
if(P != null)
{
if(P.hasPermission("core.commands.sun"))
{
} else if (cmd.getName().equalsIgnoreCase("sun")) {
if (P != null) {
if (P.hasPermission("core.commands.sun")) {
World w = P.getLocation().getWorld();
w.setTime(2000);
w.setThundering(false);
w.setStorm(false);
Core.getMainClass().tools.sendStatusMsg(sender, "Sun!", true);
return true;
}
}
}
} else if(cmd.getName().equalsIgnoreCase("setjumper"))
{
if(P == null)
{
Core.statusMsg(sender,"only_player_cmd",false);
return true;
}
if(args.length != 1)
{
return false;
}
if(!P.hasPermission("core.commands.setjumper"))
{
Core.statusMsg(sender,"no_perms",false);
return true;
}
if(Double.valueOf(args[0]) > 10 || Double.valueOf(args[0]) < 0.2)
{
Core.statusMsg(sender,"setjumper_wrong_number",false);
return true;
}
Core.getMainClass().selectableJumper.put(P, Double.valueOf(args[0]));
sender.sendMessage(ChatColor.GRAY + "[Anura] " +ChatColor.GREEN +Core.getl("setjumper_select_now",sender)+" "+Double.valueOf(args[0])+")");
return true;
} else if(cmd.getName().equalsIgnoreCase("flyspeed"))
{
if(P == null)
{
} else if (cmd.getName().equalsIgnoreCase("setjumper")) {
if (P == null) {
Core.statusMsg(sender, "only_player_cmd", false);
return true;
}
if(!P.hasPermission("core.commands.flyspeed"))
{
if (args.length != 1) {
return false;
}
if (!P.hasPermission("core.commands.setjumper")) {
Core.statusMsg(sender, "no_perms", false);
return true;
}
if (Double.valueOf(args[0]) > 10 || Double.valueOf(args[0]) < 0.2) {
Core.statusMsg(sender, "setjumper_wrong_number", false);
return true;
}
Core.getMainClass().selectableJumper.put(P, Double.valueOf(args[0]));
sender.sendMessage(ChatColor.GRAY + "[Anura] " + ChatColor.GREEN + Core.getl("setjumper_select_now", sender) + " " + Double.valueOf(args[0]) + ")");
return true;
} else if (cmd.getName().equalsIgnoreCase("flyspeed")) {
if (P == null) {
Core.statusMsg(sender, "only_player_cmd", false);
return true;
}
if (!P.hasPermission("core.commands.flyspeed")) {
Core.statusMsg(P, "no_perms", false);
return true;
}
if(args.length != 1)
{
if (args.length != 1) {
return false;
}
if(Float.parseFloat(args[0]) >= 10 || Float.parseFloat(args[0]) < 0)
{
if (Float.parseFloat(args[0]) >= 10 || Float.parseFloat(args[0]) < 0) {
Core.statusMsg(P, "flyspeed_wrong_number", false);
return true;
}
P.setFlySpeed(Float.parseFloat(args[0])/10);
Core.getTools().sendStatusMsg(P, Core.getl("flyspeed_set_1", P)+" "+args[0]+Core.getl("flyspeed_set_2", P), true);
P.setFlySpeed(Float.parseFloat(args[0]) / 10);
Core.getTools().sendStatusMsg(P, Core.getl("flyspeed_set_1", P) + " " + args[0] + Core.getl("flyspeed_set_2", P), true);
return true;
}
else if(cmd.getName().equalsIgnoreCase("setwarp"))
{
} else if (cmd.getName().equalsIgnoreCase("setwarp")) {
try {
if(P == null)
{
if (P == null) {
Core.statusMsg(sender, "only_player_cmd", false);
return true;
}
if(!P.hasPermission("core.commands.setwarp"))
{
if (!P.hasPermission("core.commands.setwarp")) {
Core.statusMsg(P, "no_perms", false);
return true;
}
if(args.length < 1)
{
if (args.length < 1) {
Core.statusMsg(P, "wrong_args_count", false);
return false;
}
String userWarp = "0";
if(args.length == 2)
{
if(args[1].equalsIgnoreCase("true")) userWarp = "1";
if (args.length == 2) {
if (args[1].equalsIgnoreCase("true")) {
userWarp = "1";
}
}
Location loc = P.getLocation();
int X = loc.getBlockX();
@@ -332,49 +281,43 @@ public class TeamCommands implements CommandExecutor {
String world = loc.getWorld().getName();
String server = Core.getMainClass().getConfig().getString("server-name");
String name = args[0];
ResultSet rs = sql.querySelect("SELECT `name` FROM coreWarps WHERE name = '"+name+"'");
ResultSet rs = sql.querySelect("SELECT `name` FROM coreWarps WHERE name = '" + name + "'");
rs.last();
if(rs.getRow() != 0)
{
if (rs.getRow() != 0) {
Core.statusMsg(P, "warp_alr_exist", false);
return true;
}
sql.queryUpdate("INSERT INTO coreWarps(`name`, server, world, X, Y, Z, userWarp) VALUES('"+name+"', '"+server+"', '"+world+"', '"+X+"', '"+Y+"', '"+Z+"', '"+userWarp+"')");
sql.queryUpdate("INSERT INTO coreWarps(`name`, server, world, X, Y, Z, userWarp) VALUES('" + name + "', '" + server + "', '" + world + "', '" + X + "', '" + Y + "', '" + Z + "', '" + userWarp + "')");
Core.statusMsg(P, "warp_set", true);
return true;
} catch (SQLException ex) {
System.out.println("Error: "+ex.getLocalizedMessage());
}
}
else if(cmd.getName().equalsIgnoreCase("remwarp"))
{
if(args.length != 1)
{
} catch (SQLException ex) {
System.out.println("Error: " + ex.getLocalizedMessage());
}
} else if (cmd.getName().equalsIgnoreCase("remwarp")) {
if (args.length != 1) {
Core.statusMsg(P, "wrong_args_count", false);
return false;
}
if(!sender.hasPermission("core.commands.remwarp"))
{
if (!sender.hasPermission("core.commands.remwarp")) {
Core.statusMsg(P, "no_perms", false);
return true;
}
String map = args[0];
ResultSet rs = sql.querySelect("SELECT name FROM coreWarps WHERE name = '"+map+"'");
ResultSet rs = sql.querySelect("SELECT name FROM coreWarps WHERE name = '" + map + "'");
try {
rs.last();
if(rs.getRow() == 0)
{
if (rs.getRow() == 0) {
Core.statusMsg(P, "warp_not_exist", false);
return true;
}
sql.queryUpdate("DELETE FROM coreWarps WHERE name = '"+map+"'");
sql.queryUpdate("DELETE FROM coreWarps WHERE name = '" + map + "'");
Core.statusMsg(P, "warp_rem_done", true);
return true;
} catch (SQLException ex) {
System.out.println("Error: "+ex.getLocalizedMessage());
System.out.println("Error: " + ex.getLocalizedMessage());
}
}
return false;
}
}
}