From 6f1403df9c80afa142b7d7dbec900f384c2d702c Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 5 Sep 2026 14:52:59 +0200
Subject: [PATCH] Cleanup SWPlayer

---
 .../bausystem/features/observer/ObserverTracerListener.java | 2 +-
 .../de/steamwar/bausystem/features/util/NoClipCommand.java  | 2 +-
 .../SpigotCore_Main/src/de/steamwar/core/SWPlayer.java      | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerListener.java
index 987b2a23..d823bff4 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerListener.java
@@ -46,7 +46,7 @@ public class ObserverTracerListener implements Listener {
     public ObserverTracerListener() {
         Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
             SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
-                if (pair.getPlayer().getGameMode() != GameMode.SPECTATOR) return;
+                if (pair.getSwPlayer().getPlayer().getGameMode() != GameMode.SPECTATOR) return;
                 pair.getComponent().show();
             });
         }, 15L, 15L);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java
index dd143f0a..d0a7ef71 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java
@@ -53,7 +53,7 @@ public class NoClipCommand extends SWCommand implements Listener {
 
         @Override
         public void onUnmount(SWPlayer player) {
-            player.setGameMode(GameMode.CREATIVE);
+            player.getPlayer().setGameMode(GameMode.CREATIVE);
         }
     }
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/SWPlayer.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/SWPlayer.java
index 692c2031..f5cbffe4 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/SWPlayer.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/SWPlayer.java
@@ -21,8 +21,8 @@ package de.steamwar.core;
 
 import de.steamwar.message.Message;
 import lombok.Data;
+import lombok.Getter;
 import lombok.NonNull;
-import lombok.experimental.Delegate;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.Bukkit;
@@ -99,11 +99,11 @@ public class SWPlayer {
 
     @Data
     public static final class SWPlayerWithComponent<T extends Component> {
-        private final SWPlayer player;
+        private final SWPlayer swPlayer;
         private final T component;
     }
 
-    @Delegate
+    @Getter
     private final Player player;
     private final Map<Class<? extends Component>, Component> components = new HashMap<>();