lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with L2JServer Jan 12th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-13 09:50:20 +00:00
parent a868d961a3
commit 0a44ad683c
1158 changed files with 59729 additions and 58627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
trunk/java/com/l2jserver/gameserver/engines/DocumentBase.java
View File

@@ -109,7 +109,7 @@ import com.l2jserver.gameserver.model.conditions.ConditionPlayerVehicleMounted;
import com.l2jserver.gameserver.model.conditions.ConditionPlayerWeight;
import com.l2jserver.gameserver.model.conditions.ConditionSiegeZone;
import com.l2jserver.gameserver.model.conditions.ConditionSlotItemId;
import com.l2jserver.gameserver.model.conditions.ConditionTargetAbnormal;
import com.l2jserver.gameserver.model.conditions.ConditionTargetAbnormalType;
import com.l2jserver.gameserver.model.conditions.ConditionTargetActiveEffectId;
import com.l2jserver.gameserver.model.conditions.ConditionTargetActiveSkillId;
import com.l2jserver.gameserver.model.conditions.ConditionTargetAggro;
@@ -576,19 +576,19 @@ public abstract class DocumentBase
}
case "hp":
{
int hp = Integer.decode(getValue(a.getNodeValue(), null));
int hp = Integer.decode(getValue(a.getNodeValue(), template));
cond = joinAnd(cond, new ConditionPlayerHp(hp));
break;
}
case "mp":
{
int hp = Integer.decode(getValue(a.getNodeValue(), null));
cond = joinAnd(cond, new ConditionPlayerMp(hp));
int mp = Integer.decode(getValue(a.getNodeValue(), template));
cond = joinAnd(cond, new ConditionPlayerMp(mp));
break;
}
case "cp":
{
int cp = Integer.decode(getValue(a.getNodeValue(), null));
int cp = Integer.decode(getValue(a.getNodeValue(), template));
cond = joinAnd(cond, new ConditionPlayerCp(cp));
break;
}
@@ -1033,10 +1033,10 @@ public abstract class DocumentBase
cond = joinAnd(cond, new ConditionTargetActiveSkillId(skill_id, skill_lvl));
break;
}
case "abnormal":
case "abnormaltype":
{
int abnormalId = Integer.decode(getValue(a.getNodeValue(), template));
cond = joinAnd(cond, new ConditionTargetAbnormal(abnormalId));
AbnormalType abnormalType = AbnormalType.getAbnormalType(getValue(a.getNodeValue(), template));
cond = joinAnd(cond, new ConditionTargetAbnormalType(abnormalType));
break;
}
case "mindistance":