From d12fe961c03e8e608b81714c53429be759277aee Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 22 Nov 2018 01:02:20 +0100 Subject: [PATCH] No Origins --- pom.xml | 2 +- .../java/buttondevteam/discordplugin/DiscordSenderBase.java | 4 ++-- .../buttondevteam/discordplugin/listeners/MCChatListener.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index f283fc7..c9f7680 100755 --- a/pom.xml +++ b/pom.xml @@ -173,7 +173,7 @@ com.github.TBMCPlugins.ButtonCore ButtonCore - master-SNAPSHOT + ${env.TRAVIS_BRANCH}-SNAPSHOT provided diff --git a/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java b/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java index 14c7fc4..ea2f1a7 100755 --- a/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java @@ -1,13 +1,13 @@ package buttondevteam.discordplugin; import buttondevteam.lib.TBMCCoreAPI; -import buttondevteam.lib.chat.IDiscordSender; import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; import org.bukkit.scheduler.BukkitTask; import sx.blah.discord.handle.obj.IChannel; import sx.blah.discord.handle.obj.IUser; -public abstract class DiscordSenderBase implements IDiscordSender { +public abstract class DiscordSenderBase implements CommandSender { /** * May be null. */ diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java index 4d73c83..5f1792d 100755 --- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java @@ -81,7 +81,7 @@ public class MCChatListener implements Listener, IListener time = se.getValue(); final String authorPlayer = "[" + DPUtils.sanitizeStringNoEscape(e.getChannel().DisplayName) + "] " // - + (e.getSender() instanceof DiscordSenderBase ? "[D]" : "") // + + ("Minecraft".equals(e.getOrigin()) ? "" : "[" + e.getOrigin() + "]") // + (DPUtils.sanitizeStringNoEscape(e.getSender() instanceof Player // ? ((Player) e.getSender()).getDisplayName() // : e.getSender().getName()));