From 444b01ce8f0ac75d581a119fd7f338d288ab7b3a Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@cardforge.org>
Date: Sun, 14 Aug 2016 08:51:41 +0000
Subject: [PATCH] Player: fixed BloodThrist also counting LostPlayers also make
 Ferocious shorter using filterPower

---
 .../main/java/forge/game/player/Player.java   | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
index 0e893629263..b7a1aa38a54 100644
--- a/forge-game/src/main/java/forge/game/player/Player.java
+++ b/forge-game/src/main/java/forge/game/player/Player.java
@@ -1902,8 +1902,8 @@ public class Player extends GameEntity implements Comparable<Player> {
     }
 
     public final boolean hasBloodthirst() {
-        for (Player opp : getOpponents()) {
-            if (opp.getAssignedDamage() > 0) {
+        for (Player p : game.getRegisteredPlayers()) {
+            if (p.isOpponentOf(this) && p.getAssignedDamage() > 0) {
                 return true;
             }
         }
@@ -1911,20 +1911,15 @@ public class Player extends GameEntity implements Comparable<Player> {
     }
 
     public boolean hasFerocious() {
-        final CardCollectionView list = getCreaturesInPlay();
-        final CardCollectionView ferocious = CardLists.filter(list, new Predicate<Card>() {
-            @Override
-            public boolean apply(final Card c) {
-                return c.getNetPower() > 3;
-            }
-        });
-        return !ferocious.isEmpty();
+        return !CardLists.filterPower(getCreaturesInPlay(), 4).isEmpty();
     }
 
     public final int getBloodthirstAmount() {
         int blood = 0;
-        for (Player opp : getOpponents()) {
-            blood += opp.getAssignedDamage();
+        for (Player p : game.getRegisteredPlayers()) {
+            if (p.isOpponentOf(this)) {
+                blood += p.getAssignedDamage();
+            }
         }
         return blood;
     }