flowerpot_contents tag fix

DenizenScript · Aug 26, 2017 · 5755283 · 5755283
1 parent b81e0e5
commit 5755283
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/v1_10_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/BlockHelper_v1_10_R1.java b/v1_10_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/BlockHelper_v1_10_R1.java
@@ -26,7 +26,8 @@ public class BlockHelper_v1_10_R1 implements BlockHelper {
 
     @Override
     public MaterialData getFlowerpotContents(Block block) {
-        return ((FlowerPot) block.getState()).getContents();
+        MaterialData contents = ((FlowerPot) block.getState()).getContents();
+        return contents == null ? new MaterialData(Material.AIR) : contents;
     }
 
     @Override

diff --git a/v1_11_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/BlockHelper_v1_11_R1.java b/v1_11_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/BlockHelper_v1_11_R1.java
@@ -26,7 +26,8 @@ public class BlockHelper_v1_11_R1 implements BlockHelper {
 
     @Override
     public MaterialData getFlowerpotContents(Block block) {
-        return ((FlowerPot) block.getState()).getContents();
+        MaterialData contents = ((FlowerPot) block.getState()).getContents();
+        return contents == null ? new MaterialData(Material.AIR) : contents;
     }
 
     @Override

diff --git a/v1_9_R2/src/main/java/net/aufdemrand/denizen/nms/helpers/BlockHelper_v1_9_R2.java b/v1_9_R2/src/main/java/net/aufdemrand/denizen/nms/helpers/BlockHelper_v1_9_R2.java
@@ -26,7 +26,8 @@ public class BlockHelper_v1_9_R2 implements BlockHelper {
 
     @Override
     public MaterialData getFlowerpotContents(Block block) {
-        return ((FlowerPot) block.getState()).getContents();
+        MaterialData contents = ((FlowerPot) block.getState()).getContents();
+        return contents == null ? new MaterialData(Material.AIR) : contents;
     }
 
     @Override