Bump to 1.0.6

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'fr.efreicraft'
-version = '1.0.5'
+version = '1.0.6'
 
 compileJava.options.encoding "UTF-8"
 

src/main/java/fr/efreicraft/ecatup/Main.java

@@ -3,12 +3,11 @@
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 import fr.efreicraft.ecatup.commands.*;
-import fr.efreicraft.ecatup.listeners.*;
-import fr.efreicraft.ecatup.utils.DiscordWebhook;
 import fr.efreicraft.ecatup.listeners.Chat;
 import fr.efreicraft.ecatup.listeners.Join;
 import fr.efreicraft.ecatup.listeners.LuckPermsListener;
 import fr.efreicraft.ecatup.listeners.Quit;
+import fr.efreicraft.ecatup.utils.DiscordWebhook;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.luckperms.api.LuckPerms;
@@ -28,7 +27,6 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -150,6 +148,13 @@ public static List<String> getPlayersForTabList(String[] args, int argPos) {
     }
 
     public static void sendPlayerToServer(Player player, String server) {
+        if (!player.hasPermission("server." + server.toLowerCase())) {
+            Component nope = Component.text("Vous ne pouvez pas aller sur ce serveur !").color(NamedTextColor.RED);
+            player.sendMessage(nope);
+            INSTANCE.getLogger().info(player.getName() + " tried to join " + server + " but doesn't have permission to do so.");
+            return;
+        }
+
         ByteArrayDataOutput out = ByteStreams.newDataOutput();
         out.writeUTF("Connect");
         out.writeUTF(server);
@@ -175,7 +180,7 @@ public static void sendGlobalChat(String msg, @Nullable Player player) {
                     (player == null ? "a player's" : (player.getName() + "'s")) +
                     " global message: " + msg);
             if (player != null) {
-                Component failed = Component.text("Votre dernier message n'a pas été envoyé aux autres serveur.").color(NamedTextColor.DARK_RED);
+                Component failed = Component.text("Votre dernier message n'a pas été envoyé aux autres serveurs.").color(NamedTextColor.DARK_RED);
                 player.sendMessage(failed);
             }
         }

src/main/java/fr/efreicraft/ecatup/commands/Chat.java

@@ -1,6 +1,5 @@
 package fr.efreicraft.ecatup.commands;
 
-import com.google.common.collect.Lists;
 import fr.efreicraft.ecatup.Main;
 import fr.efreicraft.ecatup.PreferenceCache;
 import org.bukkit.Bukkit;

src/main/java/fr/efreicraft/ecatup/commands/Skull.java

@@ -14,10 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class Skull implements CommandExecutor, TabExecutor {
     @Override

src/main/java/fr/efreicraft/ecatup/commands/Slap.java

@@ -13,10 +13,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static fr.efreicraft.ecatup.utils.Msg.colorize;
 

src/main/java/fr/efreicraft/ecatup/commands/WhoIs.java

@@ -9,7 +9,6 @@
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
 import net.luckperms.api.LuckPerms;
-import net.luckperms.api.model.group.Group;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
@@ -18,10 +17,6 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-
 import static fr.efreicraft.ecatup.utils.Msg.colorize;
 
 public class WhoIs implements CommandExecutor {

src/main/java/fr/efreicraft/ecatup/listeners/Join.java

@@ -1,8 +1,8 @@
 package fr.efreicraft.ecatup.listeners;
 
 import fr.efreicraft.ecatup.Main;
-import fr.efreicraft.ecatup.utils.DiscordWebhook;
 import fr.efreicraft.ecatup.PreferenceCache;
+import fr.efreicraft.ecatup.utils.DiscordWebhook;
 import net.kyori.adventure.text.Component;
 import net.luckperms.api.LuckPerms;
 import net.luckperms.api.node.Node;

src/main/java/fr/efreicraft/ecatup/listeners/Quit.java

@@ -1,8 +1,8 @@
 package fr.efreicraft.ecatup.listeners;
 
 import fr.efreicraft.ecatup.Main;
-import fr.efreicraft.ecatup.utils.DiscordWebhook;
 import fr.efreicraft.ecatup.PreferenceCache;
+import fr.efreicraft.ecatup.utils.DiscordWebhook;
 import net.kyori.adventure.text.Component;
 import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;

src/main/java/fr/efreicraft/ecatup/utils/DiscordWebhook.java

@@ -1,16 +1,13 @@
 package fr.efreicraft.ecatup.utils;
 
 import javax.net.ssl.HttpsURLConnection;
-import java.awt.Color;
+import java.awt.*;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Array;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Class used to execute Discord Webhooks with low effort