Fix primary pack being overwritten by the secondary ones

Author: Phoenix616

core/src/main/java/de/themoep/resourcepacksplugin/core/PackManager.java

@@ -352,14 +352,15 @@ public ResourcePack getApplicablePack(UUID playerId, String serverName) {
             status = checkPack(playerId, serverPack, status);
             if(status == IResourcePackSelectEvent.Status.SUCCESS) {
                 pack = serverPack;
-            }
-            List<String> serverSecondary = getServerSecondary(serverName);
-            for(String secondaryName : serverSecondary) {
-                ResourcePack secondaryPack = getByName(secondaryName);
-                status = checkPack(playerId, secondaryPack, status);
-                if(status == IResourcePackSelectEvent.Status.SUCCESS) {
-                    pack = secondaryPack;
-                    break;
+            } else {
+                List<String> serverSecondary = getServerSecondary(serverName);
+                for(String secondaryName : serverSecondary) {
+                    ResourcePack secondaryPack = getByName(secondaryName);
+                    status = checkPack(playerId, secondaryPack, status);
+                    if(status == IResourcePackSelectEvent.Status.SUCCESS) {
+                        pack = secondaryPack;
+                        break;
+                    }
                 }
             }
         }
@@ -368,14 +369,15 @@ public ResourcePack getApplicablePack(UUID playerId, String serverName) {
             status = checkPack(playerId, globalPack, status);
             if(status == IResourcePackSelectEvent.Status.SUCCESS) {
                 pack = globalPack;
-            }
-            List<String> globalSecondary = getGlobalSecondary();
-            for(String secondaryName : globalSecondary) {
-                ResourcePack secondaryPack = getByName(secondaryName);
-                status = checkPack(playerId, secondaryPack, status);
-                if(status == IResourcePackSelectEvent.Status.SUCCESS) {
-                    pack = secondaryPack;
-                    break;
+            } else {
+                List<String> globalSecondary = getGlobalSecondary();
+                for(String secondaryName : globalSecondary) {
+                    ResourcePack secondaryPack = getByName(secondaryName);
+                    status = checkPack(playerId, secondaryPack, status);
+                    if(status == IResourcePackSelectEvent.Status.SUCCESS) {
+                        pack = secondaryPack;
+                        break;
+                    }
                 }
             }
         }