From 4bc164c09ae07b20316444d2226f6f67a7ce744f Mon Sep 17 00:00:00 2001
From: business-goose <arclicious@vivaldi.net>
Date: Wed, 23 Mar 2022 20:58:25 +0000
Subject: [PATCH] Revert "Fix discord command sender not being senior (this is
 retarded)"

This reverts commit 8d13ee731ea5ec884d92bda430c7454cca2f8dcd.
---
 .../discord/sender/DiscordCommandSender.java  | 37 +------------------
 1 file changed, 2 insertions(+), 35 deletions(-)

diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/discord/sender/DiscordCommandSender.java b/src/main/java/me/StevenLawson/TotalFreedomMod/discord/sender/DiscordCommandSender.java
index b55dd98..d2729de 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/discord/sender/DiscordCommandSender.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/discord/sender/DiscordCommandSender.java
@@ -3,9 +3,6 @@ package me.StevenLawson.TotalFreedomMod.discord.sender;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.conversations.Conversation;
-import org.bukkit.conversations.ConversationAbandonedEvent;
 import org.bukkit.permissions.PermissibleBase;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionAttachment;
@@ -15,7 +12,7 @@ import org.javacord.api.entity.user.User;
 
 import java.util.Set;
 
-public class DiscordCommandSender implements ConsoleCommandSender {
+public class DiscordCommandSender implements CommandSender {
     private final User user;
     protected final PermissibleBase perm;
 
@@ -31,7 +28,7 @@ public class DiscordCommandSender implements ConsoleCommandSender {
 
     @Override
     public void sendMessage(String[] strings) {
-        user.sendMessage(String.join("\n", strings));
+        user.sendMessage(String.join("", strings));
     }
 
     @Override
@@ -107,34 +104,4 @@ public class DiscordCommandSender implements ConsoleCommandSender {
     @Override
     public void setOp(boolean b) {
     }
-
-    @Override
-    public boolean isConversing() {
-        return false;
-    }
-
-    @Override
-    public void acceptConversationInput(String s) {
-
-    }
-
-    @Override
-    public boolean beginConversation(Conversation conversation) {
-        return false;
-    }
-
-    @Override
-    public void abandonConversation(Conversation conversation) {
-
-    }
-
-    @Override
-    public void abandonConversation(Conversation conversation, ConversationAbandonedEvent conversationAbandonedEvent) {
-
-    }
-
-    @Override
-    public void sendRawMessage(String s) {
-        user.sendMessage(s);
-    }
 }