Update to v1.31.15

Bugfix when using the Minepacks integration on Paper
GeorgH93 · May 13, 2019 · 56ef10f · 56ef10f
1 parent abaf8e4
commit 56ef10f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.pcgamingfreaks</groupId>
 	<artifactId>MarriageMaster</artifactId>
-	<version>1.31.14</version>
+	<version>1.31.15</version>
 	<name>MarriageMaster</name>
 
 	<repositories>

diff --git a/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Minepacks/MinePacksIntegrationBase.java b/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Minepacks/MinePacksIntegrationBase.java
@@ -36,19 +36,25 @@ public static MinePacksIntegrationBase getIntegration()
 			if(pl != null)
 			{
 				String[] MPV = (pl.getDescription().getVersion().split("-")[0]).split(Pattern.quote("."));
-				if(Integer.parseInt(MPV[0]) > 1 || (MPV.length > 1 && Integer.parseInt(MPV[0]) == 1 && Integer.parseInt(MPV[1]) >= 14))
+				if(Integer.parseInt(MPV[0]) == 1)
 				{
-					mpIB = new MinePacksIntegrationNew();
-				}
-				else
-				{
-					mpIB = new MinePacksIntegrationOld();
+					if(MPV.length > 1 && Integer.parseInt(MPV[1]) >= 14)
+					{
+						mpIB = new MinePacksIntegrationNew();
+					}
+					else
+					{
+						mpIB = new MinePacksIntegrationOld();
+					}
 				}
 			}
-			pl = Bukkit.getServer().getPluginManager().getPlugin("Minepacks");
-			if(pl != null)
+			if(mpIB == null)
 			{
-				mpIB = new MinepacksIntegration();
+				pl = Bukkit.getServer().getPluginManager().getPlugin("Minepacks");
+				if(pl != null)
+				{
+					mpIB = new MinepacksIntegration();
+				}
 			}
 		}
 		catch(Exception e)