diff --git a/.gradle/8.5/executionHistory/executionHistory.bin b/.gradle/8.5/executionHistory/executionHistory.bin index 2f03e001eb135ef909d998d255b664b61dba6c81..bc748948f9c99cf384fef774ff684a0599170836 100644 Binary files a/.gradle/8.5/executionHistory/executionHistory.bin and b/.gradle/8.5/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.5/executionHistory/executionHistory.lock b/.gradle/8.5/executionHistory/executionHistory.lock index bf87c5d7c440767ed980f6e6ceda27807529da2d..beec06660d247e3784c248dafbe20a6ff48ef482 100644 Binary files a/.gradle/8.5/executionHistory/executionHistory.lock and b/.gradle/8.5/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.5/fileHashes/fileHashes.bin b/.gradle/8.5/fileHashes/fileHashes.bin index 8dd5b89185dc2e9e8fbd1ff9970ddd7a5d1c3d85..1e693d9cac71c472fa6e4a37783156fe54a64434 100644 Binary files a/.gradle/8.5/fileHashes/fileHashes.bin and b/.gradle/8.5/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.5/fileHashes/fileHashes.lock b/.gradle/8.5/fileHashes/fileHashes.lock index f8151bfafa701e81c416d48a163bc793a3d9258c..9c59461b05377972d06b0132e0cb04b9d1784534 100644 Binary files a/.gradle/8.5/fileHashes/fileHashes.lock and b/.gradle/8.5/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.5/fileHashes/resourceHashesCache.bin b/.gradle/8.5/fileHashes/resourceHashesCache.bin index f055180ee651e4f5137a49423d33a78456d2c9e1..a7edc04727f235f178457970f3d4c4f250a11bdd 100644 Binary files a/.gradle/8.5/fileHashes/resourceHashesCache.bin and b/.gradle/8.5/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a3eddcf6ed0a916be26dfcfb262735e44ff8061c..229728d00de48d639d1b81b5941e126014a3259a 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/build/classes/java/main/FunAndElse/HubCommand.class b/build/classes/java/main/FunAndElse/HubCommand.class index 79ea39fc6384b59e829d60ddf69dc64889e20c99..f0985741b3609fbb13af8c7ca40366ac06541e5a 100644 Binary files a/build/classes/java/main/FunAndElse/HubCommand.class and b/build/classes/java/main/FunAndElse/HubCommand.class differ diff --git a/build/classes/java/main/FunAndElse/PlayerStats.class b/build/classes/java/main/FunAndElse/PlayerStats.class new file mode 100644 index 0000000000000000000000000000000000000000..b53e470654bdead5c33d04f4085f717ca7b11b51 Binary files /dev/null and b/build/classes/java/main/FunAndElse/PlayerStats.class differ diff --git a/build/classes/java/main/FunAndElse/StatsAll.class b/build/classes/java/main/FunAndElse/StatsAll.class deleted file mode 100644 index b3816caadb86cb7f7b967c8ff794c48625347ae5..0000000000000000000000000000000000000000 Binary files a/build/classes/java/main/FunAndElse/StatsAll.class and /dev/null differ diff --git a/build/classes/java/main/org/fsi/pixelcampusessentials/Pixelcampusessentials.class b/build/classes/java/main/org/fsi/pixelcampusessentials/Pixelcampusessentials.class index b5441af94487f0b25d328ab25a045cacce2b8764..fa9e1e3ab060a63dd536093797590e69970a5a9e 100644 Binary files a/build/classes/java/main/org/fsi/pixelcampusessentials/Pixelcampusessentials.class and b/build/classes/java/main/org/fsi/pixelcampusessentials/Pixelcampusessentials.class differ diff --git a/build/libs/pixelcampusessentials-1.0.jar b/build/libs/pixelcampusessentials-1.0.jar index bfc0e9b8361c9014f872f80e1091d4f23c0e532c..545017ff6d400d07b278e35a8e26221ef149db1d 100644 Binary files a/build/libs/pixelcampusessentials-1.0.jar and b/build/libs/pixelcampusessentials-1.0.jar differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/Pixelcampusessentials.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/Pixelcampusessentials.class.uniqueId1 index b5441af94487f0b25d328ab25a045cacce2b8764..fa9e1e3ab060a63dd536093797590e69970a5a9e 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/Pixelcampusessentials.class.uniqueId1 and b/build/tmp/compileJava/compileTransaction/stash-dir/Pixelcampusessentials.class.uniqueId1 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/PlayerStats.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/PlayerStats.class.uniqueId0 new file mode 100644 index 0000000000000000000000000000000000000000..2ec78d5b114a58172c042c4b2ee9cf3b17fd9c1d Binary files /dev/null and b/build/tmp/compileJava/compileTransaction/stash-dir/PlayerStats.class.uniqueId0 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/SpeedLadder.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/SpeedLadder.class.uniqueId0 deleted file mode 100644 index 767c8b14086aa9dbe2bf7912f9cdf0df803e5f83..0000000000000000000000000000000000000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/SpeedLadder.class.uniqueId0 and /dev/null differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index 7563eb17471fc07aacee8d8decb15fab5711e680..4dca37ab453f215867a8943796362c33b625bbf6 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/src/main/java/FunAndElse/HubCommand.java b/src/main/java/FunAndElse/HubCommand.java index 04a141de3c8524f17a3b17fc0aca4002b0be252a..c8314a1204e5621e97d9762776f41268a7fe215a 100644 --- a/src/main/java/FunAndElse/HubCommand.java +++ b/src/main/java/FunAndElse/HubCommand.java @@ -4,19 +4,14 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import org.fsi.pixelcampusessentials.Pixelcampusessentials; import org.jetbrains.annotations.NotNull; public class HubCommand implements CommandExecutor { @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if(sender instanceof Player){ - try { - ((Player) sender).performCommand("server " + Pixelcampusessentials.getPlugin().getConfig().getString("proxy-hub-name")); - }catch (Exception e){ - ((Player) sender).performCommand("server lobby"); - } + if(sender instanceof Player p){ + sender.sendMessage("use /server lobby for now"); } return true; diff --git a/src/main/java/FunAndElse/StatsAll.java b/src/main/java/FunAndElse/PlayerStats.java similarity index 79% rename from src/main/java/FunAndElse/StatsAll.java rename to src/main/java/FunAndElse/PlayerStats.java index 0669f31e4d8761e9509526c7466b8582a8fcb93e..40cec6a4fc2787b865cf3cbe8bcb7a5d2603c7d5 100644 --- a/src/main/java/FunAndElse/StatsAll.java +++ b/src/main/java/FunAndElse/PlayerStats.java @@ -7,15 +7,11 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -public class StatsAll implements CommandExecutor { +public class PlayerStats implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - /* - if(!sender.isOp()){ - sender.sendMessage("§cNoch nicht verfügbar"); - return false; - }*/ + if(label.equalsIgnoreCase("statsall"))sender.sendMessage(ChatColor.GRAY + "please wait.."); String playerNameColor = ChatColor.GRAY.toString() + ChatColor.BOLD.toString(); //§7§l StringBuilder toSend = new StringBuilder(); @@ -23,6 +19,8 @@ public class StatsAll implements CommandExecutor { sender.sendMessage("");//new line for(OfflinePlayer p2 : sender.getServer().getOfflinePlayers()){ + if(!p2.isOnline() && label.equalsIgnoreCase("stats"))continue; //doesnt display offline players if "only" stats is typed + String rawName = ""; String name = ""; @@ -31,8 +29,8 @@ public class StatsAll implements CommandExecutor { rawName = p2.getName(); name = playerNameColor + rawName; - if(p2.isOnline())name = ChatColor.GREEN + "(Online) " + name; //§a - else name = ChatColor.RED + "(Offline) " + name; //§4 + if(p2.isOnline())name = ChatColor.GREEN + "⬤ " + name; //§a + else name = ChatColor.RED + "⬤ " + name; //§4 //name += getSpaces(18 - rawName.length()); @@ -74,11 +72,9 @@ public class StatsAll implements CommandExecutor { sec %= 60; //§r §3| §c - return "'s Playtime: "+numberColor+hrs+textColor+"h "+numberColor+min+textColor+"min "+numberColor+sec+textColor+"sek \n"+ - ChatColor.RED+deaths+textColor+" death"+(deaths!=1?"s":"") + - ChatColor.DARK_AQUA+" | " + - ChatColor.RED+timeSinceDeath/72000+textColor+"h "+ChatColor.RED+(timeSinceDeath/1200) % 1200 +textColor +"m since last death" + - ChatColor.DARK_AQUA+" | " + + return ": "+numberColor+hrs+textColor+"h "+numberColor+min+textColor+"min "+numberColor+sec+textColor+"sek Playtime, "+ + ChatColor.RED+deaths+textColor+" Death"+(deaths!=1?"s":"") + ",\n" + + ChatColor.RED+timeSinceDeath/72000+textColor+"h "+ChatColor.RED+((timeSinceDeath/1200) % 60) +textColor +"m Playime after last Death, " + ChatColor.RED+((float)distance)/1000.0+textColor+"km Traveled total"; } diff --git a/src/main/java/org/fsi/pixelcampusessentials/Pixelcampusessentials.java b/src/main/java/org/fsi/pixelcampusessentials/Pixelcampusessentials.java index bd153009eeda8579dfffdbf3e9373e1860963476..a69a141688ffe8d17d4531588bb21f76b7a47dff 100644 --- a/src/main/java/org/fsi/pixelcampusessentials/Pixelcampusessentials.java +++ b/src/main/java/org/fsi/pixelcampusessentials/Pixelcampusessentials.java @@ -27,7 +27,7 @@ public final class Pixelcampusessentials extends JavaPlugin { getCommand("plot").setExecutor(new Plots()); getCommand("plot").setTabCompleter(new PlotsTabComplete()); getCommand("freeze").setExecutor(new FreezePlayer()); - getCommand("statsall").setExecutor(new StatsAll()); + getCommand("statsall").setExecutor(new PlayerStats()); getCommand("fullbright").setExecutor(new Fullbright()); getCommand("lobby").setExecutor(new HubCommand()); }catch (Exception e){