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

Sync with L2jServer HighFive Sep 18th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-09-19 22:37:08 +00:00
parent 339cab601b
commit a2d764aaf8
134 changed files with 1440 additions and 1014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,6 +81,7 @@ import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasClanHall;
import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasFort;
import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasFreeSummonPoints;
import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasPet;
import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasServitor;
import com.l2jserver.gameserver.model.conditions.ConditionPlayerHp;
import com.l2jserver.gameserver.model.conditions.ConditionPlayerImmobile;
import com.l2jserver.gameserver.model.conditions.ConditionPlayerInsideZoneId;
@ -98,7 +99,6 @@ import com.l2jserver.gameserver.model.conditions.ConditionPlayerPkCount;
import com.l2jserver.gameserver.model.conditions.ConditionPlayerPledgeClass;
import com.l2jserver.gameserver.model.conditions.ConditionPlayerRace;
import com.l2jserver.gameserver.model.conditions.ConditionPlayerRangeFromNpc;
import com.l2jserver.gameserver.model.conditions.ConditionPlayerServitorNpcId;
import com.l2jserver.gameserver.model.conditions.ConditionPlayerSex;
import com.l2jserver.gameserver.model.conditions.ConditionPlayerSiegeSide;
import com.l2jserver.gameserver.model.conditions.ConditionPlayerSouls;
@ -794,16 +794,9 @@ public abstract class DocumentBase
cond = joinAnd(cond, new ConditionPlayerHasPet(array));
break;
}
case "servitornpcid":
case "hasservitor":
{
StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
ArrayList<Integer> array = new ArrayList<>(st.countTokens());
while (st.hasMoreTokens())
{
String item = st.nextToken().trim();
array.add(Integer.decode(getValue(item, null)));
}
cond = joinAnd(cond, new ConditionPlayerServitorNpcId(array));
cond = joinAnd(cond, new ConditionPlayerHasServitor());
break;
}
case "npcidradius":
@ -875,7 +868,7 @@ public abstract class DocumentBase
}
case "cantakecastle":
{
cond = joinAnd(cond, new ConditionPlayerCanTakeCastle(Boolean.parseBoolean(a.getNodeValue())));
cond = joinAnd(cond, new ConditionPlayerCanTakeCastle());
break;
}
case "cantakefort":