Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2025-02-17 04:02:04 +01:00
Code Issues Projects Releases Wiki Activity

Fix generator delay when using Vault

Browse Source
This commit is contained in:
Fabrizio La Rosa 2020-08-01 22:42:12 +02:00
parent dd3f89221f
commit 68d3624d61
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/songoda/skyblock/listeners/Block.java
View File

@ -40,9 +40,11 @@ import java.util.*;
public class Block implements Listener { public class Block implements Listener {
private final SkyBlock plugin; private final SkyBlock plugin;
private final Set<Location> generatorWaitingLocs;
public Block(SkyBlock plugin) { public Block(SkyBlock plugin) {
this.plugin = plugin; this.plugin = plugin;
this.generatorWaitingLocs = new HashSet<>();
} }
@EventHandler(priority = EventPriority.LOW) @EventHandler(priority = EventPriority.LOW)
@ -427,6 +429,11 @@ public class Block implements Listener {
} }
// Generators // Generators
if(this.generatorWaitingLocs.contains(LocationUtil.toBlockLocation(block.getLocation().clone()))) {
event.setCancelled(true);
return;
}
if (ServerVersion.isServerVersionBelow(ServerVersion.V1_12)) { if (ServerVersion.isServerVersionBelow(ServerVersion.V1_12)) {
CompatibleMaterial material = CompatibleMaterial.getMaterial(block); CompatibleMaterial material = CompatibleMaterial.getMaterial(block);
if (material != CompatibleMaterial.WATER if (material != CompatibleMaterial.WATER
@ -482,11 +489,13 @@ public class Block implements Listener {
OfflinePlayer owner = Bukkit.getServer().getOfflinePlayer(island.getOwnerUUID()); OfflinePlayer owner = Bukkit.getServer().getOfflinePlayer(island.getOwnerUUID());
event.setCancelled(true); event.setCancelled(true);
org.bukkit.World finalWorld = event.getBlock().getWorld(); org.bukkit.World finalWorld = event.getBlock().getWorld();
this.generatorWaitingLocs.add(LocationUtil.toBlockLocation(block.getLocation().clone()));
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
if(plugin.getVaultPermission().playerHas(block.getWorld().getName(), owner, generator.getPermission()) || if(plugin.getVaultPermission().playerHas(block.getWorld().getName(), owner, generator.getPermission()) ||
plugin.getVaultPermission().playerHas(block.getWorld().getName(), owner, "fabledskyblock.generator.*") || plugin.getVaultPermission().playerHas(block.getWorld().getName(), owner, "fabledskyblock.generator.*") ||
plugin.getVaultPermission().playerHas(block.getWorld().getName(), owner, "fabledskyblock.*")) { plugin.getVaultPermission().playerHas(block.getWorld().getName(), owner, "fabledskyblock.*")) {
Bukkit.getScheduler().runTask(plugin, () -> { Bukkit.getScheduler().runTask(plugin, () -> {
this.generatorWaitingLocs.remove(LocationUtil.toBlockLocation(block.getLocation().clone()));
if(worldManager.getIslandWorld(finalWorld).equals(generator.getIsWorld())){ if(worldManager.getIslandWorld(finalWorld).equals(generator.getIsWorld())){
BlockState genState = generatorManager.generateBlock(generator, block); BlockState genState = generatorManager.generateBlock(generator, block);
block.setType(genState.getType()); block.setType(genState.getType());
@ -759,11 +768,13 @@ public class Block implements Listener {
OfflinePlayer owner = Bukkit.getServer().getOfflinePlayer(island.getOwnerUUID()); OfflinePlayer owner = Bukkit.getServer().getOfflinePlayer(island.getOwnerUUID());
event.setCancelled(true); event.setCancelled(true);
org.bukkit.World finalWorld = event.getBlock().getWorld(); org.bukkit.World finalWorld = event.getBlock().getWorld();
this.generatorWaitingLocs.add(LocationUtil.toBlockLocation(block.getLocation().clone()));
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
if(plugin.getVaultPermission().playerHas(block.getWorld().getName(), owner, generator.getPermission()) || if(plugin.getVaultPermission().playerHas(block.getWorld().getName(), owner, generator.getPermission()) ||
plugin.getVaultPermission().playerHas(block.getWorld().getName(), owner, "fabledskyblock.generator.*") || plugin.getVaultPermission().playerHas(block.getWorld().getName(), owner, "fabledskyblock.generator.*") ||
plugin.getVaultPermission().playerHas(block.getWorld().getName(), owner, "fabledskyblock.*")) { plugin.getVaultPermission().playerHas(block.getWorld().getName(), owner, "fabledskyblock.*")) {
Bukkit.getScheduler().runTask(plugin, () -> { Bukkit.getScheduler().runTask(plugin, () -> {
this.generatorWaitingLocs.remove(LocationUtil.toBlockLocation(block.getLocation().clone()));
if(worldManager.getIslandWorld(finalWorld).equals(generator.getIsWorld())){ if(worldManager.getIslandWorld(finalWorld).equals(generator.getIsWorld())){
BlockState genState = generatorManager.generateBlock(generator, block); BlockState genState = generatorManager.generateBlock(generator, block);
block.setType(genState.getType()); block.setType(genState.getType());