From ce549ed07371dba10bdc9bcf58c1d7a4cf67b470 Mon Sep 17 00:00:00 2001 From: Mads Boddum Date: Fri, 16 Sep 2016 04:26:25 +0200 Subject: [PATCH] Optimised statement in CreatureObject.isEnemy() --- src/resources/objects/creature/CreatureObject.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index 6b660bb3f..b818f64b7 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -780,11 +780,7 @@ public class CreatureObject extends TangibleObject { // If they're both players, both of them might be special force if (thisCreature.isPlayer() && otherCreature.isPlayer()) { // They are enemies if they're both players and members of the special force! - if (getPvpStatus() == PvpStatus.SPECIALFORCES && otherObject.getPvpStatus() == PvpStatus.SPECIALFORCES) { - return true; - } else { // Two players where at least one isn't SF does not make them enemies - return false; - } + return getPvpStatus() == PvpStatus.SPECIALFORCES && otherObject.getPvpStatus() == PvpStatus.SPECIALFORCES; } } }