From eda4fb231bc0e7bb3387d3a8458cc678932a74f7 Mon Sep 17 00:00:00 2001 From: Ben Staddon Date: Thu, 14 Dec 2017 06:56:01 +0000 Subject: [PATCH] Clean up capability checking for entities (#4591) --- patches/minecraft/net/minecraft/entity/Entity.java.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/patches/minecraft/net/minecraft/entity/Entity.java.patch b/patches/minecraft/net/minecraft/entity/Entity.java.patch index 33d64cdd9a..1ee1d83913 100644 --- a/patches/minecraft/net/minecraft/entity/Entity.java.patch +++ b/patches/minecraft/net/minecraft/entity/Entity.java.patch @@ -177,7 +177,7 @@ } public boolean func_174816_a(Explosion p_174816_1_, World p_174816_2_, BlockPos p_174816_3_, IBlockState p_174816_4_, float p_174816_5_) -@@ -2901,6 +2929,185 @@ +@@ -2901,6 +2929,183 @@ EnchantmentHelper.func_151385_b(p_174815_1_, p_174815_2_); } @@ -318,9 +318,7 @@ + @Override + public boolean hasCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable net.minecraft.util.EnumFacing facing) + { -+ if (getCapability(capability, facing) != null) -+ return true; -+ return capabilities == null ? false : capabilities.hasCapability(capability, facing); ++ return capabilities != null && capabilities.hasCapability(capability, facing); + } + + @Override