Fix Spigot Compatibility (#104)

lucko · Mar 23, 2023 · f1e1e9c · f1e1e9c
1 parent a3c06a7
commit f1e1e9c
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/bungeeguard-bungee-java9/pom.xml b/bungeeguard-bungee-java9/pom.xml
@@ -29,12 +29,24 @@
  <artifactId>bungeecord-api</artifactId>
  <version>${bungee.version}</version>
  <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
  <dependency>
  <groupId>net.md-5</groupId>
  <artifactId>bungeecord-proxy</artifactId>
  <version>${bungee.version}</version>
  <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
  </dependencies>
 

diff --git a/bungeeguard-bungee/pom.xml b/bungeeguard-bungee/pom.xml
@@ -30,12 +30,24 @@
  <artifactId>bungeecord-api</artifactId>
  <version>${bungee.version}</version>
  <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
  <dependency>
  <groupId>net.md-5</groupId>
  <artifactId>bungeecord-proxy</artifactId>
  <version>${bungee.version}</version>
  <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
  </dependencies>
 

diff --git a/bungeeguard-spigot/src/main/java/me/lucko/bungeeguard/spigot/BungeeGuardBackendPlugin.java b/bungeeguard-spigot/src/main/java/me/lucko/bungeeguard/spigot/BungeeGuardBackendPlugin.java
@@ -54,7 +54,7 @@ public void onEnable() {
  this.tokenStore = new TokenStore(this);
  this.tokenStore.load();
 
- if (!getServer().spigot().getSpigotConfig().getBoolean("settings.bungeecord", false)) {
+ if (!getServer().spigot().getConfig().getBoolean("settings.bungeecord", false)) {
  getLogger().severe("------------------------------------------------------------");
  getLogger().severe("'settings.bungeecord' is set to false in spigot.yml.");
  getLogger().severe("");

diff --git a/bungeeguard-sponge/pom.xml b/bungeeguard-sponge/pom.xml
@@ -63,7 +63,7 @@
  <repositories>
  <repository>
  <id>sponge-repo</id>
- <url>https://repo.spongepowered.org/maven/</url>
+ <url>https://repo.spongepowered.org/repository/maven-public/</url>
  </repository>
  </repositories>
 

diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
  </repository>
  <repository>
  <id>paper-repo</id>
- <url>https://papermc.io/repo/repository/maven-public/</url>
+ <url>https://repo.papermc.io/repository/maven-public/</url>
  </repository>
  <repository>
  <id>luck-repo</id>