touch up join process

Iru21 · Jun 11, 2023 · dba77cd · dba77cd
1 parent 3272136
commit dba77cd
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 27 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -74,7 +74,7 @@ dependencies {
     compileOnly("org.apache.logging.log4j:log4j-api:2.20.0")
     compileOnly("org.apache.logging.log4j:log4j-core:2.20.0")
 
-    runtimeOnly("mysql:mysql-connector-java:8.0.32")
+    runtimeOnly("mysql:mysql-connector-java:8.0.33")
 
     implementation("org.spigotmc:spigot-api:${minecraftVersion}-R0.1-SNAPSHOT")
     implementation("org.bstats:bstats-bukkit:3.0.2")

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 kotlin.code.style = official
 minecraftVersion = 1.17
 pluginName = Authy
-pluginVersion = 3.2.6
+pluginVersion = 3.2.7
diff --git a/src/main/kotlin/me/iru/events/BlockEvents.kt b/src/main/kotlin/me/iru/events/BlockEvents.kt
@@ -19,7 +19,7 @@ import org.bukkit.event.player.*
 class BlockEvents : Listener {
     val loginProcess = Authy.loginProcess
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.HIGHEST)
     fun onMove(e : PlayerMoveEvent) {
         if(loginProcess.contains(e.player)) {
             val from = e.from
@@ -34,42 +34,42 @@ class BlockEvents : Listener {
         }
     }
 
-    @EventHandler(ignoreCancelled = true)
+    @EventHandler
     fun onBlockBreak(e : BlockBreakEvent) {
         if (loginProcess.contains(e.player)) {
             e.isCancelled = true
         }
     }
 
-    @EventHandler(ignoreCancelled = true)
+    @EventHandler
     fun onBlockPlace(e : BlockPlaceEvent) {
         if(loginProcess.contains(e.player)) {
             e.isCancelled = true
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onItemConsume(e : PlayerItemConsumeEvent) {
         if(loginProcess.contains(e.player)) {
             e.isCancelled = true
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onItemDrop(e : PlayerDropItemEvent) {
         if(loginProcess.contains(e.player)) {
             e.isCancelled = true
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onItemHeld(e : PlayerItemHeldEvent) {
         if(loginProcess.contains(e.player)) {
             e.isCancelled = true
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onItemPickup(e : EntityPickupItemEvent) {
         if(e.entity is Player) {
             if (loginProcess.contains((e.entity as Player).player as Player)) {
@@ -78,28 +78,28 @@ class BlockEvents : Listener {
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onUse(e : PlayerInteractEvent) {
         if(loginProcess.contains(e.player)) {
             e.isCancelled = true
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onEntityUse(e : PlayerInteractAtEntityEvent) {
         if(loginProcess.contains(e.player)) {
             e.isCancelled = true
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onEntityUse2(e : PlayerInteractEntityEvent) {
         if(loginProcess.contains(e.player)) {
             e.isCancelled = true
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onDamageTaken(e : EntityDamageEvent) {
         if(e.entity is Player) {
             if (loginProcess.contains((e.entity as Player).player as Player)) {
@@ -108,7 +108,7 @@ class BlockEvents : Listener {
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onFoodLevelChange(e : FoodLevelChangeEvent) {
         if(e.entity is Player) {
             if (loginProcess.contains((e.entity as Player).player as Player)) {
@@ -117,7 +117,7 @@ class BlockEvents : Listener {
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onAttack(e : EntityDamageByEntityEvent) {
         if(e.damager is Player) {
             if (loginProcess.contains(e.damager as Player)) {
@@ -126,7 +126,7 @@ class BlockEvents : Listener {
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onAnyCommand(e : PlayerCommandPreprocessEvent) {
         val allowedCommands = mutableListOf("/l", "/login", "/reg", "/register")
         if(loginProcess.contains(e.player)) {
@@ -137,15 +137,15 @@ class BlockEvents : Listener {
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onChat(e : AsyncPlayerChatEvent)  {
         if(loginProcess.contains(e.player)) {
             e.isCancelled = true
             loginProcess.sendPleaseAuthMessage(e.player)
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onInventoryInteract(e : InventoryInteractEvent) {
         val p = e.whoClicked as Player
         if(loginProcess.contains(p)) {
@@ -155,35 +155,35 @@ class BlockEvents : Listener {
     }
 
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onShear(e : PlayerShearEntityEvent) {
         if(loginProcess.contains(e.player)) {
             e.isCancelled = true
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onFish(e : PlayerFishEvent) {
         if(loginProcess.contains(e.player)) {
             e.isCancelled = true
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onBedEnter(e : PlayerBedEnterEvent) {
         if(loginProcess.contains(e.player)) {
             e.isCancelled = true
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onEditBook(e : PlayerEditBookEvent) {
         if(loginProcess.contains(e.player)) {
             e.isCancelled = true
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onSignChange(e : SignChangeEvent) {
         if(loginProcess.contains(e.player)) {
             e.isCancelled = true

diff --git a/src/main/kotlin/me/iru/events/LoginEvents.kt b/src/main/kotlin/me/iru/events/LoginEvents.kt
@@ -23,7 +23,7 @@ class LoginEvents : Listener {
         DuplicateProtection.check(e)
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     fun onQuit(e : PlayerQuitEvent) {
         if (loginProcess.contains(e.player)) {
             loginProcess.removePlayer(e.player)

diff --git a/src/main/kotlin/me/iru/process/JoinProcess.kt b/src/main/kotlin/me/iru/process/JoinProcess.kt
@@ -20,7 +20,10 @@ class JoinProcess(private val player: Player) {
     private val session = Authy.session
 
     fun run() {
-        if(!hasValidName(player.name) && authy.config.getBoolean("nameValidation")) player.kickPlayer(translations.get("invalid_username"))
+        if(!hasValidName(player.name) && authy.config.getBoolean("nameValidation")) {
+            player.kickPlayer(translations.get("invalid_username"))
+            return
+        }
 
         Migration.updatePlayer(player)
 
@@ -31,8 +34,6 @@ class JoinProcess(private val player: Player) {
         joinTeleports()
         teleportToValidPlace()
 
-        // Place premium check here
-
         loginProcess.addPlayer(player)
 
         if(authy.config.getBoolean("effects.blindness")) {