From 99f7610d3d301b17cf6851771501d7cb7232d650 Mon Sep 17 00:00:00 2001
From: D4rkr34lm <darth.m.frohn@gmail.com>
Date: Fri, 12 Jun 2026 19:48:16 +0200
Subject: [PATCH] .

---
 BauSystem/BauSystem_Main/build.gradle.kts                       | 2 +-
 .../de/steamwar/bausystem/features/cannonCore/CannonCoreWand.kt | 2 +-
 BauSystem/build.gradle.kts                                      | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/BauSystem/BauSystem_Main/build.gradle.kts b/BauSystem/BauSystem_Main/build.gradle.kts
index a32389fb..116c598c 100644
--- a/BauSystem/BauSystem_Main/build.gradle.kts
+++ b/BauSystem/BauSystem_Main/build.gradle.kts
@@ -18,8 +18,8 @@
  */
 
 plugins {
-    widener
     steamwar.kotlin
+    widener
 }
 
 tasks.compileJava {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannonCore/CannonCoreWand.kt b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannonCore/CannonCoreWand.kt
index fcea285e..b92c16f7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannonCore/CannonCoreWand.kt
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannonCore/CannonCoreWand.kt
@@ -52,7 +52,7 @@ object CannonCoreWand: Listener {
     fun onPlayerEquip(event: PlayerItemHeldEvent) {
         val player = event.player
         val swPlayer = SWPlayer.of(event.player)
-        val item = swPlayer.inventory.itemInMainHand
+        val item = player.inventory.getItem(event.newSlot) ?: return
 
         if(!isWandItem(item)) {
             swPlayer.removeComponent(EmptyCannonCoreWandDisplay::class.java)
diff --git a/BauSystem/build.gradle.kts b/BauSystem/build.gradle.kts
index de9fe1b8..1820833c 100644
--- a/BauSystem/build.gradle.kts
+++ b/BauSystem/build.gradle.kts
@@ -38,4 +38,5 @@ tasks.register<DevServer>("DevBau21") {
     dependsOn(":BauSystem:shadowJar")
     dependsOn(":SchematicSystem:shadowJar")
     template = "Bau21"
+    debug = true
 }