Updated upstream builds. Bungee/Spigot

Added try/catch for an error I cannot reproduce Bumped plugin version
BGHDDevelopment · Jan 20, 2024 · a093364 · a093364
1 parent fd296ab
commit a093364
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 17 deletions.
diff --git a/addon/pom.xml b/addon/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.jaimemartz</groupId>
         <artifactId>playerbalancer-parent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
 
     <artifactId>playerbalancer-addon</artifactId>
@@ -29,13 +29,13 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.18.2-R0.1-SNAPSHOT</version>
+            <version>1.20.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.1</version>
+            <version>2.11.5</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java b/addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java
@@ -17,7 +17,7 @@ public class PlayerBalancerAddon extends JavaPlugin {
     private PluginMessageManager manager;
     private PlayerBalancerPlaceholderExpansion expansion;
     private ConfigurationFile config;
-    private String version = "2.3.4";
+    private String version = "2.3.5";
 
     @Override
     public void onEnable() {

diff --git a/balancer-velocity/pom.xml b/balancer-velocity/pom.xml
@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>com.jaimemartz</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
         <artifactId>playerbalancer-parent</artifactId>
     </parent>
 

diff --git a/balancer-velocity/src/main/java/com/jaimemartz/playerbalancer/velocity/PlayerBalancer.java b/balancer-velocity/src/main/java/com/jaimemartz/playerbalancer/velocity/PlayerBalancer.java
@@ -53,7 +53,7 @@
 @Plugin(
         id = "playerbalancer",
         name = "PlayerBalancer Velocity",
-        version = "2.3.4",
+        version = "2.3.5",
         description = "PlayerBalancer is a plugin for setting up a network with multiple lobbies of different types.",
         authors = {"jaime29010", "BGHDDevelopment", "HappyAreaBean"},
         dependencies = {
@@ -81,7 +81,7 @@ public class PlayerBalancer {
     private final Metrics.Factory metricsFactory;
     private final PluginContainer container;
     private final Path dataDirectory;
-    private String version = "2.3.4";
+    private String version = "2.3.5";
 
     @Inject
     public PlayerBalancer(ProxyServer proxyServer, Logger logger, Metrics.Factory metricsFactory, PluginContainer container, @DataDirectory Path dataDirectory) {

diff --git a/balancer/pom.xml b/balancer/pom.xml
@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>com.jaimemartz</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
         <artifactId>playerbalancer-parent</artifactId>
     </parent>
 
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-proxy</artifactId>
-            <version>1.15-SNAPSHOT</version>
+            <version>1.20-R0.3-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>

diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java
@@ -104,8 +104,8 @@ public void updateCheck() {
                     getLogger().log(Level.WARNING, ("Your PlayerBalancer version is out of date!"));
                     getLogger().log(Level.WARNING, ("We recommend updating ASAP!"));
                     getLogger().log(Level.WARNING, (""));
-                    getLogger().log(Level.WARNING, ("Your Version: &e" + getDescription().getVersion()));
-                    getLogger().log(Level.WARNING, ("Newest Version: &e" + version));
+                    getLogger().log(Level.WARNING, ("Your Version: " + getDescription().getVersion()));
+                    getLogger().log(Level.WARNING, ("Newest Version: " + version));
                     getLogger().log(Level.WARNING, (""));
                     getLogger().log(Level.WARNING, (""));
                     return;

diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerKickListener.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerKickListener.java
@@ -119,7 +119,13 @@ private ServerSection getSection(ProxiedPlayer player, ServerInfo from) {
             }
 
             if (target == null) {
-                MessageUtils.send(player, messages.getUnavailableServerMessage());
+                try {
+                    MessageUtils.send(player, messages.getUnavailableServerMessage());
+                    return null;
+                } catch (NullPointerException exception) {
+                    //Do because this randomly is firing NPE for some new versions
+                    plugin.getLogger().info("PlayerBalancer caught an NPE on ServerKickListener. This can be reported but the actual cause is unknown at this time.");
+                }
                 return null;
             }
 

diff --git a/partyandfriendsaddon/pom.xml b/partyandfriendsaddon/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.bghddevelopment.partyandfriendsaddon</groupId>
     <artifactId>PBServerConnector</artifactId>
-    <version>2.3.4</version>
+    <version>2.3.5</version>
     <packaging>jar</packaging>
 
     <name>PartyAndFriendsAddon</name>
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>com.jaimemartz</groupId>
             <artifactId>playerbalancer</artifactId>
-            <version>2.3.4</version>
+            <version>2.3.5</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.jaimemartz</groupId>
     <artifactId>playerbalancer-parent</artifactId>
-    <version>2.3.4</version>
+    <version>2.3.5</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -142,13 +142,13 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
+            <version>1.18.26</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>