Don't apply empty pack if the player does have none

Phoenix616 · Aug 17, 2018 · 025485c · 025485c
1 parent 9d9ea87
commit 025485c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/core/src/main/java/de/themoep/resourcepacksplugin/core/PackManager.java b/core/src/main/java/de/themoep/resourcepacksplugin/core/PackManager.java
@@ -540,6 +540,9 @@ public boolean setPack(UUID playerId, ResourcePack pack, boolean temporary) {
         if (pack != null && pack.equals(prev)) {
             return false;
         }
+        if (prev == null && (pack == null || pack.equals(getEmptyPack()))) {
+            return false;
+        }
         IResourcePackSendEvent sendEvent = plugin.callPackSendEvent(playerId, pack);
         if (sendEvent.isCancelled()) {
             plugin.getLogger().log(plugin.getLogLevel(), "Pack send event for " + playerId + " was cancelled!");