From 92c4d7a7e20d421edf5087ffe728f52c1ad36893 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Thu, 20 Jan 2022 20:52:37 +0100
Subject: [PATCH] Fix Constants

Signed-off-by: yoyosource <yoyosource@nidido.de>
---
 .../features/script/variables/Constants.java  | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/script/variables/Constants.java b/BauSystem_Main/src/de/steamwar/bausystem/features/script/variables/Constants.java
index bda3bf50..ed242ace 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/script/variables/Constants.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/script/variables/Constants.java
@@ -10,6 +10,7 @@ import de.steamwar.bausystem.region.flags.flagvalues.TNTMode;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.meta.ItemMeta;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,7 +27,8 @@ public class Constants {
     private static class ConstantDoubleValue extends Value.DoubleValue {
 
         private Supplier<Double> doubleSupplier;
-        private Consumer<Double> doubleConsumer = ignored -> {};
+        private Consumer<Double> doubleConsumer = ignored -> {
+        };
 
         public ConstantDoubleValue(Supplier<Double> doubleSupplier) {
             super(doubleSupplier.get());
@@ -73,7 +75,8 @@ public class Constants {
     private static class ConstantLongValue extends Value.LongValue {
 
         private Supplier<Long> longSupplier;
-        private Consumer<Long> longConsumer = ignored -> {};
+        private Consumer<Long> longConsumer = ignored -> {
+        };
 
         public ConstantLongValue(Supplier<Long> longSupplier) {
             super(longSupplier.get());
@@ -120,7 +123,8 @@ public class Constants {
     private static class ConstantBooleanValue extends Value.BooleanValue {
 
         private Supplier<Boolean> booleanSupplier;
-        private Consumer<Boolean> booleanConsumer = ignored -> {};
+        private Consumer<Boolean> booleanConsumer = ignored -> {
+        };
 
         public ConstantBooleanValue(Supplier<Boolean> booleanSupplier) {
             super(booleanSupplier.get());
@@ -167,7 +171,8 @@ public class Constants {
     private static class ConstantStringValue extends Value.StringValue {
 
         private Supplier<String> stringSupplier;
-        private Consumer<String> stringConsumer = ignored -> {};
+        private Consumer<String> stringConsumer = ignored -> {
+        };
 
         public ConstantStringValue(Supplier<String> stringSupplier) {
             super(stringSupplier.get());
@@ -281,10 +286,22 @@ public class Constants {
             return new ConstantStringValue(() -> player.getInventory().getItemInOffHand().getType().name());
         });
         CONSTANTS.put("materialname", player -> {
-            return new ConstantStringValue(() -> player.getInventory().getItemInMainHand().getItemMeta().getDisplayName());
+            return new ConstantStringValue(() -> {
+                ItemMeta itemMeta = player.getInventory().getItemInMainHand().getItemMeta();
+                if (itemMeta == null) {
+                    return "";
+                }
+                return itemMeta.getDisplayName();
+            });
         });
         CONSTANTS.put("offmaterialname", player -> {
-            return new ConstantStringValue(() -> player.getInventory().getItemInOffHand().getItemMeta().getDisplayName());
+            return new ConstantStringValue(() -> {
+                ItemMeta itemMeta = player.getInventory().getItemInOffHand().getItemMeta();
+                if (itemMeta == null) {
+                    return "";
+                }
+                return itemMeta.getDisplayName();
+            });
         });
         CONSTANTS.put("region-type", player -> {
             Region region = Region.getRegion(player.getLocation());