refactor: minor tweak and set furniture customName to prevent geary r…

…emoval
MineInAbyss · Feb 7, 2024 · 035c5a7 · 035c5a7
1 parent 9c95fd7
commit 035c5a7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 group=com.mineinabyss
 version=0.9
-idofrontVersion=0.21.11
+idofrontVersion=0.21.12
diff --git a/src/main/kotlin/com/mineinabyss/blocky/helpers/FurnitureHelpers.kt b/src/main/kotlin/com/mineinabyss/blocky/helpers/FurnitureHelpers.kt
@@ -98,7 +98,7 @@ object FurnitureHelpers {
     }
 
     //TODO Fix seat breaking below 0.0 offset and remove max() check here
-    fun spawnFurnitureSeat(furniture: ItemDisplay, yaw: Float, height: Double = 0.0, location: Location) =
+    fun spawnFurnitureSeat(furniture: ItemDisplay, location: Location, yaw: Float, height: Double = 0.0) =
         location.toBlockCenterLocation().apply { y += max(0.0, height) }.spawn<ArmorStand> {
             isVisible = false
             isMarker = true

diff --git a/src/main/kotlin/com/mineinabyss/blocky/systems/AttemptSpawnFurnitureSystem.kt b/src/main/kotlin/com/mineinabyss/blocky/systems/AttemptSpawnFurnitureSystem.kt
@@ -8,6 +8,7 @@ import com.mineinabyss.geary.systems.GearyListener
 import com.mineinabyss.geary.systems.accessors.Pointers
 import com.mineinabyss.idofront.spawning.spawn
 import com.mineinabyss.idofront.typealiases.BukkitEntity
+import net.kyori.adventure.text.Component
 import org.bukkit.entity.ItemDisplay
 
 class AttemptSpawnFurnitureSystem : GearyListener() {
@@ -41,6 +42,7 @@ class AttemptSpawnFurnitureSystem : GearyListener() {
 
             color?.let { target.entity.setPersisting<BlockyFurniture.Color>(it) }
             target.entity.set<BukkitEntity>(this)
+            customName(Component.empty())
         } ?: return
     }
 }
diff --git a/src/main/kotlin/com/mineinabyss/blocky/systems/actions/SetSeatOnFurnitureSystem.kt b/src/main/kotlin/com/mineinabyss/blocky/systems/actions/SetSeatOnFurnitureSystem.kt
@@ -20,8 +20,8 @@ class SetSeatOnFurnitureSystem : GearyListener() {
         Bukkit.getScheduler().scheduleSyncDelayedTask(blocky.plugin, {
             if (furniture.collisionHitbox.isNotEmpty()) {
                 FurnitureHelpers.collisionHitboxLocations(yaw, display.location, furniture.collisionHitbox)
-                    .forEach { loc -> FurnitureHelpers.spawnFurnitureSeat(display, yaw - 180, seat.heightOffset, loc) }
-            } else FurnitureHelpers.spawnFurnitureSeat(display, yaw, seat.heightOffset, display.location)
+                    .forEach { loc -> FurnitureHelpers.spawnFurnitureSeat(display, loc, yaw - 180, seat.heightOffset) }
+            } else FurnitureHelpers.spawnFurnitureSeat(display, display.location, yaw, seat.heightOffset)
         }, 1L)
     }
 }