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

Altar and Dagger should respect 0 LP as an effective blacklist (#837)

Browse source
This commit is contained in:
Nicholas Ignoffo 2016-07-04 20:17:23 -07:00
parent 14b448bbee
commit 7fdbcf3b3c
2 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java
View file

@ -1,6 +1,7 @@
package WayofTime.bloodmagic.ritual;
import WayofTime.bloodmagic.ConfigHandler;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.saving.SoulNetwork;
import WayofTime.bloodmagic.api.ritual.*;
@ -87,20 +88,23 @@ public class RitualWellOfSuffering extends Ritual
for (EntityLivingBase entity : entities)
{
if (!ConfigHandler.wellOfSufferingBlacklist.contains(entity.getClass().getSimpleName()))
if (ConfigHandler.wellOfSufferingBlacklist.contains(entity.getClass().getSimpleName()))
continue;
if (BloodMagicAPI.getEntitySacrificeValues().get(entity.getClass().getSimpleName()) <= 0)
continue;
if (entity.isEntityAlive() && !(entity instanceof EntityPlayer))
{
if (entity.isEntityAlive() && !(entity instanceof EntityPlayer))
if (entity.attackEntityFrom(DamageSource.outOfWorld, 1))
{
if (entity.attackEntityFrom(DamageSource.outOfWorld, 1))
tileAltar.sacrificialDaggerCall(SACRIFICE_AMOUNT, true);
totalEffects++;
if (totalEffects >= maxEffects)
{
tileAltar.sacrificialDaggerCall(SACRIFICE_AMOUNT, true);
totalEffects++;
if (totalEffects >= maxEffects)
{
break;
}
break;
}
}
}