diff options
| author | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-06-12 18:55:47 +0100 |
|---|---|---|
| committer | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-06-12 18:55:47 +0100 |
| commit | c15dc0a62d572c19cea8c8e5ab949191b4c20121 (patch) | |
| tree | 6b570b943ca644ca5da2df3658a9f18cddcbb144 /src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java | |
| parent | 2f93a3de229a3351d91708cf60fbc9ab7a1be97f (diff) | |
Fixed potential loop hole?
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java')
| -rw-r--r-- | src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java index c27ba9d..b760706 100644 --- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java @@ -207,7 +207,7 @@ public class EntityEventHandler { if (curse.canCurseBeActivated(player.worldObj) && playerInfo.getInteger(curse.getName()) > 0) curse.attackedAction(player.worldObj, player);
}
- if (!player.worldObj.isRemote && (float) player.hurtResistantTime <= (float) player.maxHurtResistantTime / 2.0F) {
+ if (!player.worldObj.isRemote && (float) player.hurtResistantTime <= (float) player.maxHurtResistantTime / 2.0F && !event.source.isUnblockable()) {
if (playerInfo.getFloat("WhiteHeart") > 0) {
playerInfo.setFloat("WhiteHeart", 0f);
JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());
|
