keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Clean up capability checking for entities (#4591)

Browse source
This commit is contained in:
Ben Staddon 2017-12-14 06:56:01 +00:00 committed by mezz
parent 88b49f4a36
commit eda4fb231b
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
patches/minecraft/net/minecraft/entity/Entity.java.patch
View file

@ -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_) 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_); EnchantmentHelper.func_151385_b(p_174815_1_, p_174815_2_);
} }
@ -318,9 +318,7 @@
+ @Override + @Override
+ public boolean hasCapability(net.minecraftforge.common.capabilities.Capability<?> capability, @Nullable net.minecraft.util.EnumFacing facing) + public boolean hasCapability(net.minecraftforge.common.capabilities.Capability<?> capability, @Nullable net.minecraft.util.EnumFacing facing)
+ { + {
+ if (getCapability(capability, facing) != null) + return capabilities != null && capabilities.hasCapability(capability, facing);
+ return true;
+ return capabilities == null ? false : capabilities.hasCapability(capability, facing);
+ } + }
+ +
+ @Override + @Override