From a379a163693dc8d1bbd39ce7540f97d884f8e516 Mon Sep 17 00:00:00 2001
From: kento2 <kento+pub@placeq.com>
Date: Fri, 17 Apr 2026 21:40:51 +0200
Subject: [PATCH] .

---
 .../kentoj/scrow/bukkit/CoreImplPlugin.java   | 28 ++++++-------------
 .../friends/command/FriendRemoveLiteral.java  |  8 ++++--
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java
index 023cbee..736ca52 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java
@@ -13,17 +13,19 @@ import java.util.UUID;
 
 public class CoreImplPlugin extends JavaPlugin {
 
+    public static boolean ENABLE_DATABASE = true;
+
     @Override
     public void onEnable() {
-        ScrowAPISurface.initScrowAPI(this, true);
-
-        assert ScrowAPI.getDatabase() != null;
-        var friendshipDAO = new MongoFriendshipDAO(ScrowAPI.getDatabase());
-        var friendRequestsDAO = new MongoFriendRequestDAO(ScrowAPI.getDatabase());
+        ScrowAPISurface.initScrowAPI(this, ENABLE_DATABASE);
 
         {
+            if (ENABLE_DATABASE) {
+                var friendshipDAO = new MongoFriendshipDAO(ScrowAPI.getDatabase());
+                var friendRequestsDAO = new MongoFriendRequestDAO(ScrowAPI.getDatabase());
+                ScrowAPI.getCommandManager().register(new FriendCommand(friendshipDAO, friendRequestsDAO).getRootNode());
+            }
             ScrowAPI.getCommandManager().register(new CoinsCommand().getRootNode());
-            ScrowAPI.getCommandManager().register(new FriendCommand(friendshipDAO, friendRequestsDAO).getRootNode());
         }
 
         {
@@ -41,20 +43,6 @@ public class CoreImplPlugin extends JavaPlugin {
                     .doOnNext(a -> System.out.println("coins: " + a))
                     .block();
         }
-
-        {
-            friendRequestsDAO.saveFriendRequest(new FriendRequestImpl(
-                    UUID.fromString("7fca8ec5-c855-4547-aed9-21a20b31617c") /* logan */,
-                    UUID.fromString("3218c49a-b80d-49ae-a42e-4496141eb2b1") /* kento2 */,
-                    Instant.now()
-            )).block();
-
-            friendRequestsDAO.saveFriendRequest(new FriendRequestImpl(
-                    UUID.fromString("3218c49a-b80d-49ae-a42e-4496141eb2b1") /* kento2 */,
-                    UUID.fromString("3218c49a-b80d-49ae-a42e-4496141eb2b1") /* kento2 */,
-                    Instant.now()
-            ));
-        }
     }
 
     @Override
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRemoveLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRemoveLiteral.java
index 4faab53..df79e9b 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRemoveLiteral.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRemoveLiteral.java
@@ -28,9 +28,13 @@ public class FriendRemoveLiteral {
     private void removeFriend(BukkitCommandContext ctx) {
         var friend = ctx.getArg(playerArg);
 
-        friendshipDAO.getFriendship(friend.getUniqueId(), ctx.getPlayerSender().getUniqueId())
+        friendshipDAO.deleteFriendship(friend.getUniqueId(), ctx.getPlayerSender().getUniqueId())
                 .map(wasDeleted -> {
-                    ctx.getSender().sendMessage("[friend] You are no longer friends with " + friend.getName());
+                    ctx.getSender().sendMessage(
+                            wasDeleted
+                                    ? "[friend] You are no longer friends with " + friend.getName()
+                                    : "[friend] Failed. You are not friends with " + friend.getName()
+                    );
                     return Mono.empty();
                 })
                 .subscribe();