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

Merge https://gitlab.com/Songoda/fabledskyblock into development

Browse Source
This commit is contained in:
theone1000 2019-10-18 19:41:33 -06:00
commit 33c8bf8ac9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -3,7 +3,7 @@ image: gradle:alpine
variables: variables:
name: "FabledSkyBlock" name: "FabledSkyBlock"
path: "/builds/$CI_PROJECT_PATH" path: "/builds/$CI_PROJECT_PATH"
version: "2.0.4" version: "2.0.5"
before_script: before_script:
- export GRADLE_USER_HOME=`pwd`/.gradle - export GRADLE_USER_HOME=`pwd`/.gradle

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

@ -512,9 +512,10 @@ public class Block implements Listener {
return; return;
GeneratorManager generatorManager = skyblock.getGeneratorManager(); GeneratorManager generatorManager = skyblock.getGeneratorManager();
if(generatorManager == null) return;
List<Generator> generators = Lists.newArrayList(generatorManager.getGenerators()); List<Generator> generators = Lists.newArrayList(generatorManager.getGenerators());
if (generatorManager == null || generators.size() == 0) if(generators == null || generators.isEmpty()) return;
return;
Collections.reverse(generators); // Use the highest generator available Collections.reverse(generators); // Use the highest generator available
// Filter valid players on the island. // Filter valid players on the island.