Merge pull request #546 from Pieter12345/master

Fix NPE in entity_spec for Enderman
EngineHub · Jan 22, 2020 · 298ed5c · 298ed5c
2 parents 475ae05 + a6b0edb
commit 298ed5c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCEnderman.java b/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCEnderman.java
@@ -18,7 +18,8 @@ public BukkitMCEnderman(Entity ent) {
 
 	@Override
 	public MCBlockData getCarriedMaterial() {
-		return new BukkitMCBlockData(e.getCarriedBlock());
+		BlockData data = e.getCarriedBlock();
+		return (data == null ? null : new BukkitMCBlockData(data));
 	}
 
 	@Override

diff --git a/src/main/java/com/laytonsmith/abstraction/entities/MCEnderman.java b/src/main/java/com/laytonsmith/abstraction/entities/MCEnderman.java
@@ -5,6 +5,10 @@
 
 public interface MCEnderman extends MCLivingEntity {
 
+	/**
+	 * Gets the data of the block that the Enderman is carrying.
+	 * @return {@link MCBlockData} containing the carried block, or {@code null} if none.
+	 */
 	MCBlockData getCarriedMaterial();
 
 	void setCarriedMaterial(MCBlockData held);

diff --git a/src/main/java/com/laytonsmith/core/functions/EntityManagement.java b/src/main/java/com/laytonsmith/core/functions/EntityManagement.java
@@ -1839,7 +1839,8 @@ public Mixed exec(Target t, Environment environment, Mixed... args) throws Confi
 				case ENDERMAN:
 					MCEnderman enderman = (MCEnderman) entity;
 					MCBlockData carried = enderman.getCarriedMaterial();
-					specArray.set(entity_spec.KEY_ENDERMAN_CARRIED, new CString(carried.getMaterial().getName(), t), t);
+					specArray.set(entity_spec.KEY_ENDERMAN_CARRIED,
+							(carried == null ? CNull.NULL : new CString(carried.getMaterial().getName(), t)), t);
 					break;
 				case EVOKER_FANGS:
 					MCEvokerFangs fangs = (MCEvokerFangs) entity;