Cleanup ModifyDamageTakenPower

Dueris · May 26, 2024 · 1cd6dc8 · 1cd6dc8
1 parent b5522d3
commit 1cd6dc8
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/origins/src/main/java/me/dueris/genesismc/factory/powers/apoli/ModifyDamageTakenPower.java b/origins/src/main/java/me/dueris/genesismc/factory/powers/apoli/ModifyDamageTakenPower.java
@@ -49,11 +49,8 @@ public void damageEVENT(EntityDamageEvent e) {
 		if (e.isCancelled()) return;
 		if (e.getEntity() instanceof Player p && getPlayers().contains(p)) {
 			try {
-				if (!isActive(p)) return;
-				if (e instanceof EntityDamageByEntityEvent ev) {
-					if (!ConditionExecutor.testBiEntity(bientityCondition, (CraftEntity) ev.getDamager(), (CraftEntity) p))
-						return;
-				}
+				if (!isActive(p) || e instanceof EntityDamageByEntityEvent ev && !ConditionExecutor.testBiEntity(bientityCondition, (CraftEntity) ev.getDamager(), (CraftEntity) p))
+					return;
 				if (!ConditionExecutor.testDamage(damageCondition, e)) return;
 				for (Modifier modifier : getModifiers()) {
 					float value = modifier.value();