Skip to content
This repository was archived by the owner on Mar 8, 2025. It is now read-only.

Commit a093364

Browse files
Updated upstream builds. Bungee/Spigot
Added try/catch for an error I cannot reproduce Bumped plugin version
1 parent fd296ab commit a093364

File tree

9 files changed

+23
-17
lines changed

9 files changed

+23
-17
lines changed

addon/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.jaimemartz</groupId>
99
<artifactId>playerbalancer-parent</artifactId>
10-
<version>2.3.4</version>
10+
<version>2.3.5</version>
1111
</parent>
1212

1313
<artifactId>playerbalancer-addon</artifactId>
@@ -29,13 +29,13 @@
2929
<dependency>
3030
<groupId>org.spigotmc</groupId>
3131
<artifactId>spigot-api</artifactId>
32-
<version>1.18.2-R0.1-SNAPSHOT</version>
32+
<version>1.20.4-R0.1-SNAPSHOT</version>
3333
<scope>provided</scope>
3434
</dependency>
3535
<dependency>
3636
<groupId>me.clip</groupId>
3737
<artifactId>placeholderapi</artifactId>
38-
<version>2.11.1</version>
38+
<version>2.11.5</version>
3939
<scope>provided</scope>
4040
</dependency>
4141
</dependencies>

addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class PlayerBalancerAddon extends JavaPlugin {
1717
private PluginMessageManager manager;
1818
private PlayerBalancerPlaceholderExpansion expansion;
1919
private ConfigurationFile config;
20-
private String version = "2.3.4";
20+
private String version = "2.3.5";
2121

2222
@Override
2323
public void onEnable() {

balancer-velocity/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<parent>
88
<groupId>com.jaimemartz</groupId>
9-
<version>2.3.4</version>
9+
<version>2.3.5</version>
1010
<artifactId>playerbalancer-parent</artifactId>
1111
</parent>
1212

balancer-velocity/src/main/java/com/jaimemartz/playerbalancer/velocity/PlayerBalancer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
@Plugin(
5454
id = "playerbalancer",
5555
name = "PlayerBalancer Velocity",
56-
version = "2.3.4",
56+
version = "2.3.5",
5757
description = "PlayerBalancer is a plugin for setting up a network with multiple lobbies of different types.",
5858
authors = {"jaime29010", "BGHDDevelopment", "HappyAreaBean"},
5959
dependencies = {
@@ -81,7 +81,7 @@ public class PlayerBalancer {
8181
private final Metrics.Factory metricsFactory;
8282
private final PluginContainer container;
8383
private final Path dataDirectory;
84-
private String version = "2.3.4";
84+
private String version = "2.3.5";
8585

8686
@Inject
8787
public PlayerBalancer(ProxyServer proxyServer, Logger logger, Metrics.Factory metricsFactory, PluginContainer container, @DataDirectory Path dataDirectory) {

balancer/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<parent>
88
<groupId>com.jaimemartz</groupId>
9-
<version>2.3.4</version>
9+
<version>2.3.5</version>
1010
<artifactId>playerbalancer-parent</artifactId>
1111
</parent>
1212

@@ -62,7 +62,7 @@
6262
<dependency>
6363
<groupId>net.md-5</groupId>
6464
<artifactId>bungeecord-proxy</artifactId>
65-
<version>1.15-SNAPSHOT</version>
65+
<version>1.20-R0.3-SNAPSHOT</version>
6666
<type>jar</type>
6767
<scope>provided</scope>
6868
</dependency>

balancer/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ public void updateCheck() {
104104
getLogger().log(Level.WARNING, ("Your PlayerBalancer version is out of date!"));
105105
getLogger().log(Level.WARNING, ("We recommend updating ASAP!"));
106106
getLogger().log(Level.WARNING, (""));
107-
getLogger().log(Level.WARNING, ("Your Version: &e" + getDescription().getVersion()));
108-
getLogger().log(Level.WARNING, ("Newest Version: &e" + version));
107+
getLogger().log(Level.WARNING, ("Your Version: " + getDescription().getVersion()));
108+
getLogger().log(Level.WARNING, ("Newest Version: " + version));
109109
getLogger().log(Level.WARNING, (""));
110110
getLogger().log(Level.WARNING, (""));
111111
return;

balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerKickListener.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,13 @@ private ServerSection getSection(ProxiedPlayer player, ServerInfo from) {
119119
}
120120

121121
if (target == null) {
122-
MessageUtils.send(player, messages.getUnavailableServerMessage());
122+
try {
123+
MessageUtils.send(player, messages.getUnavailableServerMessage());
124+
return null;
125+
} catch (NullPointerException exception) {
126+
//Do because this randomly is firing NPE for some new versions
127+
plugin.getLogger().info("PlayerBalancer caught an NPE on ServerKickListener. This can be reported but the actual cause is unknown at this time.");
128+
}
123129
return null;
124130
}
125131

partyandfriendsaddon/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.bghddevelopment.partyandfriendsaddon</groupId>
88
<artifactId>PBServerConnector</artifactId>
9-
<version>2.3.4</version>
9+
<version>2.3.5</version>
1010
<packaging>jar</packaging>
1111

1212
<name>PartyAndFriendsAddon</name>
@@ -91,7 +91,7 @@
9191
<dependency>
9292
<groupId>com.jaimemartz</groupId>
9393
<artifactId>playerbalancer</artifactId>
94-
<version>2.3.4</version>
94+
<version>2.3.5</version>
9595
<scope>provided</scope>
9696
</dependency>
9797
</dependencies>

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.jaimemartz</groupId>
88
<artifactId>playerbalancer-parent</artifactId>
9-
<version>2.3.4</version>
9+
<version>2.3.5</version>
1010
<packaging>pom</packaging>
1111

1212
<modules>
@@ -142,13 +142,13 @@
142142
<dependency>
143143
<groupId>org.projectlombok</groupId>
144144
<artifactId>lombok</artifactId>
145-
<version>1.18.22</version>
145+
<version>1.18.26</version>
146146
<scope>provided</scope>
147147
</dependency>
148148
<dependency>
149149
<groupId>junit</groupId>
150150
<artifactId>junit</artifactId>
151-
<version>4.13.1</version>
151+
<version>4.13.2</version>
152152
<scope>test</scope>
153153
</dependency>
154154
</dependencies>

0 commit comments

Comments
 (0)