Upstream/RandomTeleport
1
0
Fork 0
mirror of https://github.com/Phoenix616/RandomTeleport.git synced 2024-11-22 02:25:38 +01:00
Code Issues Projects Releases Wiki Activity

Fix safe vs. save error

Browse Source
This commit is contained in:
Phoenix616 2021-02-16 19:50:17 +01:00
parent c893b45ddc
commit 9dfc62f9f5
No known key found for this signature in database
GPG Key ID: 40E2321E71738EB0
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
randomteleport-plugin/src/main/java/de/themoep/randomteleport/RandomTeleport.java
View File

@ -79,8 +79,8 @@ public class RandomTeleport extends JavaPlugin implements RandomTeleportAPI {
private ValidatorRegistry locationValidators = new ValidatorRegistry();
private List<OptionParser> optionParsers = new ArrayList<>();
private Material[] saveBlocks;
private Material[] unsaveBlocks;
private Material[] safeBlocks;
private Material[] unsafeBlocks;
private Set<String> signVariables;
public void onEnable() {
@ -95,7 +95,13 @@ public class RandomTeleport extends JavaPlugin implements RandomTeleportAPI {
public void loadConfig() {
saveDefaultConfig();
reloadConfig();
saveBlocks = getConfig().getStringList("save-blocks").stream()
List<String> safeBlocksList;
if (getConfig().contains("save-blocks")) {
safeBlocksList = getConfig().getStringList("save-blocks");
} else {
safeBlocksList = getConfig().getStringList("safe-blocks");
}
safeBlocks = safeBlocksList.stream()
.map(s -> {
Material mat = Material.matchMaterial(s);
if (mat == null) {
@ -105,7 +111,13 @@ public class RandomTeleport extends JavaPlugin implements RandomTeleportAPI {
})
.filter(Objects::nonNull)
.toArray(Material[]::new);
unsaveBlocks = getConfig().getStringList("unsave-blocks").stream()
List<String> unsafeBlocksList;
if (getConfig().contains("unsave-blocks")) {
unsafeBlocksList = getConfig().getStringList("unsave-blocks");
} else {
unsafeBlocksList = getConfig().getStringList("unsafe-blocks");
}
unsafeBlocks = unsafeBlocksList.stream()
.map(s -> {
Material mat = Material.matchMaterial(s);
if (mat == null) {
@ -188,13 +200,13 @@ public class RandomTeleport extends JavaPlugin implements RandomTeleportAPI {
if ("regions".equalsIgnoreCase(args[0])) {
searcher.getValidators().remove("protection");
} else if ("blocks".equalsIgnoreCase(args[0])) {
searcher.getValidators().add(new BlockValidator(false, unsaveBlocks));
searcher.getValidators().add(new BlockValidator(false, unsafeBlocks));
} else {
throw new NotFoundException(args[0]);
}
} else {
searcher.getValidators().remove("protection");
searcher.getValidators().add(new BlockValidator(false, unsaveBlocks));
searcher.getValidators().add(new BlockValidator(false, unsafeBlocks));
}
return true;
}));
@ -248,7 +260,7 @@ public class RandomTeleport extends JavaPlugin implements RandomTeleportAPI {
locationValidators.add(new WorldborderValidator());
locationValidators.add(new HeightValidator());
locationValidators.add(new ProtectionValidator());
locationValidators.add(new BlockValidator(saveBlocks));
locationValidators.add(new BlockValidator(safeBlocks));
}
/**

6
randomteleport-plugin/src/main/resources/config.yml
View File

@ -5,7 +5,7 @@ debug: true
# Delay in ticks between checking chunks when searching
# Blocks to teleport on in normal mode
save-blocks:
safe-blocks:
- sand
- sandstone
- gravel
@ -21,8 +21,8 @@ save-blocks:
- end_stone
- netherrack
# Blocks unsave when in "--force blocks" mode
unsave-blocks:
# Blocks unsafe when in "--force blocks" mode
unsafe-blocks:
- air
- water
- lava