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

-Dropped Javolution.

Browse Source 
-Removal of Q00344_1000YearsTheEndOfLamentation.
-Fixed starting conditions for Q00144_PailakaInjuredDragon.
-Fixed starting conditions for last Seven Sign quests.
-Added missing MonasteryOfSilence.xml instance spawns and doors.
-Removed many catacomb spawns.
This commit is contained in:
mobius
2015-02-08 21:01:32 +00:00
parent 141cdc5efa
commit 012eb3ed65
201 changed files with 817 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
trunk/java/com/l2jserver/gameserver/util/MinionList.java
View File

@ -18,14 +18,13 @@
*/
package com.l2jserver.gameserver.util;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger;
import javolution.util.FastList;
import javolution.util.FastSet;
import com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
@ -58,7 +57,7 @@ public class MinionList
}
_master = pMaster;
_minionReferences = new FastList<L2MonsterInstance>().shared();
_minionReferences = new CopyOnWriteArrayList<>();
}
/**
@ -156,7 +155,7 @@ public class MinionList
// if master has spawn and can respawn - try to reuse minions
if ((_reusedMinionReferences == null) && (_master.getTemplate().getParameters().getSet().get("SummonPrivateRate") == null) && !_master.getTemplate().getParameters().getMinionList("Privates").isEmpty() && (_master.getSpawn() != null) && _master.getSpawn().isRespawnEnabled())
{
_reusedMinionReferences = new FastList<L2MonsterInstance>().shared();
_reusedMinionReferences = new CopyOnWriteArrayList<>();
}
}
@ -426,7 +425,7 @@ public class MinionList
public final int lazyCountSpawnedMinionsGroups()
{
Set<Integer> seenGroups = new FastSet<>();
Set<Integer> seenGroups = new HashSet<>();
for (L2MonsterInstance minion : _minionReferences)
{
if (minion == null)

9
trunk/java/com/l2jserver/gameserver/util/Util.java
View File

@ -24,6 +24,7 @@ import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
@ -31,9 +32,6 @@ import java.util.Locale;
import java.util.StringTokenizer;
import java.util.logging.Logger;
import javolution.text.TextBuilder;
import javolution.util.FastList;
import com.l2jserver.Config;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.ThreadPoolManager;
@ -309,7 +307,7 @@ public final class Util
*/
public static String implodeString(Iterable<String> strArray, String strDelim)
{
final TextBuilder sbString = TextBuilder.newInstance();
final StringBuilder sbString = new StringBuilder();
for (String strValue : strArray)
{
@ -318,7 +316,6 @@ public final class Util
}
String result = sbString.toString();
TextBuilder.recycle(sbString);
return result;
}
@ -715,7 +712,7 @@ public final class Util
public static void fillMultiEditContent(L2PcInstance activeChar, String text)
{
text = text.replaceAll("<br>", Config.EOL);
List<String> arg = new FastList<>();
List<String> arg = new ArrayList<>();
arg.add("0");
arg.add("0");
arg.add("0");