Possible fix for exception on player join/leave, added api version, updated pom dependencies, version bump
This commit is contained in:
parent
ba36db0560
commit
1e041083e1
24
pom.xml
24
pom.xml
|
@ -6,7 +6,7 @@
|
|||
|
||||
<groupId>uk.co.angrybee.joe</groupId>
|
||||
<artifactId>discord-whitelister</artifactId>
|
||||
<version>1.4.9</version>
|
||||
<version>1.5.0</version>
|
||||
|
||||
<name>discord-whitelister</name>
|
||||
<url>https://github.com/JoeShimell/DiscordWhitelisterSpigot</url>
|
||||
|
@ -22,9 +22,6 @@
|
|||
</repository>
|
||||
|
||||
<repository>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<id>dv8tion</id>
|
||||
<name>m2-dv8tion</name>
|
||||
<url>https://m2.dv8tion.net/releases</url>
|
||||
|
@ -36,10 +33,9 @@
|
|||
<url>https://jitpack.io</url>
|
||||
</repository>
|
||||
|
||||
<!-- EssX-->
|
||||
<repository>
|
||||
<id>ess-repo</id>
|
||||
<url>https://ci.ender.zone/plugin/repository/everything</url>
|
||||
<id>essentials-releases</id>
|
||||
<url>https://repo.essentialsx.net/releases/</url>
|
||||
</repository>
|
||||
|
||||
</repositories>
|
||||
|
@ -56,7 +52,7 @@
|
|||
<dependency>
|
||||
<groupId>net.dv8tion</groupId>
|
||||
<artifactId>JDA</artifactId>
|
||||
<version>4.3.0_288</version>
|
||||
<version>4.3.0_346</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>club.minnced</groupId>
|
||||
|
@ -96,16 +92,22 @@
|
|||
<artifactId>SuperVanish</artifactId>
|
||||
<!-- POM is invalid with java compiler ver > 8 (maven-compiler-plugin source & target version is set to 8) -->
|
||||
<!-- TODO: get updated version if/when available for better support with compiler versions > 8 -->
|
||||
<version>6.2.6</version>
|
||||
<version>6.2.6-2</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- EssX-->
|
||||
<dependency>
|
||||
<groupId>net.ess3</groupId>
|
||||
<groupId>net.essentialsx</groupId>
|
||||
<artifactId>EssentialsX</artifactId>
|
||||
<version>2.18.2</version>
|
||||
<version>2.19.0</version>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.bstats</groupId>
|
||||
<artifactId>bstats-bukkit</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- VanishNoPacket -->
|
||||
|
|
|
@ -21,10 +21,7 @@ import uk.co.angrybee.joe.events.EssentialsVanishEvents;
|
|||
import uk.co.angrybee.joe.events.SuperVanishEvents;
|
||||
import uk.co.angrybee.joe.events.VanishNoPacketEvents;
|
||||
|
||||
import java.lang.reflect.Array;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
|
@ -82,7 +79,7 @@ public class DiscordWhitelister extends JavaPlugin {
|
|||
PluginManager pluginManager = getServer().getPluginManager();
|
||||
essentialsPlugin = (Essentials) pluginManager.getPlugin("Essentials");
|
||||
vanishNoPacketPlugin = (VanishPlugin) pluginManager.getPlugin("VanishNoPacket");
|
||||
hasSuperVanishOrPremiumVanish = pluginManager.getPlugin("SuperVanish") != null || pluginManager.getPlugin("PremiumVanish") != null;
|
||||
hasSuperVanishOrPremiumVanish = pluginManager.isPluginEnabled("SuperVanish") || pluginManager.isPluginEnabled("PremiumVanish");
|
||||
|
||||
int initSuccess = InitBot(true);
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ public class Utils {
|
|||
}
|
||||
|
||||
// For SuperVanish / PremiumVanish
|
||||
if(VanishAPI.getPlugin() != null) {
|
||||
if(hasSuperVanishOrPremiumVanish) {
|
||||
//getPluginLogger().info("Checking via SV if " + player.getDisplayName() + " is vanished: " + VanishAPI.isInvisible(player));
|
||||
//getPluginLogger().info("Checking via SV for list of vanished players: " + VanishAPI.getAllInvisiblePlayers());
|
||||
if(VanishAPI.isInvisible(player)) return true;
|
||||
|
|
|
@ -10,5 +10,5 @@ public class VersionInfo
|
|||
return "v." + getVersion();
|
||||
}
|
||||
|
||||
private static String version = "1.4.8";
|
||||
private static String version = "1.5.0";
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
name: DiscordWhitelister
|
||||
version: 1.4.8
|
||||
version: 1.5.0
|
||||
api-version: 1.17
|
||||
author: Joe Shimell
|
||||
main: uk.co.angrybee.joe.DiscordWhitelister
|
||||
description: Discord Whitelister.
|
||||
|
|
Loading…
Reference in New Issue