fixed error

SIGMA-L · Mar 31, 2022 · 76178df · 76178df
1 parent 86d4fbf
commit 76178df
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/PlayerRoleChecker.java b/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/PlayerRoleChecker.java
@@ -15,13 +15,13 @@ public void onEnable() {
         saveDefaultConfig();
         SQL.init();
         JDA.init();
-        getServer().getPluginManager().registerEvents(new JoinEvent(),this);
+        getServer().getPluginManager().registerEvents(new JoinEvent(), this);
 
     }
 
     @Override
     public void onDisable() {
-        if(JDA.INSTANCE != null) JDA.INSTANCE.shutdown();
+        if (JDA.INSTANCE != null) JDA.INSTANCE.shutdown();
         // Plugin shutdown logic
     }
-}
+}
diff --git a/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/event/JoinEvent.java b/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/event/JoinEvent.java
@@ -20,7 +20,7 @@ public void onAsyncPlayerPreLoginEvent(AsyncPlayerPreLoginEvent e) {
         } else {
             final int code = CodeUtil.CodeIssue(e.getUniqueId());
 
-            String already = String.join("\n", PlayerRoleChecker.INSTANCE.getConfig().getStringList("JoinEvent.already-code"));
+            String already = String.join("\n", PlayerRoleChecker.INSTANCE.getConfig().getStringList("JoinEvent.code"));
 
             e.disallow(AsyncPlayerPreLoginEvent.Result.KICK_WHITELIST, ChatColor.translateAlternateColorCodes('&', already.replaceAll("%code%", String.valueOf(code))));
 

diff --git a/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/jda/event/RemoveCommand.java b/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/jda/event/RemoveCommand.java
@@ -39,6 +39,8 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
                                     UUID resultUUID = removeEvent.getUUID();
                                     Member resultMember = removeEvent.getMember();
 
+                                    event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("JoinCommand.success-register", event.getMessage().getTimeCreated(), String.valueOf(resultUUID), resultMember.getId()).build()).queue();
+
                                     SQLUtil.removeSQL(resultUUID, resultMember.getId());
 
                                     if (member != null) DiscordUtil.removeRole(event.getGuild(), resultMember);

diff --git a/PlayerRoleCheckerAPI/src/main/java/net/klnetwork/playerrolechecker/api/ForceJoinEvent.java b/PlayerRoleCheckerAPI/src/main/java/net/klnetwork/playerrolechecker/api/ForceJoinEvent.java
@@ -18,6 +18,8 @@ public class ForceJoinEvent extends Event implements Cancellable {
     private boolean isCancelled;
 
     public ForceJoinEvent(String memberId, UUID uuid, Member executor) {
+        super(true);
+
         this.memberId = memberId;
         this.uuid = uuid;
         this.executor = executor;

diff --git a/PlayerRoleCheckerAPI/src/main/java/net/klnetwork/playerrolechecker/api/JoinEvent.java b/PlayerRoleCheckerAPI/src/main/java/net/klnetwork/playerrolechecker/api/JoinEvent.java
@@ -17,7 +17,10 @@ public class JoinEvent extends Event implements Cancellable {
     private static final HandlerList HANDLER_LIST = new HandlerList();
     private boolean isCancelled;
 
+
     public JoinEvent(Member member, UUID uuid, int code) {
+        super(true);
+
         this.member = member;
         this.uuid = uuid;
         this.code = code;

diff --git a/PlayerRoleCheckerAPI/src/main/java/net/klnetwork/playerrolechecker/api/RemoveEvent.java b/PlayerRoleCheckerAPI/src/main/java/net/klnetwork/playerrolechecker/api/RemoveEvent.java
@@ -17,6 +17,8 @@ public class RemoveEvent extends Event implements Cancellable {
     private boolean isCancelled;
 
     public RemoveEvent(Member member, UUID uuid, Member executor) {
+        super(true);
+
         this.member = member;
         this.uuid = uuid;
         this.executor = executor;

diff --git a/PlayerRoleCheckerConnector/src/main/resources/plugin.yml b/PlayerRoleCheckerConnector/src/main/resources/plugin.yml
@@ -9,11 +9,6 @@ commands:
     aliases:
       - jm
     description: JoinModeCommand!
-  sqldebug:
-    permission: playerrolechecker.sqldebug
-    aliases:
-      - sqld
-    description: SQLDebugCommand!
   addbypass:
     permission: playerrolechecker.addbypass
   removebypass: