Merge remote-tracking branch 'origin/master'

This commit is contained in:
Vaern 2021-11-28 10:49:41 -08:00
commit c5e0023c07

View File

@ -3271,8 +3271,10 @@ public class ModItems {
syringe_mkunicorn = new ItemSyringe().setUnlocalizedName("syringe_mkunicorn").setFull3D().setCreativeTab(null).setTextureName(RefStrings.MODID + ":syringe_mkunicorn");
iv_empty = new ItemSimpleConsumable().setUseActionServer((stack, user) -> {
ItemSimpleConsumable.giveSoundAndDecrement(stack, user, "hbm:item.syringe", new ItemStack(ModItems.iv_blood));
user.attackEntityFrom(DamageSource.magic, 5F);
if(user.hurtResistantTime <= 0) {
ItemSimpleConsumable.giveSoundAndDecrement(stack, user, "hbm:item.syringe", new ItemStack(ModItems.iv_blood));
user.attackEntityFrom(DamageSource.magic, 5F);
}
}).setUnlocalizedName("iv_empty").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":iv_empty");
iv_blood = new ItemSimpleConsumable().setUseActionServer((stack, user) -> {