From 75f3073cbfc7f7e2fb89b1ed5f4aae820b62dbf4 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Wed, 4 Aug 2021 02:24:11 -0400
Subject: [PATCH] V+

---
 build.gradle                                                | 3 +--
 src/main/java/com/volmit/iris/engine/object/IrisEntity.java | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 917fe9daa..b3da408b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,12 +33,11 @@ plugins {
 }
 
 group 'com.volmit.iris'
-version '1.6'
+version '1.6.1'
 def apiVersion = '1.17'
 def name = 'Iris'
 def main = 'com.volmit.iris.Iris'
 
-
 // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED
 // ==============================================================
 registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins');
diff --git a/src/main/java/com/volmit/iris/engine/object/IrisEntity.java b/src/main/java/com/volmit/iris/engine/object/IrisEntity.java
index 08e592798..eaec31d86 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisEntity.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisEntity.java
@@ -142,6 +142,12 @@ public class IrisEntity extends IrisRegistrant {
 
     public Entity spawn(Engine gen, Location at, RNG rng) {
         Entity e = doSpawn(at);
+
+        if(e == null)
+        {
+            return null;
+        }
+
         e.setCustomName(getCustomName() != null ? C.translateAlternateColorCodes('&', getCustomName()) : null);
         e.setCustomNameVisible(isCustomNameVisible());
         e.setGlowing(isGlowing());