NullPointer issue

AbstractionMC · Mar 28, 2024 · 3a34e16 · 3a34e16
1 parent 61418a6
commit 3a34e16
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/net/rotgruengelb/landscape/block/entity/ZoneBlockBlockEntity.java b/src/main/java/net/rotgruengelb/landscape/block/entity/ZoneBlockBlockEntity.java
@@ -45,7 +45,7 @@ public class ZoneBlockBlockEntity extends BlockEntity implements BlockEntityProv
 	private ZoneBlockMode mode;
 	private boolean showZones = false;
 	private boolean powered;
-	@NotNull private RuleSet ruleSet = RuleSet.of(AvailableRuleSets.EMPTY_RULESET);
+	private RuleSet ruleSet = RuleSet.of(AvailableRuleSets.EMPTY_RULESET);
 	private int priority = 0;
 	private List<BlockZone> zones = new ArrayList<>();
 
@@ -216,6 +216,9 @@ public List<BlockZone> getZones(boolean wantRaw) {
 	}
 
 	public @NotNull RuleSet getRuleSet() {
+		if (ruleSet == null) {
+			return RuleSet.of(AvailableRuleSets.EMPTY_RULESET);
+		}
 		return this.ruleSet;
 	}
 
@@ -228,7 +231,7 @@ public void setRuleSet(RuleSet ruleSet) {
 	}
 
 	public RuleSet getRuleSet(boolean useMode) {
-		RuleSet returnRuleSet = this.ruleSet;
+		RuleSet returnRuleSet = this.ruleSet != null ? this.ruleSet : RuleSet.of(AvailableRuleSets.EMPTY_RULESET);
 		RuleSet gotRuleSet = MODE_RULESETS.get(this.mode);
 		if (useMode && gotRuleSet != null) {
 			returnRuleSet = gotRuleSet;