1.15 port

This commit is contained in:
yueh
2020-05-18 14:02:45 +02:00
parent 0ea86c939c
commit 16d6d55d7f
630 changed files with 4211 additions and 12664 deletions
@@ -19,7 +19,7 @@
package appeng.items.tools.powered;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.LivingEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.util.math.AxisAlignedBB;
@@ -41,7 +41,7 @@ public class ToolChargedStaff extends AEBasePoweredItem
}
@Override
public boolean hitEntity( final ItemStack item, final EntityLivingBase target, final EntityLivingBase hitter )
public boolean hitEntity( final ItemStack item, final LivingEntity target, final LivingEntity hitter )
{
if( this.getAECurrentPower( item ) > 300 )
{