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

4
src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java
View file

@ -3,7 +3,7 @@ package WayofTime.bloodmagic.item;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.impl.BloodMagicAPI;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.util.PleaseStopUsingMe;
import WayofTime.bloodmagic.util.DamageSourceBloodMagic;
import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper;
import WayofTime.bloodmagic.util.helper.PurificationHelper;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@ -71,7 +71,7 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider {
if (PlayerSacrificeHelper.findAndFillAltar(attacker.getEntityWorld(), target, lifeEssence, true)) {
target.getEntityWorld().playSound(null, target.posX, target.posY, target.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (target.getEntityWorld().rand.nextFloat() - target.getEntityWorld().rand.nextFloat()) * 0.8F);
target.setHealth(-1);
target.onDeath(PleaseStopUsingMe.damageSource);
target.onDeath(DamageSourceBloodMagic.INSTANCE);
}
return false;

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);

4
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java
View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.util.PleaseStopUsingMe;
import WayofTime.bloodmagic.util.DamageSourceBloodMagic;
import WayofTime.bloodmagic.util.helper.PlayerHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
@ -37,7 +37,7 @@ public class ItemSigilFastMiner extends ItemSigilToggleableBase {
player.addPotionEffect(new PotionEffect(MobEffects.HASTE, ticks, potionPotency));
if (!player.capabilities.isCreativeMode) {
player.hurtResistantTime = 0;
player.attackEntityFrom(PleaseStopUsingMe.damageSource, 1.0F);
player.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F);
}
}
}