Upstream/PlayerBalancer
1
0
Fork 0
mirror of https://github.com/BGHDDevelopment/PlayerBalancer.git synced 2024-11-26 04:35:47 +01:00
Code Issues Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Jaime Martínez Rincón 2020-02-01 13:51:38 +01:00
parent 188874bcfe
commit 4caae18e6a
5 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addon/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.jaimemartz</groupId>
<version>2.1.6-SNAPSHOT</version>
<version>2.1.6.1-SNAPSHOT</version>
<artifactId>playerbalancer-parent</artifactId>
</parent>
@ -29,7 +29,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
<version>1.15.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>

16
addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java
View File

@ -10,6 +10,7 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.messaging.PluginMessageListener;
import java.util.Iterator;
import java.util.Objects;
import java.util.UUID;
import java.util.function.Consumer;
@ -201,7 +202,7 @@ public class PluginMessageManager implements PluginMessageListener {
return true;
}
private final class MessageContext {
private static final class MessageContext {
private final String channel;
private final String subchannel;
private final UUID player;
@ -216,20 +217,15 @@ public class PluginMessageManager implements PluginMessageListener {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
MessageContext that = (MessageContext) o;
if (channel != null ? !channel.equals(that.channel) : that.channel != null) return false;
if (subchannel != null ? !subchannel.equals(that.subchannel) : that.subchannel != null) return false;
return player != null ? player.equals(that.player) : that.player == null;
return Objects.equals(channel, that.channel) &&
Objects.equals(subchannel, that.subchannel) &&
Objects.equals(player, that.player);
}
@Override
public int hashCode() {
int result = channel != null ? channel.hashCode() : 0;
result = 31 * result + (subchannel != null ? subchannel.hashCode() : 0);
result = 31 * result + (player != null ? player.hashCode() : 0);
return result;
return Objects.hash(channel, subchannel, player);
}
@Override

15
balancer/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.jaimemartz</groupId>
<version>2.1.6-SNAPSHOT</version>
<version>2.1.6.1-SNAPSHOT</version>
<artifactId>playerbalancer-parent</artifactId>
</parent>
@ -49,12 +49,12 @@
<repositories>
<repository>
<id>md_5-snapshots</id>
<url>http://repo.md-5.net/content/repositories/snapshots/</url>
<id>bungeecord-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<repository>
<id>bstats-repo</id>
<url>http://repo.bstats.org/content/repositories/releases/</url>
<id>CodeMC</id>
<url>https://repo.codemc.org/repository/maven-public</url>
</repository>
</repositories>
@ -62,7 +62,8 @@
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-proxy</artifactId>
<version>1.13-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
@ -87,7 +88,7 @@
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bungeecord</artifactId>
<version>1.4</version>
<version>1.7</version>
<scope>compile</scope>
</dependency>
</dependencies>

2
balancer/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java
View File

@ -57,7 +57,7 @@ public class PlayerBalancer extends Plugin {
@Override
public void onEnable() {
Metrics metrics = new Metrics(this);
Metrics metrics = new Metrics(this, 1636);
metrics.addCustomChart(new SingleLineChart("configured_sections", () -> {
if (sectionManager != null) {
return sectionManager.getSections().size();

7
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.jaimemartz</groupId>
<artifactId>playerbalancer-parent</artifactId>
<version>2.1.6-SNAPSHOT</version>
<version>2.1.6.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@ -67,7 +67,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20.1</version>
<version>3.0.0-M4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -140,7 +140,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.20</version>
<version>1.18.10</version>
<scope>provided</scope>
</dependency>
<dependency>
@ -150,5 +150,4 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>