From ea904c6891fc73ffed3888863c2e2dbeb01a8b6c Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Sun, 3 Mar 2019 00:09:24 -0700
Subject: [PATCH] Fix being able to fly on islands you aren't meant to

---
 .../goodandevil/skyblock/island/IslandManager.java  |  2 +-
 .../me/goodandevil/skyblock/listeners/Teleport.java | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/main/java/me/goodandevil/skyblock/island/IslandManager.java b/src/main/java/me/goodandevil/skyblock/island/IslandManager.java
index 4cf16b85..73f1187a 100644
--- a/src/main/java/me/goodandevil/skyblock/island/IslandManager.java
+++ b/src/main/java/me/goodandevil/skyblock/island/IslandManager.java
@@ -1113,7 +1113,7 @@ public class IslandManager {
         UpgradeManager upgradeManager = skyblock.getUpgradeManager();
 
         List<Upgrade> flyUpgrades = upgradeManager.getUpgrades(Upgrade.Type.Fly);
-        if (flyUpgrades != null && flyUpgrades.size() > 0 && flyUpgrades.get(0).isEnabled() && island.isUpgrade(Upgrade.Type.Fly)) {
+        if (flyUpgrades != null && flyUpgrades.size() > 0 && flyUpgrades.get(0).isEnabled() && island.isUpgrade(Upgrade.Type.Fly) && player.getGameMode() != GameMode.CREATIVE) {
             Bukkit.getServer().getScheduler().runTask(skyblock, new Runnable() {
                 @Override
                 public void run() {
diff --git a/src/main/java/me/goodandevil/skyblock/listeners/Teleport.java b/src/main/java/me/goodandevil/skyblock/listeners/Teleport.java
index ce69d0ca..219cc735 100644
--- a/src/main/java/me/goodandevil/skyblock/listeners/Teleport.java
+++ b/src/main/java/me/goodandevil/skyblock/listeners/Teleport.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.util.UUID;
 
 import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
@@ -53,14 +54,7 @@ public class Teleport implements Listener {
         Config config = fileManager.getConfig(new File(skyblock.getDataFolder(), "language.yml"));
         FileConfiguration configLoad = config.getFileConfiguration();
         
-        // Needs to be called after the teleport occurs otherwise the player location hasn't updated yet
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                islandManager.removeUpgrades(player, false);
-            }
-        }.runTaskLater(SkyBlock.getInstance(), 1);
-
+        islandManager.removeUpgrades(player, true);
         islandManager.loadPlayer(player);
 
         if (worldManager.isIslandWorld(player.getWorld())) {
@@ -94,7 +88,6 @@ public class Teleport implements Listener {
             
             if (island != null) {
                 islandManager.giveUpgrades(player, island);
-                islandManager.giveFly(player, island);
                 if (!island.getOwnerUUID().equals(playerData.getOwner())) {
                     if (!player.hasPermission("fabledskyblock.bypass") && !player.hasPermission("fabledskyblock.bypass.*")
                             && !player.hasPermission("fabledskyblock.*")) {
@@ -114,7 +107,7 @@ public class Teleport implements Listener {
                             messageManager.sendMessage(player,
                                     configLoad.getString("Island.Visit.Banned.Teleport.Message"));
                             soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
-
+                            
                             return;
                         }
                     }