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

Proper naming for various data holding classes.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-28 11:48:32 +00:00
parent 8ebd210ac3
commit 8dbfd09e0c
934 changed files with 22626 additions and 22626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java vendored
View File

@@ -21,7 +21,7 @@ import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.MultisellData;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.actor.Npc;
@@ -304,7 +304,7 @@ public class AvantGarde extends AbstractNpcAI
*/
public static void showSubClassSkillList(PlayerInstance player)
{
final List<SkillLearn> subClassSkills = SkillTreesData.getInstance().getAvailableSubClassSkills(player);
final List<SkillLearn> subClassSkills = SkillTreeData.getInstance().getAvailableSubClassSkills(player);
final AcquireSkillList asl = new AcquireSkillList(AcquireSkillType.SUBCLASS);
int count = 0;
@@ -332,7 +332,7 @@ public class AvantGarde extends AbstractNpcAI
*/
public static void showTransformSkillList(PlayerInstance player)
{
final List<SkillLearn> skills = SkillTreesData.getInstance().getAvailableTransformSkills(player);
final List<SkillLearn> skills = SkillTreeData.getInstance().getAvailableTransformSkills(player);
final AcquireSkillList asl = new AcquireSkillList(AcquireSkillType.TRANSFORM);
int counts = 0;
@@ -347,7 +347,7 @@ public class AvantGarde extends AbstractNpcAI
if (counts == 0)
{
final int minlevel = SkillTreesData.getInstance().getMinLevelForNewSkill(player, SkillTreesData.getInstance().getTransformSkillTree());
final int minlevel = SkillTreeData.getInstance().getMinLevelForNewSkill(player, SkillTreeData.getInstance().getTransformSkillTree());
if (minlevel > 0)
{
// No more skills to learn, come back when you level.

6
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java vendored
View File

@@ -20,7 +20,7 @@ import java.util.Collection;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -93,7 +93,7 @@ public class HealerTrainer extends AbstractNpcAI
final AcquireSkillList asl = new AcquireSkillList(AcquireSkillType.TRANSFER);
int count = 0;
for (SkillLearn skillLearn : SkillTreesData.getInstance().getAvailableTransferSkills(player))
for (SkillLearn skillLearn : SkillTreeData.getInstance().getAvailableTransferSkills(player))
{
if (SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel()) != null)
{
@@ -140,7 +140,7 @@ public class HealerTrainer extends AbstractNpcAI
else
{
boolean hasSkills = false;
final Collection<SkillLearn> skills = SkillTreesData.getInstance().getTransferSkillTree(player.getClassId()).values();
final Collection<SkillLearn> skills = SkillTreeData.getInstance().getTransferSkillTree(player.getClassId()).values();
for (SkillLearn skillLearn : skills)
{
final Skill skill = player.getKnownSkill(skillLearn.getSkillId());

4
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java vendored
View File

@@ -18,7 +18,7 @@ package features.SkillTransfer;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.ClassListData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType;
import org.l2jmobius.gameserver.model.PlayerCondOverride;
import org.l2jmobius.gameserver.model.SkillLearn;
@@ -112,7 +112,7 @@ public class SkillTransfer extends AbstractNpcAI
long count = PORMANDERS[index].getCount() - player.getInventory().getInventoryItemCount(PORMANDERS[index].getId(), -1, false);
for (Skill sk : player.getAllSkills())
{
for (SkillLearn s : SkillTreesData.getInstance().getTransferSkillTree(player.getClassId()).values())
for (SkillLearn s : SkillTreeData.getInstance().getTransferSkillTree(player.getClassId()).values())
{
if (s.getSkillId() == sk.getId())
{

6
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@@ -22,7 +22,7 @@ import java.util.List;
import java.util.StringTokenizer;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
@@ -209,12 +209,12 @@ public class AdminBuffs implements IAdminCommandHandler
*/
public static void switchSkills(PlayerInstance gmchar, boolean toAuraSkills)
{
final Collection<Skill> skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree().values() : SkillTreesData.getInstance().getGMAuraSkillTree().values();
final Collection<Skill> skills = toAuraSkills ? SkillTreeData.getInstance().getGMSkillTree().values() : SkillTreeData.getInstance().getGMAuraSkillTree().values();
for (Skill skill : skills)
{
gmchar.removeSkill(skill, false); // Don't Save GM skills to database
}
SkillTreesData.getInstance().addSkills(gmchar, toAuraSkills);
SkillTreeData.getInstance().addSkills(gmchar, toAuraSkills);
}
@Override

4
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java vendored
View File

@@ -23,7 +23,7 @@ import java.util.logging.Logger;
import org.l2jmobius.gameserver.data.xml.impl.ClassListData;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.WorldObject;
@@ -258,7 +258,7 @@ public class AdminSkill implements IAdminCommandHandler
activeChar.sendPacket(sm);
}
final Map<Integer, SkillLearn> skills = SkillTreesData.getInstance().getMaxPledgeSkills(clan, includeSquad);
final Map<Integer, SkillLearn> skills = SkillTreeData.getInstance().getMaxPledgeSkills(clan, includeSquad);
for (SkillLearn s : skills.values())
{
clan.addNewSkill(SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel()));

4
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java vendored
View File

@@ -20,7 +20,7 @@ import java.util.List;
import java.util.logging.Level;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.handler.IBypassHandler;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
@@ -91,7 +91,7 @@ public class SkillList implements IBypassHandler
continue;
}
if (SkillTreesData.getInstance().getAvailableSkills(player, cid, false, false).isEmpty())
if (SkillTreeData.getInstance().getAvailableSkills(player, cid, false, false).isEmpty())
{
continue;
}

4
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java vendored
View File

@@ -26,7 +26,7 @@ import org.l2jmobius.commons.enums.ServerMode;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.sql.impl.CrestTable;
import org.l2jmobius.gameserver.data.xml.impl.AdminData;
import org.l2jmobius.gameserver.data.xml.impl.ArmorSetsData;
import org.l2jmobius.gameserver.data.xml.impl.ArmorSetData;
import org.l2jmobius.gameserver.data.xml.impl.BuyListData;
import org.l2jmobius.gameserver.data.xml.impl.DoorData;
import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
@@ -201,7 +201,7 @@ public class Reload implements ITelnetCommand
}
case "sets":
{
ArmorSetsData.getInstance().load();
ArmorSetData.getInstance().load();
return "Telnet Admin: Reloaded Armor sets data.";
}
case "script":

12
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java
View File

@@ -39,10 +39,10 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable;
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
import org.l2jmobius.gameserver.data.sql.impl.CrestTable;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTradersTable;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable;
import org.l2jmobius.gameserver.data.sql.impl.TeleportLocationTable;
import org.l2jmobius.gameserver.data.xml.impl.AdminData;
import org.l2jmobius.gameserver.data.xml.impl.ArmorSetsData;
import org.l2jmobius.gameserver.data.xml.impl.ArmorSetData;
import org.l2jmobius.gameserver.data.xml.impl.BuyListData;
import org.l2jmobius.gameserver.data.xml.impl.CategoryData;
import org.l2jmobius.gameserver.data.xml.impl.ClassListData;
@@ -77,7 +77,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
import org.l2jmobius.gameserver.data.xml.impl.SiegeScheduleData;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillLearnData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.data.xml.impl.StaticObjectData;
import org.l2jmobius.gameserver.data.xml.impl.TransformData;
import org.l2jmobius.gameserver.data.xml.impl.UIData;
@@ -230,7 +230,7 @@ public class GameServer
printSection("Skills");
EffectHandler.getInstance().executeScript();
EnchantSkillGroupsData.getInstance();
SkillTreesData.getInstance();
SkillTreeData.getInstance();
SkillData.getInstance();
PetSkillData.getInstance();
@@ -245,7 +245,7 @@ public class GameServer
BuyListData.getInstance();
MultisellData.getInstance();
RecipeData.getInstance();
ArmorSetsData.getInstance();
ArmorSetData.getInstance();
FishData.getInstance();
FishingMonstersData.getInstance();
FishingRodsData.getInstance();
@@ -427,7 +427,7 @@ public class GameServer
if ((Config.OFFLINE_TRADE_ENABLE || Config.OFFLINE_CRAFT_ENABLE) && Config.RESTORE_OFFLINERS)
{
OfflineTradersTable.getInstance().restoreOfflineTraders();
OfflineTraderTable.getInstance().restoreOfflineTraders();
}
if (Config.SERVER_RESTART_SCHEDULE_ENABLED)

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/Shutdown.java
View File

@@ -24,7 +24,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseBackup;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTradersTable;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable;
import org.l2jmobius.gameserver.datatables.BotReportTable;
import org.l2jmobius.gameserver.datatables.SchemeBufferTable;
import org.l2jmobius.gameserver.instancemanager.CHSiegeManager;
@@ -126,7 +126,7 @@ public class Shutdown extends Thread
{
if ((Config.OFFLINE_TRADE_ENABLE || Config.OFFLINE_CRAFT_ENABLE) && Config.RESTORE_OFFLINERS && !Config.STORE_OFFLINE_TRADE_IN_REALTIME)
{
OfflineTradersTable.getInstance().storeOffliners();
OfflineTraderTable.getInstance().storeOffliners();
LOGGER.info("Offline Traders Table: Offline shops stored(" + tc.getEstimatedTimeAndRestartCounter() + "ms).");
}
}

10
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java → L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java
View File

@@ -36,9 +36,9 @@ import org.l2jmobius.gameserver.model.holders.SellBuffHolder;
import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient;
public class OfflineTradersTable
public class OfflineTraderTable
{
private static final Logger LOGGER = Logger.getLogger(OfflineTradersTable.class.getName());
private static final Logger LOGGER = Logger.getLogger(OfflineTraderTable.class.getName());
// SQL DEFINITIONS
private static final String SAVE_OFFLINE_STATUS = "INSERT INTO character_offline_trade (`charId`,`time`,`type`,`title`) VALUES (?,?,?,?)";
@@ -50,7 +50,7 @@ public class OfflineTradersTable
private static final String LOAD_OFFLINE_STATUS = "SELECT * FROM character_offline_trade";
private static final String LOAD_OFFLINE_ITEMS = "SELECT * FROM character_offline_trade_items WHERE `charId`=?";
protected OfflineTradersTable()
protected OfflineTraderTable()
{
}
@@ -475,13 +475,13 @@ public class OfflineTradersTable
* Gets the single instance of OfflineTradersTable.
* @return single instance of OfflineTradersTable
*/
public static OfflineTradersTable getInstance()
public static OfflineTraderTable getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final OfflineTradersTable INSTANCE = new OfflineTradersTable();
protected static final OfflineTraderTable INSTANCE = new OfflineTraderTable();
}
}

6
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/impl/SummonEffectsTable.java → L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/impl/SummonEffectTable.java
View File

@@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill;
/**
* @author Nyaran
*/
public class SummonEffectsTable
public class SummonEffectTable
{
/** Servitors **/
// Map tree
@@ -171,13 +171,13 @@ public class SummonEffectsTable
}
}
public static SummonEffectsTable getInstance()
public static SummonEffectTable getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final SummonEffectsTable INSTANCE = new SummonEffectsTable();
protected static final SummonEffectTable INSTANCE = new SummonEffectTable();
}
}

8
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java → L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/ArmorSetData.java
View File

@@ -32,14 +32,14 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
* Loads armor set bonuses.
* @author godson, Luno, UnAfraid
*/
public class ArmorSetsData implements IXmlReader
public class ArmorSetData implements IXmlReader
{
private final Map<Integer, ArmorSet> _armorSets = new ConcurrentHashMap<>();
/**
* Instantiates a new armor sets data.
*/
protected ArmorSetsData()
protected ArmorSetData()
{
load();
}
@@ -183,13 +183,13 @@ public class ArmorSetsData implements IXmlReader
* Gets the single instance of ArmorSetsData.
* @return single instance of ArmorSetsData
*/
public static ArmorSetsData getInstance()
public static ArmorSetData getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final ArmorSetsData INSTANCE = new ArmorSetsData();
protected static final ArmorSetData INSTANCE = new ArmorSetData();
}
}

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
View File

@@ -44,7 +44,7 @@ public class SkillData
{
load();
// Reload Skill Tree as well.
SkillTreesData.getInstance().load();
SkillTreeData.getInstance().load();
}
private void load()

8
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java → L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
View File

@@ -73,7 +73,7 @@ import org.l2jmobius.gameserver.model.skills.Skill;
* For XML schema please refer to skillTrees.xsd in datapack in xsd folder and for parameters documentation refer to documentation.txt in skillTrees folder.<br>
* @author Zoey76
*/
public class SkillTreesData implements IXmlReader
public class SkillTreeData implements IXmlReader
{
// ClassId, Map of Skill Hash Code, SkillLearn
private final Map<ClassId, Map<Integer, SkillLearn>> _classSkillTrees = new ConcurrentHashMap<>();
@@ -105,7 +105,7 @@ public class SkillTreesData implements IXmlReader
/**
* Instantiates a new skill trees data.
*/
protected SkillTreesData()
protected SkillTreeData()
{
load();
}
@@ -1347,7 +1347,7 @@ public class SkillTreesData implements IXmlReader
* Gets the single instance of SkillTreesData.
* @return the only instance of this class
*/
public static SkillTreesData getInstance()
public static SkillTreeData getInstance()
{
return SingletonHolder.INSTANCE;
}
@@ -1357,6 +1357,6 @@ public class SkillTreesData implements IXmlReader
*/
private static class SingletonHolder
{
protected static final SkillTreesData INSTANCE = new SkillTreesData();
protected static final SkillTreeData INSTANCE = new SkillTreeData();
}
}

8
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java
View File

@@ -39,7 +39,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.PropertiesParser;
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.SiegeClan;
import org.l2jmobius.gameserver.model.SkillLearn;
@@ -377,7 +377,7 @@ public class TerritoryWarManager implements Siegable
{
for (int wardId : terNew.getOwnedWardIds())
{
final List<SkillLearn> residentialSkills = SkillTreesData.getInstance().getAvailableResidentialSkills(wardId);
final List<SkillLearn> residentialSkills = SkillTreeData.getInstance().getAvailableResidentialSkills(wardId);
for (SkillLearn s : residentialSkills)
{
final Skill sk = SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel());
@@ -410,7 +410,7 @@ public class TerritoryWarManager implements Siegable
}
if (terOld.getOwnerClan() != null)
{
final List<SkillLearn> territorySkills = SkillTreesData.getInstance().getAvailableResidentialSkills(territoryId);
final List<SkillLearn> territorySkills = SkillTreeData.getInstance().getAvailableResidentialSkills(territoryId);
for (SkillLearn s : territorySkills)
{
final Skill sk = SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel());
@@ -427,7 +427,7 @@ public class TerritoryWarManager implements Siegable
{
for (int wardId : terOld.getOwnedWardIds())
{
final List<SkillLearn> wardSkills = SkillTreesData.getInstance().getAvailableResidentialSkills(wardId);
final List<SkillLearn> wardSkills = SkillTreeData.getInstance().getAvailableResidentialSkills(wardId);
for (SkillLearn s : wardSkills)
{
final Skill sk = SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel());

6
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java
View File

@@ -20,7 +20,7 @@ import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.enums.InstanceType;
import org.l2jmobius.gameserver.instancemanager.FishingChampionshipManager;
import org.l2jmobius.gameserver.model.SkillLearn;
@@ -106,7 +106,7 @@ public class FishermanInstance extends MerchantInstance
public static void showFishSkillList(PlayerInstance player)
{
final List<SkillLearn> skills = SkillTreesData.getInstance().getAvailableFishingSkills(player);
final List<SkillLearn> skills = SkillTreeData.getInstance().getAvailableFishingSkills(player);
final AcquireSkillList asl = new AcquireSkillList(AcquireSkillType.FISHING);
int count = 0;
@@ -125,7 +125,7 @@ public class FishermanInstance extends MerchantInstance
if (count == 0)
{
final int minlLevel = SkillTreesData.getInstance().getMinLevelForNewSkill(player, SkillTreesData.getInstance().getFishingSkillTree());
final int minlLevel = SkillTreeData.getInstance().getMinLevelForNewSkill(player, SkillTreeData.getInstance().getFishingSkillTree());
if (minlLevel > 0)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1);

12
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
View File

@@ -20,7 +20,7 @@ import java.util.List;
import java.util.Map;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.enums.InstanceType;
import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.actor.Npc;
@@ -75,7 +75,7 @@ public class NpcInstance extends Npc
final int npcId = npc.getTemplate().getId();
if (npcId == 32611) // Tolonis (Officer)
{
final List<SkillLearn> skills = SkillTreesData.getInstance().getAvailableCollectSkills(player);
final List<SkillLearn> skills = SkillTreeData.getInstance().getAvailableCollectSkills(player);
final AcquireSkillList asl = new AcquireSkillList(AcquireSkillType.COLLECT);
int counts = 0;
@@ -92,7 +92,7 @@ public class NpcInstance extends Npc
if (counts == 0) // No more skills to learn, come back when you level.
{
final int minLevel = SkillTreesData.getInstance().getMinLevelForNewSkill(player, SkillTreesData.getInstance().getCollectSkillTree());
final int minLevel = SkillTreeData.getInstance().getMinLevelForNewSkill(player, SkillTreeData.getInstance().getCollectSkillTree());
if (minLevel > 0)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1);
@@ -127,7 +127,7 @@ public class NpcInstance extends Npc
}
// Normal skills, No LearnedByFS, no AutoGet skills.
final List<SkillLearn> skills = SkillTreesData.getInstance().getAvailableSkills(player, classId, false, false);
final List<SkillLearn> skills = SkillTreeData.getInstance().getAvailableSkills(player, classId, false, false);
final AcquireSkillList asl = new AcquireSkillList(AcquireSkillType.CLASS);
int count = 0;
player.setLearningClass(classId);
@@ -142,8 +142,8 @@ public class NpcInstance extends Npc
if (count == 0)
{
final Map<Integer, SkillLearn> skillTree = SkillTreesData.getInstance().getCompleteClassSkillTree(classId);
final int minLevel = SkillTreesData.getInstance().getMinLevelForNewSkill(player, skillTree);
final Map<Integer, SkillLearn> skillTree = SkillTreeData.getInstance().getCompleteClassSkillTree(classId);
final int minLevel = SkillTreeData.getInstance().getMinLevelForNewSkill(player, skillTree);
if (minLevel > 0)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1);

14
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
View File

@@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable;
import org.l2jmobius.gameserver.data.sql.impl.SummonEffectsTable;
import org.l2jmobius.gameserver.data.sql.impl.SummonEffectTable;
import org.l2jmobius.gameserver.data.xml.impl.PetDataTable;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.datatables.ItemTable;
@@ -908,7 +908,7 @@ public class PetInstance extends Summon
public void stopSkillEffects(boolean removed, int skillId)
{
super.stopSkillEffects(removed, skillId);
SummonEffectsTable.getInstance().removePetEffects(getControlObjectId(), skillId);
SummonEffectTable.getInstance().removePetEffects(getControlObjectId(), skillId);
}
@Override
@@ -974,7 +974,7 @@ public class PetInstance extends Summon
}
// Clear list for overwrite
SummonEffectsTable.getInstance().clearPetEffects(getControlObjectId());
SummonEffectTable.getInstance().clearPetEffects(getControlObjectId());
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps1 = con.prepareStatement(DELETE_SKILL_SAVE);
@@ -1030,7 +1030,7 @@ public class PetInstance extends Summon
ps2.setInt(5, ++buffIndex);
ps2.addBatch();
SummonEffectsTable.getInstance().addPetEffect(getControlObjectId(), skill, info.getTime());
SummonEffectTable.getInstance().addPetEffect(getControlObjectId(), skill, info.getTime());
}
ps2.executeBatch();
}
@@ -1048,7 +1048,7 @@ public class PetInstance extends Summon
PreparedStatement ps1 = con.prepareStatement(RESTORE_SKILL_SAVE);
PreparedStatement ps2 = con.prepareStatement(DELETE_SKILL_SAVE))
{
if (!SummonEffectsTable.getInstance().containsPetId(getControlObjectId()))
if (!SummonEffectTable.getInstance().containsPetId(getControlObjectId()))
{
ps1.setInt(1, _controlObjectId);
try (ResultSet rs = ps1.executeQuery())
@@ -1065,7 +1065,7 @@ public class PetInstance extends Summon
if (skill.hasEffects(EffectScope.GENERAL))
{
SummonEffectsTable.getInstance().addPetEffect(getControlObjectId(), skill, effectCurTime);
SummonEffectTable.getInstance().addPetEffect(getControlObjectId(), skill, effectCurTime);
}
}
}
@@ -1080,7 +1080,7 @@ public class PetInstance extends Summon
}
finally
{
SummonEffectsTable.getInstance().applyPetEffects(this, getControlObjectId());
SummonEffectTable.getInstance().applyPetEffects(this, getControlObjectId());
}
}

22
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -78,7 +78,7 @@ import org.l2jmobius.gameserver.data.xml.impl.PlayerXpPercentLostData;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.enums.ChatType;
@@ -2684,7 +2684,7 @@ public class PlayerInstance extends Playable
{
int skillCounter = 0;
// Get available skills.
final Collection<Skill> skills = SkillTreesData.getInstance().getAllAvailableSkills(this, getClassId(), includedByFs, includeAutoGet);
final Collection<Skill> skills = SkillTreeData.getInstance().getAllAvailableSkills(this, getClassId(), includedByFs, includeAutoGet);
final List<Skill> skillsForStore = new ArrayList<>();
for (Skill sk : skills)
@@ -2722,7 +2722,7 @@ public class PlayerInstance extends Playable
public void giveAvailableAutoGetSkills()
{
// Get available skills.
final List<SkillLearn> autoGetSkills = SkillTreesData.getInstance().getAvailableAutoGetSkills(this);
final List<SkillLearn> autoGetSkills = SkillTreeData.getInstance().getAvailableAutoGetSkills(this);
final SkillData st = SkillData.getInstance();
Skill skill;
for (SkillLearn s : autoGetSkills)
@@ -7961,7 +7961,7 @@ public class PlayerInstance extends Playable
// Add the Skill object to the Creature _skills and its Func objects to the calculator set of the Creature
addSkill(skill);
if (Config.SKILL_CHECK_ENABLE && (!canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS) || Config.SKILL_CHECK_GM) && !SkillTreesData.getInstance().isSkillAllowed(this, skill))
if (Config.SKILL_CHECK_ENABLE && (!canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS) || Config.SKILL_CHECK_GM) && !SkillTreeData.getInstance().isSkillAllowed(this, skill))
{
Util.handleIllegalPlayerAction(this, "Player " + getName() + " has invalid skill " + skill.getName() + " (" + skill.getId() + "/" + skill.getLevel() + "), class:" + ClassListData.getInstance().getClass(getClassId()).getClassName(), IllegalActionPunishmentType.BROADCAST);
if (Config.SKILL_CHECK_REMOVE)
@@ -9865,14 +9865,14 @@ public class PlayerInstance extends Playable
{
if (hero && (_baseClass == _activeClass))
{
for (Skill skill : SkillTreesData.getInstance().getHeroSkillTree().values())
for (Skill skill : SkillTreeData.getInstance().getHeroSkillTree().values())
{
addSkill(skill, false); // Don't persist hero skills into database
}
}
else
{
for (Skill skill : SkillTreesData.getInstance().getHeroSkillTree().values())
for (Skill skill : SkillTreeData.getInstance().getHeroSkillTree().values())
{
removeSkill(skill, false, true); // Just remove skills from non-hero players
}
@@ -10034,7 +10034,7 @@ public class PlayerInstance extends Playable
public void setNoble(boolean value)
{
final Collection<Skill> nobleSkillTree = SkillTreesData.getInstance().getNobleSkillTree().values();
final Collection<Skill> nobleSkillTree = SkillTreeData.getInstance().getNobleSkillTree().values();
if (value)
{
for (Skill skill : nobleSkillTree)
@@ -10157,7 +10157,7 @@ public class PlayerInstance extends Playable
}
// Add collection skills.
for (SkillLearn skill : SkillTreesData.getInstance().getCollectSkillTree().values())
for (SkillLearn skill : SkillTreeData.getInstance().getCollectSkillTree().values())
{
if (getKnownSkill(skill.getSkillId()) != null)
{
@@ -10229,7 +10229,7 @@ public class PlayerInstance extends Playable
getSubClasses().put(newClass.getClassIndex(), newClass);
final ClassId subTemplate = ClassId.getClassId(classId);
final Map<Integer, SkillLearn> skillTree = SkillTreesData.getInstance().getCompleteClassSkillTree(subTemplate);
final Map<Integer, SkillLearn> skillTree = SkillTreeData.getInstance().getCompleteClassSkillTree(subTemplate);
final Map<Integer, Skill> prevSkillList = new HashMap<>();
for (SkillLearn skillInfo : skillTree.values())
{
@@ -13783,7 +13783,7 @@ public class PlayerInstance extends Playable
{
for (Entry<Integer, Skill> e : getSkills().entrySet())
{
final SkillLearn learn = SkillTreesData.getInstance().getClassSkill(e.getKey(), e.getValue().getLevel() % 100, getClassId());
final SkillLearn learn = SkillTreeData.getInstance().getClassSkill(e.getKey(), e.getValue().getLevel() % 100, getClassId());
if (learn != null)
{
final int lvlDiff = e.getKey() == CommonSkill.EXPERTISE.getId() ? 0 : 9;
@@ -13798,7 +13798,7 @@ public class PlayerInstance extends Playable
private void deacreaseSkillLevel(Skill skill, int lvlDiff)
{
int nextLevel = -1;
final Map<Integer, SkillLearn> skillTree = SkillTreesData.getInstance().getCompleteClassSkillTree(getClassId());
final Map<Integer, SkillLearn> skillTree = SkillTreeData.getInstance().getCompleteClassSkillTree(getClassId());
for (SkillLearn sl : skillTree.values())
{
if ((sl.getSkillId() == skill.getId()) && (nextLevel < sl.getSkillLevel()) && (getLevel() >= (sl.getGetLevel() - lvlDiff)))

14
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/ServitorInstance.java
View File

@@ -29,7 +29,7 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable;
import org.l2jmobius.gameserver.data.sql.impl.SummonEffectsTable;
import org.l2jmobius.gameserver.data.sql.impl.SummonEffectTable;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.enums.InstanceType;
import org.l2jmobius.gameserver.model.WorldObject;
@@ -189,7 +189,7 @@ public class ServitorInstance extends Summon implements Runnable
public void stopSkillEffects(boolean removed, int skillId)
{
super.stopSkillEffects(removed, skillId);
SummonEffectsTable.getInstance().removeServitorEffects(getOwner(), getReferenceSkill(), skillId);
SummonEffectTable.getInstance().removeServitorEffects(getOwner(), getReferenceSkill(), skillId);
}
@Override
@@ -215,7 +215,7 @@ public class ServitorInstance extends Summon implements Runnable
}
// Clear list for overwrite
SummonEffectsTable.getInstance().clearServitorEffects(getOwner(), getReferenceSkill());
SummonEffectTable.getInstance().clearServitorEffects(getOwner(), getReferenceSkill());
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(DELETE_SKILL_SAVE))
@@ -276,7 +276,7 @@ public class ServitorInstance extends Summon implements Runnable
ps2.setInt(7, ++buffIndex);
ps2.addBatch();
SummonEffectsTable.getInstance().addServitorEffect(getOwner(), getReferenceSkill(), skill, info.getTime());
SummonEffectTable.getInstance().addServitorEffect(getOwner(), getReferenceSkill(), skill, info.getTime());
}
ps2.executeBatch();
}
@@ -298,7 +298,7 @@ public class ServitorInstance extends Summon implements Runnable
try (Connection con = DatabaseFactory.getConnection())
{
if (!SummonEffectsTable.getInstance().containsSkill(getOwner(), getReferenceSkill()))
if (!SummonEffectTable.getInstance().containsSkill(getOwner(), getReferenceSkill()))
{
try (PreparedStatement ps = con.prepareStatement(RESTORE_SKILL_SAVE))
{
@@ -319,7 +319,7 @@ public class ServitorInstance extends Summon implements Runnable
if (skill.hasEffects(EffectScope.GENERAL))
{
SummonEffectsTable.getInstance().addServitorEffect(getOwner(), getReferenceSkill(), skill, effectCurTime);
SummonEffectTable.getInstance().addServitorEffect(getOwner(), getReferenceSkill(), skill, effectCurTime);
}
}
}
@@ -340,7 +340,7 @@ public class ServitorInstance extends Summon implements Runnable
}
finally
{
SummonEffectsTable.getInstance().applyServitorEffects(this, getOwner(), getReferenceSkill());
SummonEffectTable.getInstance().applyServitorEffects(this, getOwner(), getReferenceSkill());
}
}

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@@ -30,7 +30,7 @@ import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
import org.l2jmobius.gameserver.data.xml.impl.CategoryData;
import org.l2jmobius.gameserver.data.xml.impl.ClassListData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.enums.InstanceType;
import org.l2jmobius.gameserver.enums.Race;
@@ -1323,7 +1323,7 @@ public class VillageMasterInstance extends NpcInstance
return;
}
final List<SkillLearn> skills = SkillTreesData.getInstance().getAvailablePledgeSkills(player.getClan());
final List<SkillLearn> skills = SkillTreeData.getInstance().getAvailablePledgeSkills(player.getClan());
final AcquireSkillList asl = new AcquireSkillList(AcquireSkillType.PLEDGE);
int counts = 0;

6
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform;
import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
@@ -298,7 +298,7 @@ public class Transform implements IIdentifiable
for (SkillHolder holder : template.getSkills())
{
final Skill skill = holder.getSkill();
if (!SkillTreesData.getInstance().isSkillAllowed(player, skill))
if (!SkillTreeData.getInstance().isSkillAllowed(player, skill))
{
player.removeSkill(skill, false, skill.isPassive());
}
@@ -311,7 +311,7 @@ public class Transform implements IIdentifiable
for (AdditionalSkillHolder holder : template.getAdditionalSkills())
{
final Skill skill = holder.getSkill();
if ((player.getLevel() >= holder.getMinLevel()) && !SkillTreesData.getInstance().isSkillAllowed(player, skill))
if ((player.getLevel() >= holder.getMinLevel()) && !SkillTreeData.getInstance().isSkillAllowed(player, skill))
{
player.removeSkill(skill, false, skill.isPassive());
}

6
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java
View File

@@ -41,7 +41,7 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
import org.l2jmobius.gameserver.data.sql.impl.CrestTable;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
@@ -1421,7 +1421,7 @@ public class Clan implements IIdentifiable, INamable
final int playerSocialClass = player.getPledgeClass() + 1;
for (Skill skill : _skills.values())
{
final SkillLearn skillLearn = SkillTreesData.getInstance().getPledgeSkill(skill.getId(), skill.getLevel());
final SkillLearn skillLearn = SkillTreeData.getInstance().getPledgeSkill(skill.getId(), skill.getLevel());
if ((skillLearn == null) || (skillLearn.getSocialClass() == null) || (playerSocialClass >= skillLearn.getSocialClass().ordinal()))
{
player.addSkill(skill, false); // Skill is not saved to player DB
@@ -1431,7 +1431,7 @@ public class Clan implements IIdentifiable, INamable
{
for (Skill skill : _subPledgeSkills.values())
{
final SkillLearn skillLearn = SkillTreesData.getInstance().getSubPledgeSkill(skill.getId(), skill.getLevel());
final SkillLearn skillLearn = SkillTreeData.getInstance().getSubPledgeSkill(skill.getId(), skill.getLevel());
if ((skillLearn == null) || (skillLearn.getSocialClass() == null) || (playerSocialClass >= skillLearn.getSocialClass().ordinal()))
{
player.addSkill(skill, false); // Skill is not saved to player DB

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/AbstractResidence.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.entity;
import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.ListenersContainer;
@@ -50,7 +50,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN
protected void initResidentialSkills()
{
for (SkillLearn s : SkillTreesData.getInstance().getAvailableResidentialSkills(getResidenceId()))
for (SkillLearn s : SkillTreeData.getInstance().getAvailableResidentialSkills(getResidenceId()))
{
_residentialSkills.add(new SkillHolder(s.getSkillId(), s.getSkillLevel()));
}

6
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Castle.java
View File

@@ -33,7 +33,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
import org.l2jmobius.gameserver.data.xml.impl.DoorData;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.enums.MountType;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
@@ -1016,7 +1016,7 @@ public class Castle extends AbstractResidence
{
for (int wardId : territory.getOwnedWardIds())
{
final List<SkillLearn> territorySkills = SkillTreesData.getInstance().getAvailableResidentialSkills(wardId);
final List<SkillLearn> territorySkills = SkillTreeData.getInstance().getAvailableResidentialSkills(wardId);
for (SkillLearn s : territorySkills)
{
final Skill sk = SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel());
@@ -1041,7 +1041,7 @@ public class Castle extends AbstractResidence
{
for (int wardId : TerritoryWarManager.getInstance().getTerritory(getResidenceId()).getOwnedWardIds())
{
final List<SkillLearn> territorySkills = SkillTreesData.getInstance().getAvailableResidentialSkills(wardId);
final List<SkillLearn> territorySkills = SkillTreeData.getInstance().getAvailableResidentialSkills(wardId);
for (SkillLearn s : territorySkills)
{
final Skill sk = SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel());

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders;
import java.util.HashMap;
import java.util.Map;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder;
import org.l2jmobius.gameserver.model.skills.Skill;
@@ -36,7 +36,7 @@ public class PlayerSkillHolder implements ISkillsHolder
for (Skill skill : player.getSkills().values())
{
// Adding only skills that can be learned by the player.
if (SkillTreesData.getInstance().isSkillAllowed(player, skill))
if (SkillTreeData.getInstance().isSkillAllowed(player, skill))
{
addSkill(skill);
}

12
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -29,7 +29,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.data.xml.impl.ArmorSetsData;
import org.l2jmobius.gameserver.data.xml.impl.ArmorSetData;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.enums.ItemLocation;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
@@ -494,11 +494,11 @@ public abstract class Inventory extends ItemContainer
}
// Checks for armor set for the equipped chest.
if (!ArmorSetsData.getInstance().isArmorSet(chestItem.getId()))
if (!ArmorSetData.getInstance().isArmorSet(chestItem.getId()))
{
return;
}
final ArmorSet armorSet = ArmorSetsData.getInstance().getSet(chestItem.getId());
final ArmorSet armorSet = ArmorSetData.getInstance().getSet(chestItem.getId());
boolean update = false;
boolean updateTimeStamp = false;
// Checks if equipped item is part of set
@@ -619,11 +619,11 @@ public abstract class Inventory extends ItemContainer
if (slot == PAPERDOLL_CHEST)
{
if (!ArmorSetsData.getInstance().isArmorSet(item.getId()))
if (!ArmorSetData.getInstance().isArmorSet(item.getId()))
{
return;
}
final ArmorSet armorSet = ArmorSetsData.getInstance().getSet(item.getId());
final ArmorSet armorSet = ArmorSetData.getInstance().getSet(item.getId());
remove = true;
skills = armorSet.getSkills();
shieldSkill = armorSet.getShieldSkillId();
@@ -637,7 +637,7 @@ public abstract class Inventory extends ItemContainer
return;
}
final ArmorSet armorSet = ArmorSetsData.getInstance().getSet(chestItem.getId());
final ArmorSet armorSet = ArmorSetData.getInstance().getSet(chestItem.getId());
if (armorSet == null)
{
return;

8
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -30,7 +30,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.geoengine.GeoEngine;
import org.l2jmobius.gameserver.handler.ITargetTypeHandler;
@@ -325,10 +325,10 @@ public class Skill implements IIdentifiable
_soulMaxConsume = set.getInt("soulMaxConsumeCount", 0);
_blowChance = set.getInt("blowChance", 0);
_isHeroSkill = SkillTreesData.getInstance().isHeroSkill(_id, _level);
_isGMSkill = SkillTreesData.getInstance().isGMSkill(_id, _level);
_isHeroSkill = SkillTreeData.getInstance().isHeroSkill(_id, _level);
_isGMSkill = SkillTreeData.getInstance().isGMSkill(_id, _level);
_isSevenSigns = (_id > 4360) && (_id < 4367);
_isClanSkill = SkillTreesData.getInstance().isClanSkill(_id, _level);
_isClanSkill = SkillTreeData.getInstance().isClanSkill(_id, _level);
_baseCritRate = set.getInt("baseCritRate", 0);
_directHpDmg = set.getBoolean("dmgDirectlyToHp", false);

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.functions.formulas;
import java.util.EnumMap;
import java.util.Map;
import org.l2jmobius.gameserver.data.xml.impl.ArmorSetsData;
import org.l2jmobius.gameserver.data.xml.impl.ArmorSetData;
import org.l2jmobius.gameserver.model.ArmorSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -60,7 +60,7 @@ public class FuncArmorSet extends AbstractFunction
final ItemInstance chest = player.getChestArmorInstance();
if (chest != null)
{
final ArmorSet set = ArmorSetsData.getInstance().getSet(chest.getId());
final ArmorSet set = ArmorSetData.getInstance().getSet(chest.getId());
if ((set != null) && set.containAll(player))
{
switch (getStat())

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
View File

@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.data.xml.impl.InitialEquipmentData;
import org.l2jmobius.gameserver.data.xml.impl.InitialShortcutData;
import org.l2jmobius.gameserver.data.xml.impl.PlayerTemplateData;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.SkillLearn;
@@ -306,7 +306,7 @@ public class CharacterCreate implements IClientIncomingPacket
}
}
for (SkillLearn skill : SkillTreesData.getInstance().getAvailableSkills(newChar, newChar.getClassId(), false, true))
for (SkillLearn skill : SkillTreeData.getInstance().getAvailableSkills(newChar, newChar.getClassId(), false, true))
{
newChar.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true);
}

10
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.SevenSigns;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.sql.impl.AnnouncementsTable;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTradersTable;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable;
import org.l2jmobius.gameserver.data.xml.impl.AdminData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.instancemanager.CHSiegeManager;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
@@ -214,12 +214,12 @@ public class EnterWorld implements IClientIncomingPacket
if (Config.GM_GIVE_SPECIAL_SKILLS)
{
SkillTreesData.getInstance().addSkills(player, false);
SkillTreeData.getInstance().addSkills(player, false);
}
if (Config.GM_GIVE_SPECIAL_AURA_SKILLS)
{
SkillTreesData.getInstance().addSkills(player, true);
SkillTreeData.getInstance().addSkills(player, true);
}
}
@@ -614,7 +614,7 @@ public class EnterWorld implements IClientIncomingPacket
if ((Config.OFFLINE_TRADE_ENABLE || Config.OFFLINE_CRAFT_ENABLE) && Config.STORE_OFFLINE_TRADE_IN_REALTIME)
{
OfflineTradersTable.onTransaction(player, true, false);
OfflineTraderTable.onTransaction(player, true, false);
}
// Check if expoff is enabled.

6
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType;
import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.SkillLearn;
@@ -130,7 +130,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
}
}
final SkillLearn s = SkillTreesData.getInstance().getSkillLearn(_skillType, _id, _level, player);
final SkillLearn s = SkillTreeData.getInstance().getSkillLearn(_skillType, _id, _level, player);
if (s == null)
{
return;
@@ -383,7 +383,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
public static void showSubUnitSkillList(PlayerInstance player)
{
final List<SkillLearn> skills = SkillTreesData.getInstance().getAvailableSubPledgeSkills(player.getClan());
final List<SkillLearn> skills = SkillTreeData.getInstance().getAvailableSubPledgeSkills(player.getClan());
final AcquireSkillList asl = new AcquireSkillList(AcquireSkillType.SUBPLEDGE);
int count = 0;

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
View File

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -75,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
return;
}
final SkillLearn s = SkillTreesData.getInstance().getSkillLearn(_skillType, _id, _level, player);
final SkillLearn s = SkillTreeData.getInstance().getSkillLearn(_skillType, _id, _level, player);
if (s == null)
{
return;

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
View File

@@ -23,7 +23,7 @@ import java.util.Set;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTradersTable;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.ItemRequest;
import org.l2jmobius.gameserver.model.TradeList;
@@ -151,7 +151,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket
// Update offline trade record, if realtime saving is enabled
if (Config.OFFLINE_TRADE_ENABLE && Config.STORE_OFFLINE_TRADE_IN_REALTIME && ((storePlayer.getClient() == null) || storePlayer.getClient().isDetached()))
{
OfflineTradersTable.onTransaction(storePlayer, storeList.getItemCount() == 0, false);
OfflineTraderTable.onTransaction(storePlayer, storeList.getItemCount() == 0, false);
}
if (storeList.getItemCount() == 0)

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
View File

@@ -20,7 +20,7 @@ import static org.l2jmobius.gameserver.model.actor.Npc.INTERACTION_DISTANCE;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTradersTable;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.ItemRequest;
import org.l2jmobius.gameserver.model.TradeList;
@@ -140,7 +140,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
// Update offline trade record, if realtime saving is enabled
if (Config.OFFLINE_TRADE_ENABLE && Config.STORE_OFFLINE_TRADE_IN_REALTIME && ((storePlayer.getClient() == null) || storePlayer.getClient().isDetached()))
{
OfflineTradersTable.onTransaction(storePlayer, storeList.getItemCount() == 0, false);
OfflineTraderTable.onTransaction(storePlayer, storeList.getItemCount() == 0, false);
}
if (storeList.getItemCount() == 0)

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.util;
import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTradersTable;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable;
import org.l2jmobius.gameserver.instancemanager.PlayerCountManager;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -138,7 +138,7 @@ public class OfflineTradeUtil
// Store trade on exit, if realtime saving is enabled.
if (Config.STORE_OFFLINE_TRADE_IN_REALTIME)
{
OfflineTradersTable.onTransaction(player, false, true);
OfflineTraderTable.onTransaction(player, false, true);
}
player.storeMe();