summaryrefslogtreecommitdiff
path: root/src/main/java/darkknight/jewelrycraft/curses
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-07-09 21:33:49 +0100
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-07-09 21:33:49 +0100
commitd773e5214c5308bbd461f558b9e17a4839027d5e (patch)
treedd8915e043f7c2aa18c6c23d1c1fd631ad05e537 /src/main/java/darkknight/jewelrycraft/curses
parent05e82be19ee915a42ada1d69e12c4de55590562f (diff)
- Pentagram now reduces the total health the victim has instead of
damaging it (this is to prevent getting infinite hearts); - Fixed server-client sync issues (thanks domi)
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/curses')
-rw-r--r--src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
index faefe84..730542a 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
@@ -37,7 +37,7 @@ public class CursePentagram extends Curse {
if (!world.isRemote) {
for (Object entity : world.getEntitiesWithinAABBExcludingEntity(player, AxisAlignedBB.getBoundingBox(player.boundingBox.minX - 0.5F, player.boundingBox.minY, player.boundingBox.minZ - 0.5F, player.boundingBox.maxX + 0.5F, player.boundingBox.maxY, player.boundingBox.maxZ + 0.5F))) {
if (entity instanceof EntityLivingBase && rand.nextInt(40) == 0) {
- ((EntityLivingBase) entity).attackEntityFrom(DamageSourceList.shadows, 2f);
+ ((EntityLivingBase) entity).getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(((EntityLivingBase) entity).getMaxHealth() - 2f);//attackEntityFrom(DamageSourceList.shadows, 2f);
if (player.shouldHeal()) player.heal(2F);
else player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() + 2f);
}