Skip to content

Commit 7eae62c

Browse files
author
Dalton Caron
committed
Bug fix for issue 1.
1 parent 4b86036 commit 7eae62c

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>xyz.dcaron.bridges</groupId>
88
<artifactId>RetractableBridges</artifactId>
9-
<version>1.0-SNAPSHOT</version>
9+
<version>1.1-SNAPSHOT</version>
1010

1111
<name>RetractableBridges</name>
1212
<!-- FIXME change it to the project's website -->

src/main/java/xyz/dcaron/bridges/BridgeOptions.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package xyz.dcaron.bridges;
22

33
import java.util.Set;
4+
import java.util.function.Function;
5+
import java.util.logging.Level;
46
import java.util.stream.Collectors;
57

68
import org.bukkit.Material;
@@ -27,13 +29,22 @@ public class BridgeOptions {
2729

2830
public BridgeOptions(final FileConfiguration configuration) {
2931

32+
final Function<String, Material> warnForNullStringToMaterialFunc = (materialString) -> {
33+
final Material material = Material.getMaterial(materialString);
34+
if (material == null) {
35+
BridgesPlugin.log("Failed to parse block " + materialString + " from the configuration", Level.WARNING);
36+
}
37+
return material;
38+
};
39+
3040
moveEntitiesOnBridge = configuration.getBoolean("moveEntitiesOnBridge");
3141

3242
ticksPerBridgeMovement = configuration.getInt("ticksPerBridgeMovement");
3343

3444
bridgeMaterials = configuration.getStringList("bridgeMaterials")
3545
.stream()
36-
.map(material -> Material.getMaterial(material))
46+
.map(warnForNullStringToMaterialFunc)
47+
.filter(material -> material != null)
3748
.collect(Collectors.toUnmodifiableSet());
3849

3950
maximumMultiplePowerBoost = configuration.getInt("maximumMultiplePowerBoost");
@@ -42,7 +53,8 @@ public BridgeOptions(final FileConfiguration configuration) {
4253

4354
bridgePowerBlocks = configuration.getStringList("bridgePowerBlocks")
4455
.stream()
45-
.map(material -> Material.getMaterial(material))
56+
.map(warnForNullStringToMaterialFunc)
57+
.filter(material -> material != null)
4658
.collect(Collectors.toUnmodifiableSet());
4759

4860
allPowerBlocksAllowed = bridgePowerBlocks.isEmpty();

0 commit comments

Comments
 (0)