Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-11-07 03:00:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix being able to fly on islands you aren't meant to

Browse Source
This commit is contained in:
Esophose 2019-03-03 00:09:24 -07:00
parent 9133a1db73
commit ea904c6891
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/goodandevil/skyblock/island/IslandManager.java
View File

@ -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() {

13
src/main/java/me/goodandevil/skyblock/listeners/Teleport.java
View File

@ -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;
}
}