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

13
trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java
View File

@ -40,10 +40,6 @@ import java.util.logging.Logger;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javolution.util.FastList;
import javolution.util.FastMap;
import javolution.util.WeakFastSet;
import com.l2jserver.Config;
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.GeoData;
@ -220,7 +216,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
/** Table of Calculators containing all used calculator */
private Calculator[] _calculators;
/** Map containing all skills of this character. */
private final Map<Integer, Skill> _skills = new FastMap<Integer, Skill>().shared();
private final Map<Integer, Skill> _skills = new ConcurrentHashMap<>();
/** Map containing the skill reuse time stamps. */
private volatile Map<Integer, TimeStamp> _reuseTimeStampsSkills = null;
/** Map containing the item reuse time stamps. */
@ -2699,7 +2695,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{
if (_attackByList == null)
{
_attackByList = new WeakFastSet<>(true);
_attackByList = new HashSet<>();
}
}
}
@ -4315,8 +4311,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
if (distFraction > 1)
{
ThreadPoolManager.getInstance().executeAi(() ->
{
ThreadPoolManager.getInstance().executeAi(() -> {
try
{
if (Config.MOVE_BASED_KNOWNLIST)
@ -5605,7 +5600,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
int _skiprange = 0;
int _skipgeo = 0;
int _skippeace = 0;
List<L2Character> targetList = new FastList<>(targets.length);
List<L2Character> targetList = new ArrayList<>(targets.length);
for (L2Object target : targets)
{
if (target instanceof L2Character)

5
trunk/java/com/l2jserver/gameserver/model/actor/L2Vehicle.java
View File

@ -18,13 +18,12 @@
*/
package com.l2jserver.gameserver.model.actor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.logging.Level;
import javolution.util.FastList;
import com.l2jserver.Config;
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.ThreadPoolManager;
@ -54,7 +53,7 @@ import com.l2jserver.gameserver.util.Util;
public abstract class L2Vehicle extends L2Character
{
protected int _dockId = 0;
protected final FastList<L2PcInstance> _passengers = new FastList<>();
protected final ArrayList<L2PcInstance> _passengers = new ArrayList<>();
protected Location _oustLoc = null;
private Runnable _engine = null;

5
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java
View File

@ -22,12 +22,11 @@ import static com.l2jserver.gameserver.model.itemcontainer.Inventory.MAX_ADENA;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
import javolution.util.FastMap;
import com.l2jserver.Config;
import com.l2jserver.gameserver.enums.InstanceType;
import com.l2jserver.gameserver.instancemanager.ClanHallAuctionManager;
@ -47,7 +46,7 @@ public final class L2AuctioneerInstance extends L2Npc
private static final int COND_BUSY_BECAUSE_OF_SIEGE = 1;
private static final int COND_REGULAR = 3;
private final Map<Integer, Auction> _pendingAuctions = new FastMap<>();
private final Map<Integer, Auction> _pendingAuctions = new HashMap<>();
public L2AuctioneerInstance(int objectId, L2NpcTemplate template)
{

5
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ControlTowerInstance.java
View File

@ -18,11 +18,10 @@
*/
package com.l2jserver.gameserver.model.actor.instance;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import javolution.util.FastList;
import com.l2jserver.gameserver.enums.InstanceType;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.actor.L2Character;
@ -86,7 +85,7 @@ public class L2ControlTowerInstance extends L2Tower
{
if (_guards == null)
{
_guards = new FastList<>();
_guards = new ArrayList<>();
}
}
}

5
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java
View File

@ -18,13 +18,12 @@
*/
package com.l2jserver.gameserver.model.actor.instance;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
import java.util.concurrent.Future;
import java.util.logging.Level;
import javolution.util.FastList;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.L2CharacterAI;
import com.l2jserver.gameserver.ai.L2DoorAI;
@ -612,7 +611,7 @@ public class L2DoorInstance extends L2Character
public Collection<L2DefenderInstance> getKnownDefenders()
{
FastList<L2DefenderInstance> result = new FastList<>();
ArrayList<L2DefenderInstance> result = new ArrayList<>();
Collection<L2Object> objs = getKnownList().getKnownObjects().values();
for (L2Object obj : objs)

4
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortCommanderInstance.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.model.actor.instance;
import javolution.util.FastList;
import java.util.ArrayList;
import com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
@ -124,7 +124,7 @@ public class L2FortCommanderInstance extends L2DefenderInstance
L2Spawn spawn = getSpawn();
if ((spawn != null) && canTalk())
{
FastList<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(getFort().getResidenceId());
ArrayList<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(getFort().getResidenceId());
for (FortSiegeSpawn spawn2 : commanders)
{
if (spawn2.getId() == spawn.getId())

34
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -39,6 +39,8 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
@ -46,10 +48,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Level;
import javolution.util.FastList;
import javolution.util.FastMap;
import javolution.util.FastSet;
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.GameTimeController;
@ -410,7 +408,7 @@ public final class L2PcInstance extends L2Playable
public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_POINTS";
private final List<IEventListener> _eventListeners = new FastList<IEventListener>().shared();
private final List<IEventListener> _eventListeners = new CopyOnWriteArrayList<>();
public class AIAccessor extends L2Character.AIAccessor
{
@ -522,7 +520,7 @@ public final class L2PcInstance extends L2Playable
private int _bookmarkslot = 0; // The Teleport Bookmark Slot
private final Map<Integer, TeleportBookmark> _tpbookmarks = new FastMap<>();
private final Map<Integer, TeleportBookmark> _tpbookmarks = new HashMap<>();
private boolean _canFeed;
private boolean _isInSiege;
@ -563,11 +561,11 @@ public final class L2PcInstance extends L2Playable
private Transform _transformation;
/** The table containing all L2RecipeList of the L2PcInstance */
private final Map<Integer, L2RecipeList> _dwarvenRecipeBook = new FastMap<>();
private final Map<Integer, L2RecipeList> _commonRecipeBook = new FastMap<>();
private final Map<Integer, L2RecipeList> _dwarvenRecipeBook = new HashMap<>();
private final Map<Integer, L2RecipeList> _commonRecipeBook = new HashMap<>();
/** Premium Items */
private final Map<Integer, L2PremiumItem> _premiumItems = new FastMap<>();
private final Map<Integer, L2PremiumItem> _premiumItems = new HashMap<>();
/** True if the L2PcInstance is sitting */
private boolean _waitTypeSitting;
@ -625,7 +623,7 @@ public final class L2PcInstance extends L2Playable
private int _questNpcObject = 0;
/** The table containing all Quests began by the L2PcInstance */
private final Map<String, QuestState> _quests = new FastMap<>();
private final Map<String, QuestState> _quests = new HashMap<>();
/** The list containing all shortCuts of this player. */
private final ShortCuts _shortCuts = new ShortCuts(this);
@ -633,8 +631,8 @@ public final class L2PcInstance extends L2Playable
/** The list containing all macros of this player. */
private final MacroList _macros = new MacroList(this);
private final List<L2PcInstance> _snoopListener = new FastList<>();
private final List<L2PcInstance> _snoopedPlayer = new FastList<>();
private final List<L2PcInstance> _snoopListener = new ArrayList<>();
private final List<L2PcInstance> _snoopedPlayer = new ArrayList<>();
// hennas
private final L2Henna[] _henna = new L2Henna[3];
@ -753,7 +751,7 @@ public final class L2PcInstance extends L2Playable
/** The fists L2Weapon of the L2PcInstance (used when no weapon is equipped) */
private L2Weapon _fistsWeaponItem;
private final Map<Integer, String> _chars = new FastMap<>();
private final Map<Integer, String> _chars = new HashMap<>();
// private byte _updateKnownCounter = 0;
@ -779,7 +777,7 @@ public final class L2PcInstance extends L2Playable
/** Player's cubics. */
private final Map<Integer, L2CubicInstance> _cubics = new ConcurrentSkipListMap<>();
/** Active shots. */
protected FastSet<Integer> _activeSoulShots = new FastSet<Integer>().shared();
protected CopyOnWriteArraySet<Integer> _activeSoulShots = new CopyOnWriteArraySet<>();
public final ReentrantLock soulShotLock = new ReentrantLock();
@ -1574,7 +1572,7 @@ public final class L2PcInstance extends L2Playable
{
if (_notifyQuestOfDeathList == null)
{
_notifyQuestOfDeathList = new FastList<>();
_notifyQuestOfDeathList = new ArrayList<>();
}
}
}
@ -5958,7 +5956,7 @@ public final class L2PcInstance extends L2Playable
{
if (_tamedBeast == null)
{
_tamedBeast = new FastList<>();
_tamedBeast = new ArrayList<>();
}
_tamedBeast.add(tamedBeast);
}
@ -10539,7 +10537,7 @@ public final class L2PcInstance extends L2Playable
{
if (_subClasses == null)
{
_subClasses = new FastMap<>();
_subClasses = new HashMap<>();
}
return _subClasses;
@ -14601,7 +14599,7 @@ public final class L2PcInstance extends L2Playable
{
if (_customSkills == null)
{
_customSkills = new FastMap<Integer, Skill>().shared();
_customSkills = new ConcurrentHashMap<>();
}
_customSkills.put(skill.getDisplayId(), skill);
}

9
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java
View File

@ -21,13 +21,12 @@ package com.l2jserver.gameserver.model.actor.instance;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.logging.Logger;
import javolution.util.FastList;
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
@ -1031,7 +1030,7 @@ public class L2PetInstance extends L2Summon
int buff_index = 0;
final List<Integer> storedSkills = new FastList<>();
final List<Integer> storedSkills = new ArrayList<>();
// Store all effect data along with calculated remaining
if (storeEffects)
@ -1077,7 +1076,7 @@ public class L2PetInstance extends L2Summon
if (!SummonEffectsTable.getInstance().getPetEffects().containsKey(getControlObjectId()))
{
SummonEffectsTable.getInstance().getPetEffects().put(getControlObjectId(), new FastList<SummonEffect>());
SummonEffectsTable.getInstance().getPetEffects().put(getControlObjectId(), new ArrayList<SummonEffect>());
}
SummonEffectsTable.getInstance().getPetEffects().get(getControlObjectId()).add(SummonEffectsTable.getInstance().new SummonEffect(skill, info.getTime()));
@ -1116,7 +1115,7 @@ public class L2PetInstance extends L2Summon
{
if (!SummonEffectsTable.getInstance().getPetEffects().containsKey(getControlObjectId()))
{
SummonEffectsTable.getInstance().getPetEffects().put(getControlObjectId(), new FastList<SummonEffect>());
SummonEffectsTable.getInstance().getPetEffects().put(getControlObjectId(), new ArrayList<SummonEffect>());
}
SummonEffectsTable.getInstance().getPetEffects().get(getControlObjectId()).add(SummonEffectsTable.getInstance().new SummonEffect(skill, effectCurTime));

7
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java
View File

@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.model.actor.instance;
import java.util.ArrayList;
import java.util.List;
import javolution.util.FastList;
import com.l2jserver.gameserver.MonsterRace;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.enums.InstanceType;
@ -101,8 +100,8 @@ public class L2RaceManagerInstance extends L2Npc
{
_notInitialized = false;
// _history = new FastList<>();
_managers = new FastList<>();
// _history = new ArrayList<>();
_managers = new ArrayList<>();
ThreadPoolManager s = ThreadPoolManager.getInstance();
s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.TICKETS_ARE_NOW_AVAILABLE_FOR_MONSTER_RACE_S1), 0, 10 * MINUTE);

9
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java
View File

@ -21,6 +21,7 @@ package com.l2jserver.gameserver.model.actor.instance;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -28,8 +29,6 @@ import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.logging.Logger;
import javolution.util.FastList;
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
@ -299,7 +298,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable
int buff_index = 0;
final List<Integer> storedSkills = new FastList<>();
final List<Integer> storedSkills = new ArrayList<>();
// Store all effect data along with calculated remaining
if (storeEffects)
@ -358,7 +357,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable
}
if (!SummonEffectsTable.getInstance().getServitorEffects(getOwner()).containsKey(getReferenceSkill()))
{
SummonEffectsTable.getInstance().getServitorEffects(getOwner()).put(getReferenceSkill(), new FastList<SummonEffect>());
SummonEffectsTable.getInstance().getServitorEffects(getOwner()).put(getReferenceSkill(), new ArrayList<SummonEffect>());
}
SummonEffectsTable.getInstance().getServitorEffects(getOwner()).get(getReferenceSkill()).add(SummonEffectsTable.getInstance().new SummonEffect(skill, info.getTime()));
@ -414,7 +413,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable
}
if (!SummonEffectsTable.getInstance().getServitorEffects(getOwner()).containsKey(getReferenceSkill()))
{
SummonEffectsTable.getInstance().getServitorEffects(getOwner()).put(getReferenceSkill(), new FastList<SummonEffect>());
SummonEffectsTable.getInstance().getServitorEffects(getOwner()).put(getReferenceSkill(), new ArrayList<SummonEffect>());
}
SummonEffectsTable.getInstance().getServitorEffects(getOwner()).get(getReferenceSkill()).add(SummonEffectsTable.getInstance().new SummonEffect(skill, effectCurTime));

5
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java
View File

@ -20,11 +20,10 @@ package com.l2jserver.gameserver.model.actor.instance;
import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Future;
import javolution.util.FastList;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
@ -206,7 +205,7 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance
{
if (_beastSkills == null)
{
_beastSkills = new FastList<>();
_beastSkills = new ArrayList<>();
}
_beastSkills.add(skill);
}

4
trunk/java/com/l2jserver/gameserver/model/actor/knownlist/CharKnownList.java
View File

@ -25,8 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import javolution.util.FastList;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Summon;
@ -208,7 +206,7 @@ public class CharKnownList extends ObjectKnownList
public Collection<L2Character> getKnownCharacters()
{
FastList<L2Character> result = new FastList<>();
ArrayList<L2Character> result = new ArrayList<>();
final Collection<L2Object> objs = getKnownObjects().values();
for (L2Object obj : objs)

5
trunk/java/com/l2jserver/gameserver/model/actor/status/CharStatus.java
View File

@ -19,12 +19,11 @@
package com.l2jserver.gameserver.model.actor.status;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.logging.Logger;
import javolution.util.FastSet;
import com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.model.actor.L2Character;
@ -109,7 +108,7 @@ public class CharStatus
{
if (_StatusListener == null)
{
_StatusListener = new FastSet<L2Character>().shared();
_StatusListener = new CopyOnWriteArraySet<>();
}
return _StatusListener;
}