Merge pull request #100 from MultiChat/v19

MultiChat 1.9.1
MultiChat · May 4, 2020 · dc01e74 · dc01e74
2 parents 846c993 + 4d500b7
commit dc01e74
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 17 deletions.
diff --git a/multichat/pom.xml b/multichat/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>xyz.olivermartin.multichat</groupId>
 	<artifactId>multichat</artifactId>
-	<version>1.9-snapshot.20.5.1</version>
+	<version>1.9.1</version>
 
 	<repositories>
 

diff --git 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.9";
+	public static final String LATEST_VERSION = "1.9.1";
 
 	public static final String[] ALLOWED_VERSIONS = new String[] {
 
 			LATEST_VERSION,
+			"1.9",
 			"1.8.2",
 			"1.8.1",
 			"1.8",

diff --git a/...hat/src/main/java/xyz/olivermartin/multichat/local/spigot/MultiChatLocalSpigotPlugin.java b/...hat/src/main/java/xyz/olivermartin/multichat/local/spigot/MultiChatLocalSpigotPlugin.java
@@ -219,7 +219,7 @@ public void onDisable() {
 		if (MultiChatLocal.getInstance().getNameManager().getMode() == LocalNameManagerMode.SQL) {
 
 			try {
-				DatabaseManager.getInstance().getDatabase("multichatspigot.db").get().disconnectFromDatabase();
+				DatabaseManager.getInstance().getDatabase("multichatlocal.db").get().disconnectFromDatabase();
 			} catch (SQLException e) {
 				MultiChatLocal.getInstance().getConsoleLogger().log("Error when disconnecting from database!");
 			}

diff --git a/...hat/src/main/java/xyz/olivermartin/multichat/local/sponge/MultiChatLocalSpongePlugin.java b/...hat/src/main/java/xyz/olivermartin/multichat/local/sponge/MultiChatLocalSpongePlugin.java
@@ -56,7 +56,7 @@
 import xyz.olivermartin.multichat.local.sponge.listeners.communication.LocalSpongePlayerChannelListener;
 import xyz.olivermartin.multichat.local.sponge.listeners.communication.LocalSpongePlayerMetaListener;
 
-@Plugin(id = "multichat", name = "MultiChat", version = "1.9", dependencies = { @Dependency(id = "placeholderapi", optional = true) })
+@Plugin(id = "multichat", name = "MultiChat", version = "1.9.1", dependencies = { @Dependency(id = "placeholderapi", optional = true) })
 public class MultiChatLocalSpongePlugin {
 
 	@Inject
@@ -305,7 +305,7 @@ public void onServerStop(GameStoppingServerEvent event) {
 		if (MultiChatLocal.getInstance().getNameManager().getMode() == LocalNameManagerMode.SQL) {
 
 			try {
-				DatabaseManager.getInstance().getDatabase("multichatsponge.db").get().disconnectFromDatabase();
+				DatabaseManager.getInstance().getDatabase("multichatlocal.db").get().disconnectFromDatabase();
 			} catch (SQLException e) {
 				MultiChatLocal.getInstance().getConsoleLogger().log("Error when disconnecting from database!");
 			}

diff --git 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.9
+version: 1.9.1
 author: Revilo410
 api-version: 1.15
diff --git a/multichat/src/main/resources/chatcontrol.yml b/multichat/src/main/resources/chatcontrol.yml
@@ -8,7 +8,7 @@
 
 ##################
 #   DON'T EDIT   #
-version: "1.9"   #
+version: "1.9.1" #
 ##################
 
 # 1. Chat Control Rules

diff --git a/multichat/src/main/resources/chatcontrol_fr.yml b/multichat/src/main/resources/chatcontrol_fr.yml
@@ -8,7 +8,7 @@
 
 ##################
 # NE PAS EDITER  #
-version: "1.9"   #
+version: "1.9.1" #
 ##################
 
 # French Translation by Nogapra - Thank you !

diff --git a/multichat/src/main/resources/config.yml b/multichat/src/main/resources/config.yml
@@ -8,7 +8,7 @@
 
 ##################
 #   DON'T EDIT   #
-version: "1.9"   #
+version: "1.9.1" #
 ##################
 
 # 1. General

diff --git a/multichat/src/main/resources/config_fr.yml b/multichat/src/main/resources/config_fr.yml
@@ -8,7 +8,7 @@
 
 ##################
 # NE PAS EDITER  #
-version: "1.9"   #
+version: "1.9.1" #
 ##################
 
 # French Translation by Nogapra - Thank you !

diff --git a/multichat/src/main/resources/joinmessages.yml b/multichat/src/main/resources/joinmessages.yml
@@ -8,7 +8,7 @@
 
 ##################
 #   DON'T EDIT   #
-version: "1.9"   #
+version: "1.9.1" #
 ##################
 
 ############################################################

diff --git 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.9"   #
+version: "1.9.1" #
 ##################
 
 # French Translation by Nogapra - Thank you!

diff --git a/multichat/src/main/resources/localconfig.yml b/multichat/src/main/resources/localconfig.yml
@@ -8,7 +8,7 @@
 
 ##################
 #   DON'T EDIT   #
-version: "1.9"   #
+version: "1.9.1" #
 ##################
 
 # 1. Global Chat Settings

diff --git a/multichat/src/main/resources/localconfig_fr.yml b/multichat/src/main/resources/localconfig_fr.yml
@@ -8,7 +8,7 @@
 
 ##################
 # NE PAS EDITER  #
-version: "1.9"   #
+version: "1.9.1" #
 ##################
 
 # French Translation by Nogapra - Thank you !

diff --git a/multichat/src/main/resources/messages.yml b/multichat/src/main/resources/messages.yml
@@ -8,7 +8,7 @@
 
 ##################
 #   DON'T EDIT   #
-version: "1.9"   #
+version: "1.9.1" #
 ##################
 
 ############################################################

diff --git 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.9"   #
+version: "1.9.1" #
 ##################
 
 # French Translation by Nogapra - Thank you!

diff --git a/multichat/src/main/resources/plugin.yml b/multichat/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: MultiChat
-version: 1.9
+version: 1.9.1
 author: Revilo410
 main: xyz.olivermartin.multichat.local.spigot.MultiChatLocalSpigotPlugin
 softdepend: [Vault,PlaceholderAPI]