Update sinking implementation

APDevTeam · Aug 26, 2024 · f133511 · f133511
1 parent e19371b
commit f133511
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/Movecraft/src/main/java/net/countercraft/movecraft/craft/CraftManager.java b/Movecraft/src/main/java/net/countercraft/movecraft/craft/CraftManager.java
@@ -21,6 +21,8 @@
 import net.countercraft.movecraft.MovecraftLocation;
 import net.countercraft.movecraft.craft.controller.PilotController;
 import net.countercraft.movecraft.craft.controller.PlayerController;
+import net.countercraft.movecraft.craft.controller.SinkingController;
+import net.countercraft.movecraft.craft.controller.SinkingControllerImpl;
 import net.countercraft.movecraft.craft.type.CraftType;
 import net.countercraft.movecraft.events.CraftReleaseEvent;
 import net.countercraft.movecraft.events.CraftSinkEvent;
@@ -200,11 +202,10 @@ public void sink(@NotNull Craft craft) {
         if (event.isCancelled())
             return;
 
-        crafts.remove(craft);
         if (craft.getDataTag(Craft.CONTROLLER) instanceof PlayerController playerController)
             playerCrafts.remove(playerController.getPilot());
 
-        crafts.add(new SinkingCraftImpl(craft));
+        craft.setDataTag(Craft.CONTROLLER, new SinkingControllerImpl());
     }
 
     public void release(@NotNull Craft craft, @NotNull CraftReleaseEvent.Reason reason, boolean force) {

diff --git a/Movecraft/src/main/java/net/countercraft/movecraft/craft/SinkingCraftImpl.java b/Movecraft/src/main/java/net/countercraft/movecraft/craft/SinkingCraftImpl.java
diff --git a/...raft/src/main/java/net/countercraft/movecraft/craft/controller/SinkingControllerImpl.java b/...raft/src/main/java/net/countercraft/movecraft/craft/controller/SinkingControllerImpl.java
@@ -0,0 +1,4 @@
+package net.countercraft.movecraft.craft.controller;
+
+public class SinkingControllerImpl implements SinkingController {
+}
diff --git a/api/src/main/java/net/countercraft/movecraft/craft/controller/SinkingController.java b/api/src/main/java/net/countercraft/movecraft/craft/controller/SinkingController.java
@@ -1,4 +1,4 @@
 package net.countercraft.movecraft.craft.controller;
 
-public interface SinkingController {
+public interface SinkingController extends Controller {
 }