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

Sync with L2jServer HighFive Feb 10th 2015.

Browse Source
This commit is contained in:
mobius
2015-02-10 22:49:31 +00:00
parent 4dc2666fa4
commit 431b4cacdf
98 changed files with 636 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,17 +18,14 @@
*/
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 com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
@ -55,7 +52,6 @@ public class MinionList
{
throw new NullPointerException("MinionList: master is null");
}
_master = pMaster;
}
@ -346,10 +342,7 @@ public class MinionList
{
return null;
}
// Create and Init the Minion and generate its Identifier
L2MonsterInstance minion = new L2MonsterInstance(IdFactory.getInstance().getNextId(), minionTemplate);
return initializeNpcInstance(master, minion);
return initializeNpcInstance(master, new L2MonsterInstance(minionTemplate));
}
protected static final L2MonsterInstance initializeNpcInstance(L2MonsterInstance master, L2MonsterInstance minion)
@ -422,18 +415,8 @@ public class MinionList
return _minionReferences.size();
}
public final int lazyCountSpawnedMinionsGroups()
public final long lazyCountSpawnedMinionsGroups()
{
Set<Integer> seenGroups = new HashSet<>();
for (L2MonsterInstance minion : _minionReferences)
{
if (minion == null)
{
continue;
}
seenGroups.add(minion.getId());
}
return seenGroups.size();
return _minionReferences.stream().distinct().count();
}
}

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

@ -24,10 +24,9 @@ import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.StringJoiner;
import java.util.StringTokenizer;
@ -309,10 +308,9 @@ public final class Util
public static String implodeString(Iterable<String> strArray, String strDelim)
{
final StringJoiner sj = new StringJoiner(strDelim);
for (String strValue : strArray)
for (String str : strArray)
{
sj.add(strValue);
sj.add(str);
}
return sj.toString();
}
@ -709,26 +707,7 @@ public final class Util
*/
public static void fillMultiEditContent(L2PcInstance activeChar, String text)
{
text = text.replaceAll("<br>", Config.EOL);
List<String> arg = new ArrayList<>();
arg.add("0");
arg.add("0");
arg.add("0");
arg.add("0");
arg.add("0");
arg.add("0");
arg.add(activeChar.getName());
arg.add(Integer.toString(activeChar.getObjectId()));
arg.add(activeChar.getAccountName());
arg.add("9");
arg.add(" ");
arg.add(" ");
arg.add(text);
arg.add("0");
arg.add("0");
arg.add("0");
arg.add("0");
activeChar.sendPacket(new ShowBoard(arg));
activeChar.sendPacket(new ShowBoard(Arrays.asList("0", "0", "0", "0", "0", "0", activeChar.getName(), Integer.toString(activeChar.getObjectId()), activeChar.getAccountName(), "9", " ", " ", text.replaceAll("<br>", Config.EOL), "0", "0", "0", "0")));
}
/**