bump ido

MineInAbyss · Nov 25, 2022 · 4975d2a · 4975d2a
1 parent b0e9904
commit 4975d2a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=com.mineinabyss
 version=1.7
-kotlinVersion=1.7.10
+kotlinVersion=1.7.20
 serverVersion=1.19.2-R0.1-SNAPSHOT
-idofrontVersion=0.14.7
+idofrontVersion=0.15.3
diff --git a/src/main/kotlin/com/mineinabyss/bonfire/extensions/Campfire.kt b/src/main/kotlin/com/mineinabyss/bonfire/extensions/Campfire.kt
@@ -25,6 +25,8 @@ import org.bukkit.block.Campfire
 import org.bukkit.entity.ArmorStand
 import org.bukkit.entity.EntityType
 import org.jetbrains.exposed.sql.*
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.neq
 import org.jetbrains.exposed.sql.transactions.transaction
 import java.time.LocalDateTime
 import java.util.*
@@ -96,7 +98,7 @@ fun Campfire.updateDisplay() {
                 Bukkit.getEntity(dupe[Bonfire.entityUUID])?.remove()
             }
 
-            Bonfire.deleteWhere { (Bonfire.location eq model.location) and (Bonfire.entityUUID neq this@updateDisplay.uuid) }
+            Bonfire.deleteWhere { (Bonfire.location eq model.location) and (entityUUID neq this@updateDisplay.uuid) }
         }
     }
 }
@@ -203,7 +205,7 @@ fun Campfire.destroy(destroyBlock: Boolean) {
                     }
                 }
             }
-        Bonfire.deleteWhere { Bonfire.entityUUID eq this@destroy.uuid }
+        Bonfire.deleteWhere { entityUUID eq this@destroy.uuid }
         Players.deleteWhere { Players.bonfireUUID eq this@destroy.uuid }
     }
 

diff --git a/src/main/kotlin/com/mineinabyss/bonfire/extensions/Player.kt b/src/main/kotlin/com/mineinabyss/bonfire/extensions/Player.kt
@@ -12,6 +12,7 @@ import com.mineinabyss.idofront.messaging.success
 import org.bukkit.OfflinePlayer
 import org.bukkit.block.Campfire
 import org.jetbrains.exposed.sql.*
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.transactions.transaction
 import java.time.Duration
 import java.time.LocalDateTime

diff --git a/src/main/kotlin/com/mineinabyss/bonfire/listeners/PlayerListener.kt b/src/main/kotlin/com/mineinabyss/bonfire/listeners/PlayerListener.kt
@@ -38,6 +38,7 @@ import org.bukkit.event.player.*
 import org.bukkit.inventory.CampfireRecipe
 import org.bukkit.inventory.EquipmentSlot
 import org.bukkit.inventory.ItemStack
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.deleteWhere
 import org.jetbrains.exposed.sql.innerJoin
 import org.jetbrains.exposed.sql.select
@@ -164,8 +165,8 @@ object PlayerListener : Listener {
 
                 player.error("Bonfire not found")
                 BonfireLogger.logRespawnFailed(player, respawnBonfire[Bonfire.location])
-                Players.deleteWhere { Players.playerUUID eq player.uniqueId }
-                Bonfire.deleteWhere { Bonfire.entityUUID eq respawnBonfire[Bonfire.entityUUID] }
+                Players.deleteWhere { playerUUID eq player.uniqueId }
+                Bonfire.deleteWhere { entityUUID eq respawnBonfire[entityUUID] }
             }
             respawnLocation = player.server.worlds.first().spawnLocation
             BonfireLogger.logRespawnAtWorldSpawn(player)