Travis CI - more WG refactoring

rlf · Dec 30, 2014 · e8f9ade · e8f9ade
1 parent 9533008
commit e8f9ade
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,10 +7,11 @@ cache:
 env:
   global:
     secure: dGzZ9hl0ezUCYs72+Z4LUgtny0qsUn3HibpBKo4hriRPMY8EQqaJfi1ZDQTKr3ctjJMtQtcgnlC0BujEV+1W2tObjSJsCAdEbzKYZijwRXSK5jT1sua3EQScKYelpv0z4fd9LIYJJ95xwXMNMmAFSjdu3fRDkxtGgIIKbka8YiE=
-after_success:
-  - 'REPO_URI=repos/rlf/uSkyBlock/releases'
-  - 'RELEASEID=814169'
-  - 'ARTIFACT=uSkyBlock.jar'
-  - 'ASSETID=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" "https://api.github.com/${REPO_URI}/${RELEASEID}/assets" | jq ".[0].id")'
-  - 'curl -XDELETE -s -H "Authorization: token ${GITHUB_TOKEN}" "https://api.github.com/${REPO_URI}/assets/${ASSETID}"'
-  - 'curl -XPOST -s -H "Authorization: token ${GITHUB_TOKEN}" -H "Content-Type: application/octet-stream" --data-binary @target/${ARTIFACT} "https://uploads.github.com/${REPO_URI}/814169/assets?name=${ARTIFACT}"'
+deploy:
+  provider: releases
+  api-key: ${GITHUB_TOKEN}
+  file: target/uSkyBlock.jar
+  skip_cleanup: true
+  on:
+    tags: true
+    all_branches: true
diff --git a/src/main/java/us/talabrek/ultimateskyblock/handler/WorldGuardHandler.java b/src/main/java/us/talabrek/ultimateskyblock/handler/WorldGuardHandler.java
@@ -176,4 +176,9 @@ public static String getRegionAt(Location location) {
         }
         return null;
     }
+
+    public static void removeIslandRegion(String islandName) {
+        RegionManager regionManager = getWorldGuard().getRegionManager(uSkyBlock.getSkyBlockWorld());
+        regionManager.removeRegion(islandName + "island");
+    }
 }
diff --git a/src/main/java/us/talabrek/ultimateskyblock/uSkyBlock.java b/src/main/java/us/talabrek/ultimateskyblock/uSkyBlock.java
@@ -448,8 +448,7 @@ public void deletePlayerIsland(final String player) {
         final PlayerInfo pi = activePlayers.containsKey(player) ? activePlayers.get(player) : new PlayerInfo(player);
         orphaned.push(pi.getIslandLocation());
         islandLogic.clearIsland(pi.getIslandLocation());
-        RegionManager regionManager = WorldGuardHandler.getWorldGuard().getRegionManager(getSkyBlockWorld());
-        regionManager.removeRegion(player + "Island");
+        WorldGuardHandler.removeIslandRegion(pi.locationForParty());
         String islandLocation = pi.locationForParty();
         islandLogic.deleteIslandConfig(islandLocation);
         pi.removeFromIsland();
@@ -905,14 +904,13 @@ public void removeActivePlayer(final String player) {
     }
 
     public PlayerInfo loadPlayerData(Player player) {
+        uSkyBlock.log(Level.INFO, "Loading player data for " + player.getName());
         final PlayerInfo pi = loadPlayerInfo(player.getName());
         if (pi.getHasIsland()) {
-            IslandInfo islandInfo = islandLogic.getIslandInfo(pi);
             WorldGuardHandler.protectIsland(player, pi);
             islandLogic.clearFlatland(player, pi.getIslandLocation(), 200);
         }
         addActivePlayer(player.getName(), pi);
-        uSkyBlock.log(Level.INFO, "Loaded player file for " + player.getName());
         return pi;
     }