From 6afb451be1e2a6ca71a9a8cfc9c91d0e5d3ae59f Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Thu, 16 Sep 2021 17:59:37 +0200
Subject: [PATCH] Don't return null for suggest

---
 .../minecraft/commands/subcommands/Sync.java               | 3 ++-
 .../minecraft/commands/subcommands/Unlink.java             | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/Sync.java b/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/Sync.java
index 6e57716..d8c18fa 100644
--- a/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/Sync.java
+++ b/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/Sync.java
@@ -3,6 +3,7 @@ package com.alttd.proxydiscordlink.minecraft.commands.subcommands;
 import com.alttd.proxydiscordlink.minecraft.commands.SubCommand;
 import com.velocitypowered.api.command.CommandSource;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class Sync implements SubCommand { //TODO implement
@@ -23,7 +24,7 @@ public class Sync implements SubCommand { //TODO implement
 
     @Override
     public List<String> suggest(String[] args) {
-        return null;
+        return new ArrayList<>();
     }
 
     @Override
diff --git a/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/Unlink.java b/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/Unlink.java
index d6ffab6..7f41042 100644
--- a/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/Unlink.java
+++ b/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/Unlink.java
@@ -10,6 +10,7 @@ import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -58,8 +59,8 @@ public class Unlink implements SubCommand {
         }
 
         DiscordLinkPlayer discordLinkPlayer = DiscordLinkPlayer.getDiscordLinkPlayer(player.getUniqueId());
-        database.removeLinkedAccount(discordLinkPlayer);
-        
+        database.removeLinkedAccount(discordLinkPlayer.getUuid());
+
         discordLinkPlayer.updateDiscord(
                 DiscordRole.getDiscordRoles().stream()
                         .filter(role -> discordLinkPlayer.getRoles().contains(role.getInternalName()))
@@ -75,7 +76,7 @@ public class Unlink implements SubCommand {
 
     @Override
     public List<String> suggest(String[] args) {
-        return null;
+        return new ArrayList<>();
     }
 
     @Override