Anvilcraft/buildcraft
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix #2995

Browse source
This commit is contained in:
asiekierka 2015-09-19 14:39:11 +02:00
parent ed2e97044b
commit 31950ca099
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/buildcraft/robotics/EntityRobot.java
View file

@ -22,6 +22,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityFallingBlock;
import net.minecraft.entity.monster.IMob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
@ -861,7 +862,7 @@ public class EntityRobot extends EntityRobotBase implements
public boolean attackEntityFrom(DamageSource source, float f) {
// Ignore hits from mobs or when docked.
Entity src = source.getSourceOfDamage();
if (!(src instanceof IMob) && currentDockingStation == null) {
if (src != null && !(src instanceof EntityFallingBlock) && !(src instanceof IMob) && currentDockingStation == null) {
if (ForgeHooks.onLivingAttack(this, source, f)) {
return false;
}