lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.12' into 1.12

Browse source
This commit is contained in:
Nicholas Ignoffo 2019-04-14 08:42:02 -07:00
parent eec64695b5 572d8eff4f
commit d5834a34ba
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
View file

@ -94,14 +94,16 @@ public class ItemSacrificialDagger extends ItemEnum<ItemSacrificialDagger.Dagger
return super.onItemRightClick(world, player, hand); return super.onItemRightClick(world, player, hand);
if (evt.shouldDrainHealth) { if (evt.shouldDrainHealth) {
DamageSourceBloodMagic damageSrc = DamageSourceBloodMagic.INSTANCE;
player.hurtResistantTime = 0; player.hurtResistantTime = 0;
player.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 0.001F); float playerHealth = player.getHealth();
player.setHealth(Math.max(player.getHealth() - 2, 0.0001f)); if (Math.ceil(player.getHealth() - 2) <= 0) {
if (player.getHealth() <= 0.001f) { player.attackEntityFrom(damageSrc, Float.MAX_VALUE);
player.onDeath(DamageSourceBloodMagic.INSTANCE); } else {
player.setHealth(0); float damageAmount = net.minecraftforge.common.ForgeHooks.onLivingDamage(player, damageSrc, 2.0F);
player.getCombatTracker().trackDamage(damageSrc, playerHealth, damageAmount);
player.setHealth(Math.max(player.getHealth() - 2, 0.001f));
} }
// player.attackEntityFrom(BloodMagicAPI.getDamageSource(), 2.0F);
} }
if (!evt.shouldFillAltar) if (!evt.shouldFillAltar)

2
src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java
View file

@ -204,7 +204,7 @@ public class TileDemonCrucible extends TileInventory implements ITickable, IDemo
@Override @Override
public boolean canInsertItem(int index, ItemStack stack, EnumFacing direction) { public boolean canInsertItem(int index, ItemStack stack, EnumFacing direction) {
return !stack.isEmpty() && (stack.getItem() instanceof IDemonWillGem || stack.getItem() instanceof IDiscreteDemonWill); return !stack.isEmpty() && inventory.get(0).isEmpty() && (stack.getItem() instanceof IDemonWillGem || stack.getItem() instanceof IDiscreteDemonWill);
} }
@Override @Override