diff --git a/multichat/pom.xml b/multichat/pom.xml
index a918d343..a405ea17 100644
--- a/multichat/pom.xml
+++ b/multichat/pom.xml
@@ -5,7 +5,7 @@
xyz.olivermartin.multichat
multichat
- 1.7.4
+ 1.7.5
@@ -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.2-R0.1-SNAPSHOT
+ 1.15.1-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/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;
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..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
@@ -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,18 @@ 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();
+ 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());
}
}
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