Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-07-20 18:54:44 +02:00
Code Issues Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Brianna O'Keefe 2019-01-24 18:02:56 -05:00
parent 33aacdcd9c
commit 37c76fe134
1 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/me/goodandevil/skyblock/listeners/Block.java
View File

@ -232,22 +232,28 @@ public class Block implements Listener {
GeneratorManager generatorManager = skyblock.getGeneratorManager(); GeneratorManager generatorManager = skyblock.getGeneratorManager();
WorldManager worldManager = skyblock.getWorldManager(); WorldManager worldManager = skyblock.getWorldManager();
if (worldManager.isIslandWorld(block.getWorld())) { if (!worldManager.isIslandWorld(block.getWorld())) return;
if (block.getType() == Material.ICE || block.getType() == Material.SNOW) { if (block.getType() == Material.ICE || block.getType() == Material.SNOW) {
if (!skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml")) if (!skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml"))
.getFileConfiguration().getBoolean("Island.Weather.IceAndSnow")) { .getFileConfiguration().getBoolean("Island.Weather.IceAndSnow")) {
event.setCancelled(true); event.setCancelled(true);
} }
} else { return;
}
if (generatorManager != null && generatorManager.getGenerators().size() > 0) { if (generatorManager != null && generatorManager.getGenerators().size() > 0) {
org.bukkit.Location location = event.getBlock().getLocation(); org.bukkit.Location location = event.getBlock().getLocation();
for (Player all : Bukkit.getOnlinePlayers()) { for (Player all : Bukkit.getOnlinePlayers()) {
if (playerDataManager.hasPlayerData(all)) { if (!playerDataManager.hasPlayerData(all)) continue;
PlayerData playerData = playerDataManager.getPlayerData(all); PlayerData playerData = playerDataManager.getPlayerData(all);
if (playerData.getGenerator() != null) {
if (playerData.getGenerator() == null) continue;
GeneratorLocation generatorLocation = playerData.getGenerator(); GeneratorLocation generatorLocation = playerData.getGenerator();
if (generatorLocation.getWorld() == worldManager.getIslandWorld(block.getWorld())) {
if (generatorLocation.getWorld() != worldManager.getIslandWorld(block.getWorld())) continue;
if (location.getBlockX() == generatorLocation.getBlockX() if (location.getBlockX() == generatorLocation.getBlockX()
&& location.getBlockY() == generatorLocation.getBlockY() && location.getBlockY() == generatorLocation.getBlockY()
&& location.getBlockZ() == generatorLocation.getBlockZ()) { && location.getBlockZ() == generatorLocation.getBlockZ()) {
@ -259,11 +265,6 @@ public class Block implements Listener {
} }
} }
} }
}
}
}
}
}
@EventHandler @EventHandler
public void onBlockFromTo(BlockFromToEvent event) { public void onBlockFromTo(BlockFromToEvent event) {