Updated dependencies and some bug fixes/tweaks

Vauff · Apr 9, 2018 · e2377a8 · e2377a8
1 parent 2ff4be5
commit e2377a8
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>com.github.austinv11</groupId>
             <artifactId>Discord4j</artifactId>
-            <version>2.9.3</version>
+            <version>2.10.0</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>websocket-client</artifactId>
-            <version>9.4.8.v20171121</version>
+            <version>9.4.9.v20180320</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -139,17 +139,17 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-io</artifactId>
-            <version>9.4.8.v20171121</version>
+            <version>9.4.9.v20180320</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.10.0</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.10.0</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.vdurmont</groupId>
@@ -169,12 +169,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-afterburner</artifactId>
-            <version>2.9.4</version>
+            <version>2.9.5</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.9.4</version>
+            <version>2.9.5</version>
         </dependency>
         <dependency>
             <groupId>com.github.koraktor</groupId>
@@ -189,7 +189,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.8-dmr</version>
+            <version>8.0.9-rc</version>
         </dependency>
         <dependency>
             <groupId>ca.pjer</groupId>
@@ -202,5 +202,5 @@
             <version>3.10.0</version>
         </dependency>
     </dependencies>
-    <version>2.4.1</version>
+    <version>2.4.2</version>
 </project>
diff --git a/src/com/vauff/maunzdiscord/commands/Map.java b/src/com/vauff/maunzdiscord/commands/Map.java
@@ -28,7 +28,7 @@ public void exe(MessageReceivedEvent event) throws Exception
 
 				if (json.getBoolean("enabled"))
 				{
-					if (!(json.getInt("downtimeTimer") >= 3))
+					if (!(json.getInt("downtimeTimer") >= json.getInt("failedConnectionsThreshold")))
 					{
 						if (!json.getString("lastMap").equals("N/A"))
 						{

diff --git a/src/com/vauff/maunzdiscord/core/Main.java b/src/com/vauff/maunzdiscord/core/Main.java
@@ -13,7 +13,7 @@
 public class Main
 {
 	public static IDiscordClient client;
-	public static String version = "2.4.1";
+	public static String version = "2.4.2";
 	public static Logger log;
 
 	public static void main(String[] args) throws DiscordException

diff --git a/src/com/vauff/maunzdiscord/core/Util.java b/src/com/vauff/maunzdiscord/core/Util.java
@@ -629,7 +629,6 @@ public static IMessage buildPage(ArrayList<String> entries, int pageSize, int pa
 							Thread.sleep(250);
 						}
 
-						m.addReaction(EmojiManager.getForAlias(":x:"));
 						Thread.sleep(250);
 
 						if (pageNumber != (int) Math.ceil((float) entries.size() / (float) pageSize))

diff --git a/src/com/vauff/maunzdiscord/features/ServerTimer.java b/src/com/vauff/maunzdiscord/features/ServerTimer.java
@@ -207,7 +207,7 @@ public void run()
 									{
 										String dbMap = json.getJSONArray("mapDatabase").getString(i);
 
-										if (dbMap.toString().equals(map))
+										if (dbMap.equalsIgnoreCase(map))
 										{
 											mapFound = true;
 										}
@@ -217,7 +217,6 @@ public void run()
 									{
 										json.append("mapDatabase", map);
 									}
-
 								}
 
 								if (!map.equals(""))

diff --git a/src/com/vauff/maunzdiscord/features/StatsTimer.java b/src/com/vauff/maunzdiscord/features/StatsTimer.java
@@ -1,6 +1,8 @@
 package com.vauff.maunzdiscord.features;
 
 import com.vauff.maunzdiscord.core.Main;
+import sx.blah.discord.handle.obj.ActivityType;
+import sx.blah.discord.handle.obj.StatusType;
 
 /**
  * Holds a timer to set the playing text in Discord
@@ -19,12 +21,12 @@ public void run()
 			{
 				if (!showingGuilds)
 				{
-					Main.client.changePlayingText(Main.client.getGuilds().size() + " guilds");
+					Main.client.changePresence(StatusType.ONLINE, ActivityType.PLAYING, Main.client.getGuilds().size() + " guilds");
 					showingGuilds = true;
 				}
 				else
 				{
-					Main.client.changePlayingText("discord.gg/v55fW9b");
+					Main.client.changePresence(StatusType.ONLINE, ActivityType.PLAYING, "discord.gg/v55fW9b");
 					showingGuilds = false;
 				}
 			}