Checks for passive skill condition scope.
This commit is contained in:
		| @@ -347,8 +347,8 @@ | ||||
| 														</xs:element> | ||||
| 														<xs:element minOccurs="0" name="teleportBookmarkSlots" type="xs:unsignedByte" /> | ||||
| 														<xs:element minOccurs="0" name="minLevel"> | ||||
| 															<xs:complexType> | ||||
| 																<xs:sequence> | ||||
| 															<xs:complexType mixed="true"> | ||||
| 																<xs:sequence minOccurs="0"> | ||||
| 																	<xs:element maxOccurs="unbounded" name="value"> | ||||
| 																		<xs:complexType> | ||||
| 																			<xs:simpleContent> | ||||
|   | ||||
| @@ -408,6 +408,18 @@ public class SkillData implements IXmlReader | ||||
| 									final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); | ||||
| 									if (conditionFunction != null) | ||||
| 									{ | ||||
| 										if (skill.isPassive()) | ||||
| 										{ | ||||
| 											if (skillConditionScope != SkillConditionScope.PASSIVE) | ||||
| 											{ | ||||
| 												LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]"); | ||||
| 											} | ||||
| 										} | ||||
| 										else if (skillConditionScope == SkillConditionScope.PASSIVE) | ||||
| 										{ | ||||
| 											LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]"); | ||||
| 										} | ||||
| 										 | ||||
| 										skill.addCondition(skillConditionScope, conditionFunction.apply(params)); | ||||
| 									} | ||||
| 									else | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 MobiusDevelopment
					MobiusDevelopment