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

Multiple generator fixes.

Browse Source
This commit is contained in:
Brianna O'Keefe 2019-02-01 14:42:26 -05:00
parent 504f0ff57f
commit 63441f1d6c
4 changed files with 712 additions and 759 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ public class GeneratorManager {
Materials materials = Materials.fromString(materialList); Materials materials = Materials.fromString(materialList);
if (materials != null) { if (materials != null) {
generatorMaterials.add(new GeneratorMaterial(materials, configLoad.getInt( generatorMaterials.add(new GeneratorMaterial(materials, configLoad.getDouble(
"Generators." + generatorList + ".Materials." + materialList + ".Chance"))); "Generators." + generatorList + ".Materials." + materialList + ".Chance")));
} }
} }

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

@ -7,7 +7,7 @@ public class GeneratorMaterial {
private Materials materials; private Materials materials;
private double chance; private double chance;
public GeneratorMaterial(Materials materials, int chance) { public GeneratorMaterial(Materials materials, double chance) {
this.materials = materials; this.materials = materials;
this.chance = chance; this.chance = chance;
} }

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

@ -312,6 +312,10 @@ public class Block implements Listener {
return; return;
} }
Material material = event.getBlock().getType();
if (material != Material.WATER && material != Material.LAVA) return;
if (generatorManager != null && generatorManager.getGenerators().size() > 0) { if (generatorManager != null && generatorManager.getGenerators().size() > 0) {
Island island = islandManager.getIslandAtLocation(event.getBlock().getLocation()); Island island = islandManager.getIslandAtLocation(event.getBlock().getLocation());
IslandWorld world = worldManager.getIslandWorld(event.getBlock().getWorld()); IslandWorld world = worldManager.getIslandWorld(event.getBlock().getWorld());

1463
src/main/java/me/goodandevil/skyblock/menus/admin/Generator.java
View File

File diff suppressed because it is too large Load Diff