Removed usage of steam to check abnormals on effects.
This commit is contained in:
		| @@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect | ||||
| 		 | ||||
| 		double power = _power; | ||||
| 		 | ||||
| 		// Check if we apply an abnormal modifier | ||||
| 		if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) | ||||
| 		// Check if we apply an abnormal modifier. | ||||
| 		if (!_abnormals.isEmpty()) | ||||
| 		{ | ||||
| 			power += _abnormalPower; | ||||
| 			for (AbnormalType abnormal : _abnormals) | ||||
| 			{ | ||||
| 				if (effected.hasAbnormalType(abnormal)) | ||||
| 				{ | ||||
| 					power += _abnormalPower; | ||||
| 					break; | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 		 | ||||
| 		final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); | ||||
|   | ||||
| @@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect | ||||
| 	@Override | ||||
| 	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) | ||||
| 	{ | ||||
| 		if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) | ||||
| 		if (effector.isAlikeDead()) | ||||
| 		{ | ||||
| 			return; | ||||
| 		} | ||||
| 		 | ||||
| 		boolean hasAbnormalType = false; | ||||
| 		if (!_abnormals.isEmpty()) | ||||
| 		{ | ||||
| 			for (AbnormalType abnormal : _abnormals) | ||||
| 			{ | ||||
| 				if (effected.hasAbnormalType(abnormal)) | ||||
| 				{ | ||||
| 					hasAbnormalType = true; | ||||
| 					break; | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 		if (!hasAbnormalType) | ||||
| 		{ | ||||
| 			return; | ||||
| 		} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 MobiusDevelopment
					MobiusDevelopment