From 22dd144bf049e297debdbf1ee843add0ac8d6265 Mon Sep 17 00:00:00 2001 From: OllieMartin Date: Tue, 15 Oct 2019 17:40:21 +0100 Subject: [PATCH 1/5] Updated to latest version of spigot api 1.14.1, v1.7.5 multichat --- multichat/pom.xml | 4 ++-- .../java/xyz/olivermartin/multichat/bungee/MultiChat.java | 3 ++- .../xyz/olivermartin/multichat/spigotbridge/MetaManager.java | 2 ++ multichat/src/main/resources/bungee.yml | 2 +- multichat/src/main/resources/chatcontrol.yml | 2 +- multichat/src/main/resources/config.yml | 2 +- multichat/src/main/resources/joinmessages.yml | 2 +- multichat/src/main/resources/joinmessages_fr.yml | 2 +- multichat/src/main/resources/messages.yml | 2 +- multichat/src/main/resources/messages_fr.yml | 2 +- multichat/src/main/resources/multichatsponge.yml | 2 +- multichat/src/main/resources/plugin.yml | 4 ++-- multichat/src/main/resources/spigotconfig.yml | 2 +- 13 files changed, 17 insertions(+), 14 deletions(-) diff --git a/multichat/pom.xml b/multichat/pom.xml index a918d343..a28f39a9 100644 --- a/multichat/pom.xml +++ b/multichat/pom.xml @@ -5,7 +5,7 @@ xyz.olivermartin.multichat multichat - 1.7.4 + 1.7.5 @@ -107,7 +107,7 @@ org.spigotmc spigot-api - 1.14.2-R0.1-SNAPSHOT + 1.14.4-R0.1-SNAPSHOT provided diff --git a/multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java b/multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java index 4b21b8b0..9198e16a 100644 --- a/multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java +++ b/multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java @@ -37,11 +37,12 @@ */ public class MultiChat extends Plugin implements Listener { - public static final String LATEST_VERSION = "1.7.4"; + public static final String LATEST_VERSION = "1.7.5"; public static final String[] ALLOWED_VERSIONS = new String[] { LATEST_VERSION, + "1.7.4", "1.7.3", "1.7.2", "1.7.1", diff --git a/multichat/src/main/java/xyz/olivermartin/multichat/spigotbridge/MetaManager.java b/multichat/src/main/java/xyz/olivermartin/multichat/spigotbridge/MetaManager.java index 4ecff156..9f21ec21 100644 --- a/multichat/src/main/java/xyz/olivermartin/multichat/spigotbridge/MetaManager.java +++ b/multichat/src/main/java/xyz/olivermartin/multichat/spigotbridge/MetaManager.java @@ -25,6 +25,8 @@ private MetaManager() { public void updatePlayerMeta(String playername, boolean setDisplayName, String displayNameFormat) { String nickname; + + if (Bukkit.getPlayer(playername) == null) return; nickname = NameManager.getInstance().getCurrentName(Bukkit.getPlayer(playername).getUniqueId()); diff --git a/multichat/src/main/resources/bungee.yml b/multichat/src/main/resources/bungee.yml index 0c001e04..e2e15d27 100644 --- a/multichat/src/main/resources/bungee.yml +++ b/multichat/src/main/resources/bungee.yml @@ -1,5 +1,5 @@ name: MultiChat main: xyz.olivermartin.multichat.bungee.MultiChat -version: 1.7.4 +version: 1.7.5 author: Revilo410 api-version: 1.13 \ No newline at end of file diff --git a/multichat/src/main/resources/chatcontrol.yml b/multichat/src/main/resources/chatcontrol.yml index 5e7f1d5e..71045912 100644 --- a/multichat/src/main/resources/chatcontrol.yml +++ b/multichat/src/main/resources/chatcontrol.yml @@ -8,7 +8,7 @@ ################## # DON'T EDIT # -version: "1.7.4" # +version: "1.7.5" # ################## # 1. Chat Control Rules diff --git a/multichat/src/main/resources/config.yml b/multichat/src/main/resources/config.yml index 76bdaa8e..60e73d82 100644 --- a/multichat/src/main/resources/config.yml +++ b/multichat/src/main/resources/config.yml @@ -8,7 +8,7 @@ ################## # DON'T EDIT # -version: "1.7.4" # +version: "1.7.5" # ################## # 1. General diff --git a/multichat/src/main/resources/joinmessages.yml b/multichat/src/main/resources/joinmessages.yml index 6a6978cc..897e799a 100644 --- a/multichat/src/main/resources/joinmessages.yml +++ b/multichat/src/main/resources/joinmessages.yml @@ -8,7 +8,7 @@ ################## # DON'T EDIT # -version: "1.7.4" # +version: "1.7.5" # ################## ############################################################ diff --git a/multichat/src/main/resources/joinmessages_fr.yml b/multichat/src/main/resources/joinmessages_fr.yml index 0e79b869..abc8afb1 100644 --- a/multichat/src/main/resources/joinmessages_fr.yml +++ b/multichat/src/main/resources/joinmessages_fr.yml @@ -8,7 +8,7 @@ ################## # Ne pas éditer # -version: "1.7.4" # +version: "1.7.5" # ################## # French Translation by Nogapra - Thank you! diff --git a/multichat/src/main/resources/messages.yml b/multichat/src/main/resources/messages.yml index cbe496c3..9e617a6e 100644 --- a/multichat/src/main/resources/messages.yml +++ b/multichat/src/main/resources/messages.yml @@ -8,7 +8,7 @@ ################## # DON'T EDIT # -version: "1.7.4" # +version: "1.7.5" # ################## ############################################################ diff --git a/multichat/src/main/resources/messages_fr.yml b/multichat/src/main/resources/messages_fr.yml index 5626fe6c..bb5703f5 100644 --- a/multichat/src/main/resources/messages_fr.yml +++ b/multichat/src/main/resources/messages_fr.yml @@ -8,7 +8,7 @@ ################## # DON'T EDIT # -version: "1.7.4" # +version: "1.7.5" # ################## # French Translation by Nogapra - Thank you! diff --git a/multichat/src/main/resources/multichatsponge.yml b/multichat/src/main/resources/multichatsponge.yml index 69f6e091..1281294e 100644 --- a/multichat/src/main/resources/multichatsponge.yml +++ b/multichat/src/main/resources/multichatsponge.yml @@ -8,7 +8,7 @@ ################## # DON'T EDIT # -version: "1.7.4" # +version: "1.7.5" # ################## # Specify the name of this server here for the %SERVER% placeholder diff --git a/multichat/src/main/resources/plugin.yml b/multichat/src/main/resources/plugin.yml index 5d914f8e..d11abde5 100644 --- a/multichat/src/main/resources/plugin.yml +++ b/multichat/src/main/resources/plugin.yml @@ -1,9 +1,9 @@ name: MultiChatSpigot -version: 1.7.4 +version: 1.7.5 author: Revilo410 main: xyz.olivermartin.multichat.spigotbridge.MultiChatSpigot softdepend: [Vault,PlaceholderAPI] -api-version: 1.13 +api-version: 1.14 commands: nick: description: Gives a player a nickname diff --git a/multichat/src/main/resources/spigotconfig.yml b/multichat/src/main/resources/spigotconfig.yml index 46f2500e..319a9a79 100644 --- a/multichat/src/main/resources/spigotconfig.yml +++ b/multichat/src/main/resources/spigotconfig.yml @@ -8,7 +8,7 @@ ################## # DON'T EDIT # -version: "1.7.4" # +version: "1.7.5" # ################## # Specify the name of this server here for the %SERVER% placeholder From 4d6af506b53e944c84ed32f65b59c5927b18b93e Mon Sep 17 00:00:00 2001 From: OllieMartin Date: Tue, 15 Oct 2019 18:19:16 +0100 Subject: [PATCH 2/5] Attempt to fix sponge threading error --- .../spongebridge/listeners/BungeeCommandListener.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/listeners/BungeeCommandListener.java b/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/listeners/BungeeCommandListener.java index fe92ab66..35bcc24c 100644 --- a/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/listeners/BungeeCommandListener.java +++ b/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/listeners/BungeeCommandListener.java @@ -5,6 +5,7 @@ import org.spongepowered.api.network.ChannelBuf; import org.spongepowered.api.network.RawDataListener; import org.spongepowered.api.network.RemoteConnection; +import org.spongepowered.api.scheduler.Task; /** * Used to execute command send from MultiChat on bungeecord @@ -22,8 +23,13 @@ public BungeeCommandListener() { @Override public void handlePayload(ChannelBuf data, RemoteConnection connection, Platform.Type side) { - String command = data.getUTF(0); - Sponge.getCommandManager().process(Sponge.getServer().getConsole(), command); + Task.Builder taskBuilder = Task.builder(); + taskBuilder.execute( + () -> { + String command = data.getUTF(0); + Sponge.getCommandManager().process(Sponge.getServer().getConsole(), command); + } + ); } } From ec7c257dcc0b4e72c2cac7d2f4af7adb18aed0d3 Mon Sep 17 00:00:00 2001 From: OllieMartin Date: Tue, 15 Oct 2019 18:28:23 +0100 Subject: [PATCH 3/5] Second attempt to fix command error --- .../multichat/spongebridge/listeners/BungeeCommandListener.java | 1 + 1 file changed, 1 insertion(+) diff --git a/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/listeners/BungeeCommandListener.java b/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/listeners/BungeeCommandListener.java index 35bcc24c..4eaf2c18 100644 --- a/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/listeners/BungeeCommandListener.java +++ b/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/listeners/BungeeCommandListener.java @@ -30,6 +30,7 @@ public void handlePayload(ChannelBuf data, RemoteConnection connection, Platform Sponge.getCommandManager().process(Sponge.getServer().getConsole(), command); } ); + taskBuilder.submit(Sponge.getPluginManager().getPlugin("multichat").get().getInstance().get()); } } From 82bd7f22b233d3b3b7402b6b0d05b5834e9472d3 Mon Sep 17 00:00:00 2001 From: OllieMartin Date: Tue, 15 Oct 2019 18:37:43 +0100 Subject: [PATCH 4/5] Once again attempt to fix --- .../listeners/BungeeCommandListener.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/listeners/BungeeCommandListener.java b/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/listeners/BungeeCommandListener.java index 4eaf2c18..ad58d391 100644 --- a/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/listeners/BungeeCommandListener.java +++ b/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/listeners/BungeeCommandListener.java @@ -24,12 +24,16 @@ public BungeeCommandListener() { public void handlePayload(ChannelBuf data, RemoteConnection connection, Platform.Type side) { Task.Builder taskBuilder = Task.builder(); - taskBuilder.execute( - () -> { - String command = data.getUTF(0); - Sponge.getCommandManager().process(Sponge.getServer().getConsole(), command); - } - ); + final String command = data.getUTF(0); + + taskBuilder.execute(new Runnable() { + public void run() { + Sponge.getCommandManager().process(Sponge.getServer().getConsole(), command); + } + }); + + taskBuilder.delayTicks(1); + taskBuilder.submit(Sponge.getPluginManager().getPlugin("multichat").get().getInstance().get()); } From a0adecc7d6dc371910565fab8c0090526952a98a Mon Sep 17 00:00:00 2001 From: OllieMartin Date: Sun, 16 Feb 2020 23:34:17 +0000 Subject: [PATCH 5/5] Ready for 1.7.5 release --- multichat/pom.xml | 6 +++--- .../multichat/spongebridge/MultiChatSponge.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/multichat/pom.xml b/multichat/pom.xml index a28f39a9..a405ea17 100644 --- a/multichat/pom.xml +++ b/multichat/pom.xml @@ -91,7 +91,7 @@ net.md-5 bungeecord-api - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar provided @@ -99,7 +99,7 @@ net.md-5 bungeecord-api - 1.14-SNAPSHOT + 1.15-SNAPSHOT javadoc provided @@ -107,7 +107,7 @@ org.spigotmc spigot-api - 1.14.4-R0.1-SNAPSHOT + 1.15.1-R0.1-SNAPSHOT provided diff --git a/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/MultiChatSponge.java b/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/MultiChatSponge.java index 1fee8a2f..d67e7e26 100644 --- a/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/MultiChatSponge.java +++ b/multichat/src/main/java/xyz/olivermartin/multichat/spongebridge/MultiChatSponge.java @@ -62,7 +62,7 @@ * @author Oliver Martin (Revilo410) * */ -@Plugin(id = "multichat", name = "MultiChatSponge", version = "1.7.4", dependencies = { @Dependency(id = "placeholderapi", optional = true) }) +@Plugin(id = "multichat", name = "MultiChatSponge", version = "1.7.5", dependencies = { @Dependency(id = "placeholderapi", optional = true) }) public final class MultiChatSponge implements CommandExecutor { public static SimpleMutableMessageChannel multichatChannel;