diff options
| author | md_5 <git@md-5.net> | 2016-03-04 15:50:35 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-03-04 15:50:35 +1100 |
| commit | 7863085a62b75733c4ee2f6b57c5efa519450804 (patch) | |
| tree | 3dc1405830ba2f31e4b26ac7d450bf2813f1faeb /src | |
| parent | 6742811d6973512302f4ff77e9e004d7478c566c (diff) | |
| download | craftbukkit-7863085a62b75733c4ee2f6b57c5efa519450804.tar craftbukkit-7863085a62b75733c4ee2f6b57c5efa519450804.tar.gz craftbukkit-7863085a62b75733c4ee2f6b57c5efa519450804.tar.lz craftbukkit-7863085a62b75733c4ee2f6b57c5efa519450804.tar.xz craftbukkit-7863085a62b75733c4ee2f6b57c5efa519450804.zip | |
SPIGOT-1721: Handle Enderman.getCarriedMaterial when not carrying.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java index b1bf7a46..f602c231 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java @@ -3,6 +3,7 @@ package org.bukkit.craftbukkit.entity; import net.minecraft.server.EntityEnderman; import net.minecraft.server.IBlockData; +import org.bukkit.Material; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.entity.Enderman; @@ -16,7 +17,7 @@ public class CraftEnderman extends CraftMonster implements Enderman { public MaterialData getCarriedMaterial() { IBlockData blockData = getHandle().getCarried(); - return CraftMagicNumbers.getMaterial(blockData.getBlock()).getNewData((byte) blockData.getBlock().toLegacyData(blockData)); + return (blockData == null) ? Material.AIR.getNewData((byte) 0) : CraftMagicNumbers.getMaterial(blockData.getBlock()).getNewData((byte) blockData.getBlock().toLegacyData(blockData)); } public void setCarriedMaterial(MaterialData data) { |