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

Removed all usages of PleaseStopUsingMe

Browse source
This commit is contained in:
Nicholas Ignoffo 2018-03-17 22:30:14 -07:00
parent 77e5beb9e1
commit f535e331dd
10 changed files with 21 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent;
import WayofTime.bloodmagic.item.types.ISubItem;
import WayofTime.bloodmagic.tile.TileAltar;
import WayofTime.bloodmagic.util.Constants;
import WayofTime.bloodmagic.util.PleaseStopUsingMe;
import WayofTime.bloodmagic.util.DamageSourceBloodMagic;
import WayofTime.bloodmagic.util.helper.NBTHelper;
import WayofTime.bloodmagic.util.helper.PlayerHelper;
import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper;
@ -97,10 +97,10 @@ public class ItemSacrificialDagger extends ItemEnum<ItemSacrificialDagger.Dagger
if (evt.shouldDrainHealth) {
player.hurtResistantTime = 0;
player.attackEntityFrom(PleaseStopUsingMe.damageSource, 0.001F);
player.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 0.001F);
player.setHealth(Math.max(player.getHealth() - 2, 0.0001f));
if (player.getHealth() <= 0.001f) {
player.onDeath(PleaseStopUsingMe.damageSource);
player.onDeath(DamageSourceBloodMagic.INSTANCE);
player.setHealth(0);
}
// player.attackEntityFrom(BloodMagicAPI.getDamageSource(), 2.0F);