diff --git a/pom.xml b/pom.xml index 2403084d..141bd2a9 100644 --- a/pom.xml +++ b/pom.xml @@ -395,6 +395,10 @@ com.github.benmanes.caffeine fr.xephi.authme.libs.com.github.benmanes.caffeine + + com.github.puregero.multilib + fr.xephi.authme.libs.com.github.puregero.multilib + @@ -625,6 +629,12 @@ + + + clojars + https://repo.clojars.org + + dmulloy2-repo-releases @@ -1172,6 +1182,14 @@ compile + + + com.github.puregero + multilib + 1.1.13 + compile + + org.xerial diff --git a/src/main/java/fr/xephi/authme/datasource/H2.java b/src/main/java/fr/xephi/authme/datasource/H2.java index 94b28f58..161fd1c2 100644 --- a/src/main/java/fr/xephi/authme/datasource/H2.java +++ b/src/main/java/fr/xephi/authme/datasource/H2.java @@ -29,7 +29,7 @@ import static fr.xephi.authme.datasource.SqlDataSourceUtils.logSqlException; /** * H2 data source. */ -@SuppressWarnings({"checkstyle:AbbreviationAsWordInName"}) // Justification: Class name cannot be changed anymore +@SuppressWarnings({"all"}) // Justification: Class name cannot be changed anymore public class H2 extends AbstractSqlDataSource { private final ConsoleLogger logger = ConsoleLoggerFactory.get(H2.class); diff --git a/src/main/java/fr/xephi/authme/listener/ListenerService.java b/src/main/java/fr/xephi/authme/listener/ListenerService.java index 073b3975..81615d98 100644 --- a/src/main/java/fr/xephi/authme/listener/ListenerService.java +++ b/src/main/java/fr/xephi/authme/listener/ListenerService.java @@ -1,5 +1,6 @@ package fr.xephi.authme.listener; +import com.github.puregero.multilib.MultiLib; import fr.xephi.authme.AuthMe; import fr.xephi.authme.api.v3.AuthMeApi; import fr.xephi.authme.data.auth.PlayerCache; @@ -81,7 +82,11 @@ class ListenerService implements SettingsDependent { */ public boolean shouldCancelEvent(Player player) { - + if (MultiLib.isMultiPaper()) { + if (MultiLib.isExternalPlayer(player)) { + return false; + } + } return player != null && !checkAuth(player.getName()) && !PlayerUtils.isNpc(player); } public boolean shouldCancelInvEvent(Player player) {