Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-09-29 23:17:26 +02:00
Code Issues Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Brianna O'Keefe 2019-02-17 03:19:24 -05:00
parent dce19a136b
commit 1d9c067abf
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
variables:
name: "FabledSkyBlock"
path: "/builds/Songoda/SkyBlock/"
version: "Build-67"
version: "Build-68"
build:
stage: build

2
src/main/java/me/goodandevil/skyblock/generator/GeneratorManager.java
View File

@ -5,6 +5,7 @@ import me.goodandevil.skyblock.config.FileManager.Config;
import me.goodandevil.skyblock.utils.version.Materials;
import me.goodandevil.skyblock.utils.version.NMSUtil;
import me.goodandevil.skyblock.utils.version.Sounds;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
@ -232,7 +233,6 @@ public class GeneratorManager {
public void generateBlock(Generator generator, Block block) {
block.setType(Material.AIR);
Materials materials = getRandomMaterials(generator);
if (materials == null) return;

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

@ -124,6 +124,28 @@ public class Block implements Listener {
|| event.getBlock().getRelative(blockFaceList).getType() == Materials.LAVA
.parseMaterial()) {
liquid = event.getBlock().getRelative(blockFaceList);
for (Player all : Bukkit.getOnlinePlayers()) {
if (!LocationUtil.isLocationAtLocationRadius(all.getLocation(),
island.getLocation(world, IslandEnvironment.Island), island.getRadius())) continue;
int i = generatorManager.getGeneratorStorage().size() - 1;
Generator generator = generatorManager.getGeneratorStorage().get(i);
if (generator.isPermission()) {
if (!all.hasPermission(generator.getPermission())
&& !all.hasPermission("fabledskyblock.generator.*")
&& !all.hasPermission("fabledskyblock.*")) {
continue;
}
}
Bukkit.getScheduler().scheduleSyncDelayedTask(skyblock, () -> {
generatorManager.generateBlock(generator, block);
}, 10L);
return;
}
break;
}
}