Skip to content

Commit 4caae18

Browse files
jamezrinjamezrin
committed
Update dependencies
1 parent 188874b commit 4caae18

5 files changed

Lines changed: 20 additions & 24 deletions

File tree

‎addon/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.1.6-SNAPSHOT</version>
9+
<version>2.1.6.1-SNAPSHOT</version>
1010
<artifactId>playerbalancer-parent</artifactId>
1111
</parent>
1212

@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>org.spigotmc</groupId>
3131
<artifactId>spigot-api</artifactId>
32-
<version>1.12.2-R0.1-SNAPSHOT</version>
32+
<version>1.15.1-R0.1-SNAPSHOT</version>
3333
<scope>provided</scope>
3434
</dependency>
3535
<dependency>

‎addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.bukkit.plugin.messaging.PluginMessageListener;
1111

1212
import java.util.Iterator;
13+
import java.util.Objects;
1314
import java.util.UUID;
1415
import java.util.function.Consumer;
1516

@@ -201,7 +202,7 @@ public boolean setStatusOverride(String server, boolean status) {
201202
return true;
202203
}
203204

204-
private final class MessageContext {
205+
private static final class MessageContext {
205206
private final String channel;
206207
private final String subchannel;
207208
private final UUID player;
@@ -216,20 +217,15 @@ public MessageContext(String channel, String subchannel, UUID player) {
216217
public boolean equals(Object o) {
217218
if (this == o) return true;
218219
if (o == null || getClass() != o.getClass()) return false;
219-
220220
MessageContext that = (MessageContext) o;
221-
222-
if (channel != null ? !channel.equals(that.channel) : that.channel != null) return false;
223-
if (subchannel != null ? !subchannel.equals(that.subchannel) : that.subchannel != null) return false;
224-
return player != null ? player.equals(that.player) : that.player == null;
221+
return Objects.equals(channel, that.channel) &&
222+
Objects.equals(subchannel, that.subchannel) &&
223+
Objects.equals(player, that.player);
225224
}
226225

227226
@Override
228227
public int hashCode() {
229-
int result = channel != null ? channel.hashCode() : 0;
230-
result = 31 * result + (subchannel != null ? subchannel.hashCode() : 0);
231-
result = 31 * result + (player != null ? player.hashCode() : 0);
232-
return result;
228+
return Objects.hash(channel, subchannel, player);
233229
}
234230

235231
@Override

‎balancer/pom.xml‎

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

77
<parent>
88
<groupId>com.jaimemartz</groupId>
9-
<version>2.1.6-SNAPSHOT</version>
9+
<version>2.1.6.1-SNAPSHOT</version>
1010
<artifactId>playerbalancer-parent</artifactId>
1111
</parent>
1212

@@ -49,20 +49,21 @@
4949

5050
<repositories>
5151
<repository>
52-
<id>md_5-snapshots</id>
53-
<url>http://repo.md-5.net/content/repositories/snapshots/</url>
52+
<id>bungeecord-repo</id>
53+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
5454
</repository>
5555
<repository>
56-
<id>bstats-repo</id>
57-
<url>http://repo.bstats.org/content/repositories/releases/</url>
56+
<id>CodeMC</id>
57+
<url>https://repo.codemc.org/repository/maven-public</url>
5858
</repository>
5959
</repositories>
6060

6161
<dependencies>
6262
<dependency>
6363
<groupId>net.md-5</groupId>
6464
<artifactId>bungeecord-proxy</artifactId>
65-
<version>1.13-SNAPSHOT</version>
65+
<version>1.15-SNAPSHOT</version>
66+
<type>jar</type>
6667
<scope>provided</scope>
6768
</dependency>
6869
<dependency>
@@ -87,7 +88,7 @@
8788
<dependency>
8889
<groupId>org.bstats</groupId>
8990
<artifactId>bstats-bungeecord</artifactId>
90-
<version>1.4</version>
91+
<version>1.7</version>
9192
<scope>compile</scope>
9293
</dependency>
9394
</dependencies>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void onLoad() {
5757

5858
@Override
5959
public void onEnable() {
60-
Metrics metrics = new Metrics(this);
60+
Metrics metrics = new Metrics(this, 1636);
6161
metrics.addCustomChart(new SingleLineChart("configured_sections", () -> {
6262
if (sectionManager != null) {
6363
return sectionManager.getSections().size();

‎pom.xml‎

Lines changed: 3 additions & 4 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.1.6-SNAPSHOT</version>
9+
<version>2.1.6.1-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<modules>
@@ -67,7 +67,7 @@
6767
<plugin>
6868
<groupId>org.apache.maven.plugins</groupId>
6969
<artifactId>maven-surefire-plugin</artifactId>
70-
<version>2.20.1</version>
70+
<version>3.0.0-M4</version>
7171
</plugin>
7272
<plugin>
7373
<groupId>org.apache.maven.plugins</groupId>
@@ -140,7 +140,7 @@
140140
<dependency>
141141
<groupId>org.projectlombok</groupId>
142142
<artifactId>lombok</artifactId>
143-
<version>1.16.20</version>
143+
<version>1.18.10</version>
144144
<scope>provided</scope>
145145
</dependency>
146146
<dependency>
@@ -150,5 +150,4 @@
150150
<scope>test</scope>
151151
</dependency>
152152
</dependencies>
153-
154153
</project>

0 commit comments

Comments
 (0)