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

StatsSet properly named as StatSet.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-26 15:07:31 +00:00
parent 9d155febb7
commit 8b5af84230
10201 changed files with 38171 additions and 38171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java
View File

@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.logging.Logger;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
import org.l2jmobius.gameserver.model.base.ClassId;
@@ -171,7 +171,7 @@ public class CharTemplateTable
while (rset.next())
{
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
set.set("classId", rset.getInt("id"));
set.set("className", rset.getString("className"));
set.set("raceId", rset.getInt("raceId"));

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/HelperBuffTable.java
View File

@@ -24,7 +24,7 @@ import java.util.List;
import java.util.logging.Logger;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.holders.HelperBuffHolder;
/**
@@ -84,7 +84,7 @@ public class HelperBuffTable
{
while (helperBuffData.next())
{
final StatsSet helperBuffDat = new StatsSet();
final StatSet helperBuffDat = new StatSet();
final int id = helperBuffData.getInt("id");
helperBuffDat.set("id", id);

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java
View File

@@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.DropCategory;
import org.l2jmobius.gameserver.model.DropData;
import org.l2jmobius.gameserver.model.MinionData;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.base.ClassId;
import org.l2jmobius.gameserver.model.skills.BaseStat;
@@ -284,7 +284,7 @@ public class NpcTable
{
while (npcData.next())
{
final StatsSet npcDat = new StatsSet();
final StatSet npcDat = new StatSet();
final int id = npcData.getInt("id");
@@ -606,7 +606,7 @@ public class NpcTable
load();
}
public void saveNpc(StatsSet npc)
public void saveNpc(StatSet npc)
{
try (Connection con = DatabaseFactory.getConnection())
{

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AdminData.java
View File

@@ -31,7 +31,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.AccessLevel;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.GameServerPacket;
@@ -75,7 +75,7 @@ public class AdminData implements IXmlReader
@Override
public void parseDocument(Document doc, File f)
{
StatsSet set = null;
StatSet set = null;
String command = null;
int accessLevel = 0;
String name = null;
@@ -101,7 +101,7 @@ public class AdminData implements IXmlReader
{
if ("access".equals(d.getNodeName()))
{
set = new StatsSet(parseAttributes(d));
set = new StatSet(parseAttributes(d));
accessLevel = set.getInt("level");
name = set.getString("name");
@@ -175,7 +175,7 @@ public class AdminData implements IXmlReader
}
else if ("admin".equals(d.getNodeName()))
{
set = new StatsSet(parseAttributes(d));
set = new StatSet(parseAttributes(d));
command = set.getString("command");
accessLevel = set.getInt("accessLevel");

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/DoorData.java
View File

@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.idfactory.IdFactory;
import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;
import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
import org.l2jmobius.gameserver.model.entity.ClanHall;
@@ -57,7 +57,7 @@ public class DoorData implements IXmlReader
{
try
{
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
final Node n = doc.getFirstChild();
for (Node node = n.getFirstChild(); node != null; node = node.getNextSibling())
@@ -91,7 +91,7 @@ public class DoorData implements IXmlReader
}
}
public static DoorInstance createDoor(StatsSet set)
public static DoorInstance createDoor(StatSet set)
{
final String name = set.getString("name");
final int id = set.getInt("id");
@@ -135,7 +135,7 @@ public class DoorData implements IXmlReader
collisionRadius = xMax - xMin;
}
final StatsSet npcDat = new StatsSet();
final StatSet npcDat = new StatSet();
npcDat.set("npcId", id);
npcDat.set("level", 0);
npcDat.set("jClass", "door");

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/FishData.java
View File

@@ -28,7 +28,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.model.Fish;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
/**
* This class loads and stores {@link Fish} infos.
@@ -52,8 +52,8 @@ public class FishData implements IXmlReader
@Override
public void parseDocument(Document doc, File f)
{
// StatsSet used to feed informations. Cleaned on every entry.
final StatsSet set = new StatsSet();
// StatSet used to feed informations. Cleaned on every entry.
final StatSet set = new StatSet();
// First element is never read.
final Node n = doc.getFirstChild();

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/HennaData.java
View File

@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.items.Henna;
@@ -54,8 +54,8 @@ public class HennaData implements IXmlReader
@Override
public void parseDocument(Document doc, File f)
{
// StatsSet used to feed informations. Cleaned on every entry.
final StatsSet set = new StatsSet();
// StatSet used to feed informations. Cleaned on every entry.
final StatSet set = new StatSet();
// First element is never read.
final Node n = doc.getFirstChild();

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.Skill.SkillType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.items.Item;
import org.l2jmobius.gameserver.model.items.Weapon;
@@ -123,7 +123,7 @@ public abstract class DocumentBase
protected abstract void parseDocument(Document doc);
protected abstract StatsSet getStatsSet();
protected abstract StatSet getStatSet();
protected abstract String getTableValue(String name);
@@ -873,7 +873,7 @@ public abstract class DocumentBase
setTable(name, res);
}
protected void parseBeanSet(Node n, StatsSet set, Integer level)
protected void parseBeanSet(Node n, StatSet set, Integer level)
{
final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim();
final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim();
@@ -921,7 +921,7 @@ public abstract class DocumentBase
}
// try to find value out of item fields
final StatsSet set = getStatsSet();
final StatSet set = getStatSet();
final String field = set.getString(val.substring(1));
if (field != null)
{

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentItem.java
View File

@@ -26,7 +26,7 @@ import java.util.logging.Level;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.items.Armor;
import org.l2jmobius.gameserver.model.items.EtcItem;
import org.l2jmobius.gameserver.model.items.Item;
@@ -104,7 +104,7 @@ final class DocumentItem extends DocumentBase
}
@Override
protected StatsSet getStatsSet()
protected StatSet getStatSet()
{
return _currentItem.set;
}
@@ -157,7 +157,7 @@ final class DocumentItem extends DocumentBase
_currentItem.id = itemId;
_currentItem.name = itemName;
_currentItem.set = new StatsSet();
_currentItem.set = new StatSet();
_currentItem.set.set("item_id", itemId);
_currentItem.set.set("name", itemName);

16
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentSkill.java
View File

@@ -26,7 +26,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.Skill.SkillType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.skills.conditions.Condition;
/**
@@ -48,7 +48,7 @@ final class DocumentSkill extends DocumentBase
}
@Override
protected StatsSet getStatsSet()
protected StatSet getStatSet()
{
return _currentSkill.sets[_currentSkill.currentLevel];
}
@@ -135,13 +135,13 @@ final class DocumentSkill extends DocumentBase
_currentSkill.id = skillId;
_currentSkill.name = skillName;
_currentSkill.sets = new StatsSet[lastLvl];
_currentSkill.enchsets1 = new StatsSet[enchantLevels1];
_currentSkill.enchsets2 = new StatsSet[enchantLevels2];
_currentSkill.sets = new StatSet[lastLvl];
_currentSkill.enchsets1 = new StatSet[enchantLevels1];
_currentSkill.enchsets2 = new StatSet[enchantLevels2];
for (int i = 0; i < lastLvl; i++)
{
_currentSkill.sets[i] = new StatsSet();
_currentSkill.sets[i] = new StatSet();
_currentSkill.sets[i].set("skill_id", _currentSkill.id);
_currentSkill.sets[i].set("level", i + 1);
_currentSkill.sets[i].set("name", _currentSkill.name);
@@ -174,7 +174,7 @@ final class DocumentSkill extends DocumentBase
for (int i = 0; i < enchantLevels1; i++)
{
_currentSkill.enchsets1[i] = new StatsSet();
_currentSkill.enchsets1[i] = new StatSet();
_currentSkill.enchsets1[i].set("skill_id", _currentSkill.id);
_currentSkill.enchsets1[i].set("level", i + 101);
_currentSkill.enchsets1[i].set("name", _currentSkill.name);
@@ -203,7 +203,7 @@ final class DocumentSkill extends DocumentBase
for (int i = 0; i < enchantLevels2; i++)
{
_currentSkill.enchsets2[i] = new StatsSet();
_currentSkill.enchsets2[i] = new StatSet();
_currentSkill.enchsets2[i].set("skill_id", _currentSkill.id);
_currentSkill.enchsets2[i].set("level", i + 141);
_currentSkill.enchsets2[i].set("name", _currentSkill.name);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/ItemDataHolder.java
View File

@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.engines;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.items.Item;
/**
@@ -28,7 +28,7 @@ public class ItemDataHolder
public int id;
public Enum<?> type;
public String name;
public StatsSet set;
public StatSet set;
public int currentLevel;
public Item item;
}

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/SkillDataHolder.java
View File

@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
/**
* @author Mobius
@@ -29,9 +29,9 @@ public class SkillDataHolder
{
public int id;
public String name;
public StatsSet[] sets;
public StatsSet[] enchsets1;
public StatsSet[] enchsets2;
public StatSet[] sets;
public StatSet[] enchsets1;
public StatSet[] enchsets2;
public int currentLevel;
public List<Skill> skills = new ArrayList<>();
public List<Skill> currentSkills = new ArrayList<>();

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java
View File

@@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.DropCategory;
import org.l2jmobius.gameserver.model.DropData;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -920,7 +920,7 @@ public class AdminEditNpc implements IAdminCommandHandler
private void save_npc_property(PlayerInstance activeChar, String[] commandSplit)
{
final StatsSet newNpcData = new StatsSet();
final StatSet newNpcData = new StatSet();
try
{

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java
View File

@@ -319,7 +319,7 @@ public class AdminSpawn implements IAdminCommandHandler
if (RaidBossSpawnManager.getInstance().getValidTemplate(spawn.getNpcId()) != null)
{
RaidBossSpawnManager.getInstance().addNewSpawn(spawn, 0, template1.getStatsSet().getDouble("baseHpMax"), template1.getStatsSet().getDouble("baseMpMax"), permanent);
RaidBossSpawnManager.getInstance().addNewSpawn(spawn, 0, template1.getStatSet().getDouble("baseHpMax"), template1.getStatSet().getDouble("baseMpMax"), permanent);
}
else
{

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java
View File

@@ -28,7 +28,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.idfactory.IdFactory;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.BoatInstance;
import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
@@ -141,7 +141,7 @@ public class BoatManager
final int zspawn = Integer.parseInt(st.nextToken());
final int heading = Integer.parseInt(st.nextToken());
final StatsSet npcDat = new StatsSet();
final StatSet npcDat = new StatSet();
npcDat.set("npcId", id);
npcDat.set("level", 0);
npcDat.set("jClass", "boat");

20
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
View File

@@ -30,7 +30,7 @@ import java.util.logging.Logger;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.datatables.sql.NpcTable;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
@@ -65,7 +65,7 @@ public class GrandBossManager
private static final String UPDATE_GRAND_BOSS_DATA2 = "UPDATE grandboss_data set status = ? where boss_id = ?";
protected static Map<Integer, GrandBossInstance> _bosses;
protected static Map<Integer, StatsSet> _storedInfo;
protected static Map<Integer, StatSet> _storedInfo;
private Map<Integer, Integer> _bossStatus;
private Collection<BossZone> _zones;
@@ -87,7 +87,7 @@ public class GrandBossManager
while (rset.next())
{
// Read all info from DB, and store it for AI to read and decide what to do faster than accessing DB in real time
final StatsSet info = new StatsSet();
final StatSet info = new StatSet();
final int bossId = rset.getInt("boss_id");
info.set("loc_x", rset.getInt("loc_x"));
info.set("loc_y", rset.getInt("loc_y"));
@@ -248,12 +248,12 @@ public class GrandBossManager
return _bosses.remove(bossId);
}
public StatsSet getStatsSet(int bossId)
public StatSet getStatSet(int bossId)
{
return _storedInfo.get(bossId);
}
public void setStatsSet(int bossId, StatsSet info)
public void setStatSet(int bossId, StatSet info)
{
if (_storedInfo.containsKey(bossId))
{
@@ -268,11 +268,11 @@ public class GrandBossManager
{
try (Connection con = DatabaseFactory.getConnection())
{
for (Entry<Integer, StatsSet> entry : _storedInfo.entrySet())
for (Entry<Integer, StatSet> entry : _storedInfo.entrySet())
{
final int bossId = entry.getKey();
final GrandBossInstance boss = _bosses.get(bossId);
final StatsSet info = entry.getValue();
final StatSet info = entry.getValue();
if ((boss == null) || (info == null))
{
final PreparedStatement update2 = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2);
@@ -341,11 +341,11 @@ public class GrandBossManager
}
}
for (Entry<Integer, StatsSet> entry : _storedInfo.entrySet())
for (Entry<Integer, StatSet> entry : _storedInfo.entrySet())
{
final int bossId = entry.getKey();
final GrandBossInstance boss = _bosses.get(bossId);
final StatsSet info = entry.getValue();
final StatSet info = entry.getValue();
if ((boss == null) || (info == null))
{
final PreparedStatement update2 = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2);
@@ -390,7 +390,7 @@ public class GrandBossManager
try (Connection con = DatabaseFactory.getConnection())
{
final GrandBossInstance boss = _bosses.get(bossId);
final StatsSet info = _storedInfo.get(bossId);
final StatSet info = _storedInfo.get(bossId);
if (statusOnly || (boss == null) || (info == null))
{

18
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.datatables.sql.NpcTable;
import org.l2jmobius.gameserver.datatables.sql.SpawnTable;
import org.l2jmobius.gameserver.datatables.xml.AdminData;
import org.l2jmobius.gameserver.enums.RaidBossStatus;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.RaidBossInstance;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.entity.Announcements;
@@ -52,7 +52,7 @@ public class RaidBossSpawnManager
protected static final Map<Integer, RaidBossInstance> _bosses = new ConcurrentHashMap<>();
protected static final Map<Integer, Spawn> _spawns = new ConcurrentHashMap<>();
protected static final Map<Integer, StatsSet> _storedInfo = new ConcurrentHashMap<>();
protected static final Map<Integer, StatSet> _storedInfo = new ConcurrentHashMap<>();
protected static final Map<Integer, ScheduledFuture<?>> _schedules = new ConcurrentHashMap<>();
/**
@@ -143,7 +143,7 @@ public class RaidBossSpawnManager
{
raidboss.setRaidStatus(RaidBossStatus.ALIVE);
final StatsSet info = new StatsSet();
final StatSet info = new StatSet();
info.set("currentHP", raidboss.getCurrentHp());
info.set("currentMP", raidboss.getCurrentMp());
info.set("respawnTime", 0);
@@ -175,7 +175,7 @@ public class RaidBossSpawnManager
*/
public void updateStatus(RaidBossInstance boss, boolean isBossDead)
{
final StatsSet info = _storedInfo.get(boss.getNpcId());
final StatSet info = _storedInfo.get(boss.getNpcId());
if (info == null)
{
return;
@@ -255,7 +255,7 @@ public class RaidBossSpawnManager
_bosses.put(bossId, raidboss);
final StatsSet info = new StatsSet();
final StatSet info = new StatSet();
info.set("currentHP", currentHP);
info.set("currentMP", currentMP);
info.set("respawnTime", 0);
@@ -378,7 +378,7 @@ public class RaidBossSpawnManager
updateStatus(boss, false);
}
final StatsSet info = _storedInfo.get(bossId);
final StatSet info = _storedInfo.get(bossId);
if (info == null)
{
@@ -498,7 +498,7 @@ public class RaidBossSpawnManager
*/
public void notifySpawnNightBoss(RaidBossInstance raidboss)
{
final StatsSet info = new StatsSet();
final StatSet info = new StatSet();
info.set("currentHP", raidboss.getCurrentHp());
info.set("currentMP", raidboss.getCurrentMp());
info.set("respawnTime", 0);
@@ -544,7 +544,7 @@ public class RaidBossSpawnManager
* Gets the stored info.
* @return the stored info
*/
public Map<Integer, StatsSet> getStoredInfo()
public Map<Integer, StatSet> getStoredInfo()
{
return _storedInfo;
}
@@ -568,7 +568,7 @@ public class RaidBossSpawnManager
_spawns.clear();
}
public StatsSet getStatsSet(int bossId)
public StatSet getStatSet(int bossId)
{
return _storedInfo.get(bossId);
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ChanceCondition.java
View File

@@ -89,7 +89,7 @@ public class ChanceCondition
_chance = chance;
}
public static ChanceCondition parse(StatsSet set)
public static ChanceCondition parse(StatSet set)
{
try
{

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fish.java
View File

@@ -34,7 +34,7 @@ public class Fish
private final int _waitTime;
private final int _combatTime;
public Fish(StatsSet set)
public Fish(StatSet set)
{
_id = set.getInt("id");
_level = set.getInt("level");

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/NpcWalkerNode.java
View File

@@ -133,9 +133,9 @@ public class NpcWalkerNode
/**
* Constructor of NpcWalker.<BR>
* <BR>
* @param set The StatsSet object to transfert data to the method
* @param set The StatSet object to transfert data to the method
*/
public NpcWalkerNode(StatsSet set)
public NpcWalkerNode(StatSet set)
{
_npcId = set.getInt("npc_id");
_movePoint = set.getString("move_point");

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java
View File

@@ -264,11 +264,11 @@ public abstract class Skill
private final Class<? extends Skill> _class;
public Skill makeSkill(StatsSet set)
public Skill makeSkill(StatSet set)
{
try
{
final Constructor<? extends Skill> c = _class.getConstructor(StatsSet.class);
final Constructor<? extends Skill> c = _class.getConstructor(StatSet.class);
return c.newInstance(set);
}
@@ -512,7 +512,7 @@ public abstract class Skill
private final boolean _advancedFlag;
private final int _advancedMultiplier;
protected Skill(StatsSet set)
protected Skill(StatSet set)
{
_id = set.getInt("skill_id", 0);
_level = set.getInt("level", 1);

44
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StatsSet.java → L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StatSet.java
View File

@@ -38,25 +38,25 @@ import org.l2jmobius.gameserver.util.Util;
* They are stored as object but can be retrieved in any type wanted. As long as cast is available.<br>
* @author mkizub
*/
public class StatsSet implements IParserAdvUtils
public class StatSet implements IParserAdvUtils
{
private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName());
private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName());
/** Static empty immutable map, used to avoid multiple null checks over the source. */
public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap());
public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap());
private final Map<String, Object> _set;
public StatsSet()
public StatSet()
{
this(ConcurrentHashMap::new);
}
public StatsSet(Supplier<Map<String, Object>> mapFactory)
public StatSet(Supplier<Map<String, Object>> mapFactory)
{
this(mapFactory.get());
}
public StatsSet(Map<String, Object> map)
public StatSet(Map<String, Object> map)
{
_set = map;
}
@@ -72,9 +72,9 @@ public class StatsSet implements IParserAdvUtils
/**
* Add a set of couple values in the current set
* @param newSet : StatsSet pointing out the list of couples to add in the current set
* @param newSet : StatSet pointing out the list of couples to add in the current set
*/
public void merge(StatsSet newSet)
public void merge(StatSet newSet)
{
_set.putAll(newSet.getSet());
}
@@ -857,7 +857,7 @@ public class StatsSet implements IParserAdvUtils
return (Map<K, V>) obj;
}
public StatsSet set(String name, Object value)
public StatSet set(String name, Object value)
{
if (value == null)
{
@@ -867,49 +867,49 @@ public class StatsSet implements IParserAdvUtils
return this;
}
public StatsSet set(String key, boolean value)
public StatSet set(String key, boolean value)
{
_set.put(key, value);
return this;
}
public StatsSet set(String key, byte value)
public StatSet set(String key, byte value)
{
_set.put(key, value);
return this;
}
public StatsSet set(String key, short value)
public StatSet set(String key, short value)
{
_set.put(key, value);
return this;
}
public StatsSet set(String key, int value)
public StatSet set(String key, int value)
{
_set.put(key, value);
return this;
}
public StatsSet set(String key, long value)
public StatSet set(String key, long value)
{
_set.put(key, value);
return this;
}
public StatsSet set(String key, float value)
public StatSet set(String key, float value)
{
_set.put(key, value);
return this;
}
public StatsSet set(String key, double value)
public StatSet set(String key, double value)
{
_set.put(key, value);
return this;
}
public StatsSet set(String key, String value)
public StatSet set(String key, String value)
{
if (value == null)
{
@@ -919,7 +919,7 @@ public class StatsSet implements IParserAdvUtils
return this;
}
public StatsSet set(String key, Enum<?> value)
public StatSet set(String key, Enum<?> value)
{
if (value == null)
{
@@ -944,15 +944,15 @@ public class StatsSet implements IParserAdvUtils
if ((min <= max) && ((value < min) || (value >= max)))
{
LOGGER.info("[StatsSet][safeSet] Incorrect value: " + value + "for: " + name + "Ref: " + reference);
LOGGER.info("[StatSet][safeSet] Incorrect value: " + value + "for: " + name + "Ref: " + reference);
}
set(name, value);
}
public static StatsSet valueOf(String key, Object value)
public static StatSet valueOf(String key, Object value)
{
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
set.set(key, value);
return set;
}
@@ -970,6 +970,6 @@ public class StatsSet implements IParserAdvUtils
@Override
public String toString()
{
return "StatsSet{_set=" + _set + '}';
return "StatSet{_set=" + _set + '}';
}
}

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -6530,14 +6530,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
if (bossTemplate.getType().equals("RaidBoss"))
{
if (RaidBossSpawnManager.getInstance().getStatsSet(bossId) != null)
if (RaidBossSpawnManager.getInstance().getStatSet(bossId) != null)
{
bossInstance = RaidBossSpawnManager.getInstance().getBoss(bossId);
}
}
else if (bossTemplate.getType().equals("GrandBoss"))
{
if (GrandBossManager.getInstance().getStatsSet(bossId) != null)
if (GrandBossManager.getInstance().getStatSet(bossId) != null)
{
bossInstance = GrandBossManager.getInstance().getBoss(bossId);
}
@@ -8362,14 +8362,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
if (bossTemplate.getType().equals("RaidBoss"))
{
if (RaidBossSpawnManager.getInstance().getStatsSet(bossId) != null)
if (RaidBossSpawnManager.getInstance().getStatSet(bossId) != null)
{
bossInstance = RaidBossSpawnManager.getInstance().getBoss(bossId);
}
}
else if (bossTemplate.getType().equals("GrandBoss"))
{
if (GrandBossManager.getInstance().getStatsSet(bossId) != null)
if (GrandBossManager.getInstance().getStatSet(bossId) != null)
{
bossInstance = GrandBossManager.getInstance().getBoss(bossId);
}

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuideInstance.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns;
import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSignsFestival;
@@ -322,9 +322,9 @@ public class FestivalGuideInstance extends FolkInstance
case 4: // Current High Scores
{
final StringBuilder strBuffer = new StringBuilder("<html><body>Festival Guide:<br>These are the top scores of the week, for the ");
final StatsSet dawnData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DAWN, _festivalType);
final StatsSet duskData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, _festivalType);
final StatsSet overallData = SevenSignsFestival.getInstance().getOverallHighestScoreData(_festivalType);
final StatSet dawnData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DAWN, _festivalType);
final StatSet duskData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, _festivalType);
final StatSet overallData = SevenSignsFestival.getInstance().getOverallHighestScoreData(_festivalType);
final int dawnScore = dawnData.getInt("score");
final int duskScore = duskData.getInt("score");
int overallScore = 0;

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

@@ -1089,7 +1089,7 @@ public class VillageMasterInstance extends FolkInstance
*/
private final Race getVillageMasterRace()
{
final String npcClass = getTemplate().getStatsSet().getString("jClass").toLowerCase();
final String npcClass = getTemplate().getStatSet().getString("jClass").toLowerCase();
if (npcClass.contains("human"))
{
@@ -1120,7 +1120,7 @@ public class VillageMasterInstance extends FolkInstance
*/
private final ClassType getVillageMasterTeachType()
{
final String npcClass = getTemplate().getStatsSet().getString("jClass");
final String npcClass = getTemplate().getStatSet().getString("jClass");
if (npcClass.contains("sanctuary") || npcClass.contains("clergyman"))
{

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java
View File

@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.model.actor.templates;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
public class CreatureTemplate
{
@@ -93,7 +93,7 @@ public class CreatureTemplate
private final int _collisionRadius;
private final int _collisionHeight;
public CreatureTemplate(StatsSet set)
public CreatureTemplate(StatSet set)
{
// Base stats
_baseSTR = set.getInt("baseSTR");

14
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.DropCategory;
import org.l2jmobius.gameserver.model.DropData;
import org.l2jmobius.gameserver.model.MinionData;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.base.ClassId;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
@@ -114,7 +114,7 @@ public class NpcTemplate extends CreatureTemplate
UNKNOWN
}
private final StatsSet _npcStatsSet;
private final StatSet _npcStatSet;
/** The table containing all Item that can be dropped by NpcInstance using this NpcTemplate */
private final List<DropCategory> _categories = new ArrayList<>();
@@ -130,10 +130,10 @@ public class NpcTemplate extends CreatureTemplate
/**
* Constructor of Creature.
* @param set The StatsSet object to transfer data to the method
* @param set The StatSet object to transfer data to the method
* @param custom
*/
public NpcTemplate(StatsSet set, boolean custom)
public NpcTemplate(StatSet set, boolean custom)
{
super(set);
_npcId = set.getInt("npcId");
@@ -163,7 +163,7 @@ public class NpcTemplate extends CreatureTemplate
setFactionId(f.intern());
}
_factionRange = set.getInt("factionRange", 0);
_npcStatsSet = set;
_npcStatSet = set;
_custom = custom;
}
@@ -353,9 +353,9 @@ public class NpcTemplate extends CreatureTemplate
return _questEvents.get(eventType);
}
public StatsSet getStatsSet()
public StatSet getStatSet()
{
return _npcStatsSet;
return _npcStatSet;
}
public void setRace(int raceId)

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.base.ClassId;
import org.l2jmobius.gameserver.model.items.Item;
@@ -52,7 +52,7 @@ public class PlayerTemplate extends CreatureTemplate
private final List<Item> _items = new ArrayList<>();
public PlayerTemplate(StatsSet set)
public PlayerTemplate(StatSet set)
{
super(set);
_classId = ClassId.getClassId(set.getInt("classId"));

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/ClanHall.java
View File

@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.datatables.sql.ClanTable;
import org.l2jmobius.gameserver.datatables.xml.DoorData;
import org.l2jmobius.gameserver.instancemanager.AuctionManager;
import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.clan.Clan;
@@ -54,7 +54,7 @@ public class ClanHall
public static final int FUNC_DECO_CURTAINS = 8;
final int _clanHallId;
private final List<DoorInstance> _doors = new ArrayList<>();
private final List<StatsSet> _doorDefault = new ArrayList<>();
private final List<StatSet> _doorDefault = new ArrayList<>();
final String _name;
private int _ownerId;
private Clan _ownerClan;
@@ -866,7 +866,7 @@ public class ClanHall
while (rs.next())
{
// Create set of the door default for use when respawning dead doors
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
set.set("name", rs.getString("name"));
set.set("id", rs.getInt("id"));
set.set("x", rs.getInt("x"));

32
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java
View File

@@ -29,7 +29,7 @@ import java.util.logging.Logger;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.datatables.sql.ClanTable;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.clan.Clan;
@@ -58,8 +58,8 @@ public class Hero
private static final String GET_CLAN_NAME = "SELECT clan_name FROM clan_data WHERE clan_id = (SELECT clanid FROM characters WHERE char_name = ?)";
private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621) AND owner_id NOT IN (SELECT obj_id FROM characters WHERE accesslevel > 0)";
private static final List<Integer> _heroItems = Arrays.asList(6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621);
private static Map<Integer, StatsSet> _heroes;
private static Map<Integer, StatsSet> _completeHeroes;
private static Map<Integer, StatSet> _heroes;
private static Map<Integer, StatSet> _completeHeroes;
public static final String COUNT = "count";
public static final String PLAYED = "played";
@@ -88,7 +88,7 @@ public class Hero
rset = statement.executeQuery();
while (rset.next())
{
final StatsSet hero = new StatsSet();
final StatSet hero = new StatSet();
final int charId = rset.getInt(Olympiad.CHAR_ID);
hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME));
hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID));
@@ -130,7 +130,7 @@ public class Hero
rset = statement.executeQuery();
while (rset.next())
{
final StatsSet hero = new StatsSet();
final StatSet hero = new StatSet();
final int charId = rset.getInt(Olympiad.CHAR_ID);
final String charName = rset.getString(Olympiad.CHAR_NAME);
@@ -190,7 +190,7 @@ public class Hero
{
try
{
final StatsSet newHero = new StatsSet();
final StatSet newHero = new StatSet();
newHero.set(Olympiad.CHAR_NAME, player.getName());
newHero.set(Olympiad.CLASS_ID, player.getClassId().getId());
newHero.set(COUNT, 1);
@@ -219,19 +219,19 @@ public class Hero
}
}
public Map<Integer, StatsSet> getHeroes()
public Map<Integer, StatSet> getHeroes()
{
return _heroes;
}
public synchronized void computeNewHeroes(List<StatsSet> newHeroes)
public synchronized void computeNewHeroes(List<StatSet> newHeroes)
{
updateHeroes(true);
ItemInstance[] items;
InventoryUpdate iu;
if (_heroes.size() != 0)
{
for (StatsSet hero : _heroes.values())
for (StatSet hero : _heroes.values())
{
final String name = hero.getString(Olympiad.CHAR_NAME);
final PlayerInstance player = World.getInstance().getPlayer(name);
@@ -305,13 +305,13 @@ public class Hero
_heroes.clear();
return;
}
final Map<Integer, StatsSet> heroes = new HashMap<>();
for (StatsSet hero : newHeroes)
final Map<Integer, StatSet> heroes = new HashMap<>();
for (StatSet hero : newHeroes)
{
final int charId = hero.getInt(Olympiad.CHAR_ID);
if ((_completeHeroes != null) && _completeHeroes.containsKey(charId))
{
final StatsSet oldHero = _completeHeroes.get(charId);
final StatSet oldHero = _completeHeroes.get(charId);
final int count = oldHero.getInt(COUNT);
oldHero.set(COUNT, count + 1);
oldHero.set(PLAYED, 1);
@@ -319,7 +319,7 @@ public class Hero
}
else
{
final StatsSet newHero = new StatsSet();
final StatSet newHero = new StatSet();
newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME));
newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID));
newHero.set(COUNT, 1);
@@ -332,7 +332,7 @@ public class Hero
_heroes.putAll(heroes);
heroes.clear();
updateHeroes(false);
for (StatsSet hero : _heroes.values())
for (StatSet hero : _heroes.values())
{
final String name = hero.getString(Olympiad.CHAR_NAME);
final PlayerInstance player = World.getInstance().getPlayer(name);
@@ -404,10 +404,10 @@ public class Hero
}
else
{
for (Entry<Integer, StatsSet> entry : _heroes.entrySet())
for (Entry<Integer, StatSet> entry : _heroes.entrySet())
{
final Integer heroId = entry.getKey();
final StatsSet hero = entry.getValue();
final StatSet hero = entry.getValue();
if ((_completeHeroes == null) || !_completeHeroes.containsKey(heroId))
{
statement = con.prepareStatement(INSERT_HERO);

54
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/olympiad/Olympiad.java
View File

@@ -45,7 +45,7 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.instancemanager.OlympiadStadiaManager;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.entity.Announcements;
@@ -59,9 +59,9 @@ public class Olympiad
{
protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName());
private static Map<Integer, StatsSet> _nobles;
private static Map<Integer, StatsSet> _oldnobles;
protected static List<StatsSet> _heroesToBe;
private static Map<Integer, StatSet> _nobles;
private static Map<Integer, StatSet> _oldnobles;
protected static List<StatSet> _heroesToBe;
private static List<PlayerInstance> _nonClassBasedRegisters;
private static Map<Integer, List<PlayerInstance>> _classBasedRegisters;
public static final int OLY_MANAGER = 31688;
@@ -255,7 +255,7 @@ public class Olympiad
while (rset.next())
{
final StatsSet statData = new StatsSet();
final StatSet statData = new StatSet();
final int charId = rset.getInt(CHAR_ID);
statData.set(CLASS_ID, rset.getInt(CLASS_ID));
statData.set(CHAR_NAME, rset.getString(CHAR_NAME));
@@ -284,7 +284,7 @@ public class Olympiad
while (rset.next())
{
final StatsSet statData = new StatsSet();
final StatSet statData = new StatSet();
final int charId = rset.getInt(CHAR_ID);
statData.set(CLASS_ID, rset.getInt(CLASS_ID));
statData.set(CHAR_NAME, rset.getString(CHAR_NAME));
@@ -541,7 +541,7 @@ public class Olympiad
if (!_nobles.containsKey(noble.getObjectId()))
{
final StatsSet statDat = new StatsSet();
final StatSet statDat = new StatSet();
statDat.set(CLASS_ID, noble.getClassId().getId());
statDat.set(CHAR_NAME, noble.getName());
statDat.set(POINTS, DEFAULT_POINTS);
@@ -600,18 +600,18 @@ public class Olympiad
return _nobles.size();
}
protected static StatsSet getNobleStats(int playerId)
protected static StatSet getNobleStats(int playerId)
{
return _nobles.get(playerId);
}
protected static synchronized void updateNobleStats(int playerId, StatsSet stats)
protected static synchronized void updateNobleStats(int playerId, StatSet stats)
{
_nobles.remove(playerId);
_nobles.put(playerId, stats);
}
protected static synchronized void updateOldNobleStats(int playerId, StatsSet stats)
protected static synchronized void updateOldNobleStats(int playerId, StatSet stats)
{
_oldnobles.remove(playerId);
_oldnobles.put(playerId, stats);
@@ -1007,10 +1007,10 @@ public class Olympiad
return;
}
for (Entry<Integer, StatsSet> entry : _nobles.entrySet())
for (Entry<Integer, StatSet> entry : _nobles.entrySet())
{
final Integer nobleId = entry.getKey();
final StatsSet nobleInfo = entry.getValue();
final StatSet nobleInfo = entry.getValue();
int currentPoints = nobleInfo.getInt(POINTS);
currentPoints += WEEKLY_POINTS;
nobleInfo.set(POINTS, currentPoints);
@@ -1136,10 +1136,10 @@ public class Olympiad
con = DatabaseFactory.getConnection();
PreparedStatement statement;
for (Entry<Integer, StatsSet> entry : _nobles.entrySet())
for (Entry<Integer, StatSet> entry : _nobles.entrySet())
{
final Integer nobleId = entry.getKey();
final StatsSet nobleInfo = entry.getValue();
final StatSet nobleInfo = entry.getValue();
if (nobleInfo == null)
{
@@ -1202,7 +1202,7 @@ public class Olympiad
PreparedStatement statement = null;
try (Connection con = DatabaseFactory.getConnection())
{
final StatsSet nobleInfo = _oldnobles.get(nobleId);
final StatSet nobleInfo = _oldnobles.get(nobleId);
if (nobleInfo == null)
{
@@ -1310,10 +1310,10 @@ public class Olympiad
if (_nobles != null)
{
for (Entry<Integer, StatsSet> entry : _nobles.entrySet())
for (Entry<Integer, StatSet> entry : _nobles.entrySet())
{
final Integer nobleId = entry.getKey();
final StatsSet nobleInfo = entry.getValue();
final StatSet nobleInfo = entry.getValue();
if (nobleInfo == null)
{
@@ -1336,7 +1336,7 @@ public class Olympiad
ResultSet rset = null;
try (Connection con = DatabaseFactory.getConnection())
{
StatsSet hero;
StatSet hero;
for (int HERO_ID : HERO_IDS)
{
statement = con.prepareStatement(OLYMPIAD_GET_HEROS);
@@ -1345,7 +1345,7 @@ public class Olympiad
while (rset.next())
{
hero = new StatsSet();
hero = new StatSet();
hero.set(CLASS_ID, HERO_ID);
hero.set(CHAR_ID, rset.getInt(CHAR_ID));
hero.set(CHAR_NAME, rset.getString(CHAR_NAME));
@@ -1404,11 +1404,11 @@ public class Olympiad
return;
}
for (StatsSet hero : _heroesToBe)
for (StatSet hero : _heroesToBe)
{
final int charId = hero.getInt(CHAR_ID);
final StatsSet noble = _nobles.get(charId);
final StatSet noble = _nobles.get(charId);
int currentPoints = noble.getInt(POINTS);
currentPoints += Config.ALT_OLY_HERO_POINTS;
noble.set(POINTS, currentPoints);
@@ -1426,7 +1426,7 @@ public class Olympiad
return 0;
}
final StatsSet noble = _nobles.get(objId);
final StatSet noble = _nobles.get(objId);
if (noble == null)
{
return 0;
@@ -1450,7 +1450,7 @@ public class Olympiad
return 0;
}
final StatsSet noble = _oldnobles.get(objId);
final StatSet noble = _oldnobles.get(objId);
if (noble == null)
{
return 0;
@@ -1495,7 +1495,7 @@ public class Olympiad
return 0;
}
final StatsSet noble = _nobles.get(objId);
final StatSet noble = _nobles.get(objId);
if (noble == null)
{
return 0;
@@ -1511,7 +1511,7 @@ public class Olympiad
return 0;
}
final StatsSet noble = _nobles.get(objId);
final StatSet noble = _nobles.get(objId);
if (noble == null)
{
return 0;
@@ -1527,7 +1527,7 @@ public class Olympiad
return 0;
}
final StatsSet noble = _nobles.get(objId);
final StatSet noble = _nobles.get(objId);
if (noble == null)
{
return 0;
@@ -1543,7 +1543,7 @@ public class Olympiad
return 0;
}
final StatsSet noble = _nobles.get(objId);
final StatSet noble = _nobles.get(objId);
if (noble == null)
{
return 0;

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java
View File

@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.datatables.HeroSkillTable;
import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.CubicInstance;
import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
@@ -641,8 +641,8 @@ class OlympiadGame
}
}
final StatsSet playerOneStat = Olympiad.getNobleStats(_playerOne.getObjectId());
final StatsSet playerTwoStat = Olympiad.getNobleStats(_playerTwo.getObjectId());
final StatSet playerOneStat = Olympiad.getNobleStats(_playerOne.getObjectId());
final StatSet playerTwoStat = Olympiad.getNobleStats(_playerTwo.getObjectId());
final int playerOnePlayed = playerOneStat.getInt(COMP_DONE);
final int playerTwoPlayed = playerTwoStat.getInt(COMP_DONE);

28
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSigns.java
View File

@@ -32,7 +32,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.handler.AutoChatHandler;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.spawn.AutoSpawn;
@@ -101,7 +101,7 @@ public class SevenSigns
protected int _duskFestivalScore;
protected int _compWinner;
protected int _previousWinner;
private final Map<Integer, StatsSet> _signsPlayerData;
private final Map<Integer, StatSet> _signsPlayerData;
private final Map<Integer, Integer> _signsSealOwners;
private final Map<Integer, Integer> _signsDuskSealTotals;
private final Map<Integer, Integer> _signsDawnSealTotals;
@@ -740,7 +740,7 @@ public class SevenSigns
int cabalMembers = 0;
final String cabalName = getCabalShortName(cabal);
for (StatsSet sevenDat : _signsPlayerData.values())
for (StatSet sevenDat : _signsPlayerData.values())
{
if (sevenDat.getString("cabal").equals(cabalName))
{
@@ -756,7 +756,7 @@ public class SevenSigns
* @param player the player
* @return the player data
*/
public StatsSet getPlayerData(PlayerInstance player)
public StatSet getPlayerData(PlayerInstance player)
{
if (!hasRegisteredBefore(player))
{
@@ -780,7 +780,7 @@ public class SevenSigns
int stoneCount = 0;
final StatsSet currPlayer = getPlayerData(player);
final StatSet currPlayer = getPlayerData(player);
stoneCount += currPlayer.getInt("red_stones");
stoneCount += currPlayer.getInt("green_stones");
@@ -801,7 +801,7 @@ public class SevenSigns
return 0;
}
final StatsSet currPlayer = getPlayerData(player);
final StatSet currPlayer = getPlayerData(player);
return currPlayer.getInt("contribution_score");
}
@@ -878,7 +878,7 @@ public class SevenSigns
{
final int charObjId = rset.getInt("char_obj_id");
final StatsSet sevenDat = new StatsSet();
final StatSet sevenDat = new StatSet();
sevenDat.set("char_obj_id", charObjId);
sevenDat.set("cabal", rset.getString("cabal"));
sevenDat.set("seal", rset.getInt("seal"));
@@ -950,7 +950,7 @@ public class SevenSigns
{
PreparedStatement statement = null;
for (StatsSet sevenDat : _signsPlayerData.values())
for (StatSet sevenDat : _signsPlayerData.values())
{
if ((player != null) && (sevenDat.getInt("char_obj_id") != player.getObjectId()))
{
@@ -1025,7 +1025,7 @@ public class SevenSigns
protected void resetPlayerData()
{
// Reset each player's contribution data as well as seal and cabal.
for (StatsSet sevenDat : _signsPlayerData.values())
for (StatSet sevenDat : _signsPlayerData.values())
{
final int charObjId = sevenDat.getInt("char_obj_id");
@@ -1060,7 +1060,7 @@ public class SevenSigns
{
final int charObjId = player.getObjectId();
PreparedStatement statement = null;
StatsSet currPlayerData = getPlayerData(player);
StatSet currPlayerData = getPlayerData(player);
if (currPlayerData != null)
{
@@ -1072,7 +1072,7 @@ public class SevenSigns
}
else
{
currPlayerData = new StatsSet();
currPlayerData = new StatSet();
currPlayerData.set("char_obj_id", charObjId);
currPlayerData.set("cabal", getCabalShortName(chosenCabal));
currPlayerData.set("seal", chosenSeal);
@@ -1124,7 +1124,7 @@ public class SevenSigns
*/
public int getAncientAdenaReward(PlayerInstance player, boolean removeReward)
{
final StatsSet currPlayer = getPlayerData(player);
final StatSet currPlayer = getPlayerData(player);
final int rewardAmount = currPlayer.getInt("ancient_adena_amount");
currPlayer.set("red_stones", 0);
@@ -1151,7 +1151,7 @@ public class SevenSigns
*/
public int addPlayerStoneContrib(PlayerInstance player, int blueCount, int greenCount, int redCount)
{
final StatsSet currPlayer = getPlayerData(player);
final StatSet currPlayer = getPlayerData(player);
final int contribScore = calcContributionScore(blueCount, greenCount, redCount);
final int totalAncientAdena = currPlayer.getInt("ancient_adena_amount") + calcAncientAdenaReward(blueCount, greenCount, redCount);
@@ -1516,7 +1516,7 @@ public class SevenSigns
{
for (PlayerInstance onlinePlayer : World.getInstance().getAllPlayers())
{
final StatsSet currPlayer = getPlayerData(onlinePlayer);
final StatSet currPlayer = getPlayerData(onlinePlayer);
if (isSealValidationPeriod() || isCompResultsPeriod())
{

42
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java
View File

@@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.datatables.sql.SpawnTable;
import org.l2jmobius.gameserver.datatables.xml.ExperienceData;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.FestivalMonsterInstance;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
@@ -3136,7 +3136,7 @@ public class SevenSignsFestival implements SpawnListener
protected Map<Integer, List<PlayerInstance>> _duskPreviousParticipants;
private Map<Integer, Integer> _dawnFestivalScores;
private Map<Integer, Integer> _duskFestivalScores;
private Map<Integer, Map<Integer, StatsSet>> _festivalData;
private Map<Integer, Map<Integer, StatSet>> _festivalData;
/**
* Instantiates a new seven signs festival.
@@ -3314,7 +3314,7 @@ public class SevenSignsFestival implements SpawnListener
int festivalId = rset.getInt("festivalId");
final String cabal = rset.getString("cabal");
final StatsSet festivalDat = new StatsSet();
final StatSet festivalDat = new StatSet();
festivalDat.set("festivalId", festivalId);
festivalDat.set("cabal", cabal);
festivalDat.set("cycle", festivalCycle);
@@ -3327,7 +3327,7 @@ public class SevenSignsFestival implements SpawnListener
festivalId += FESTIVAL_COUNT;
}
Map<Integer, StatsSet> tempData = _festivalData.get(festivalCycle);
Map<Integer, StatSet> tempData = _festivalData.get(festivalCycle);
if (tempData == null)
{
@@ -3385,9 +3385,9 @@ public class SevenSignsFestival implements SpawnListener
{
PreparedStatement statement = null;
for (Map<Integer, StatsSet> currCycleData : _festivalData.values())
for (Map<Integer, StatSet> currCycleData : _festivalData.values())
{
for (StatsSet festivalDat : currCycleData.values())
for (StatSet festivalDat : currCycleData.values())
{
final int festivalCycle = festivalDat.getInt("cycle");
final int festivalId = festivalDat.getInt("festivalId");
@@ -3441,7 +3441,7 @@ public class SevenSignsFestival implements SpawnListener
protected void rewardHighRanked()
{
String[] partyMembers;
StatsSet overallData = getOverallHighestScoreData(FESTIVAL_LEVEL_MAX_FOR_31);
StatSet overallData = getOverallHighestScoreData(FESTIVAL_LEVEL_MAX_FOR_31);
if (overallData != null)
{
partyMembers = overallData.getString("members").split(",");
@@ -3570,7 +3570,7 @@ public class SevenSignsFestival implements SpawnListener
_duskFestivalScores.clear();
// Set up a new data set for the current cycle of festivals
final Map<Integer, StatsSet> newData = new HashMap<>();
final Map<Integer, StatSet> newData = new HashMap<>();
for (int i = 0; i < (FESTIVAL_COUNT * 2); i++)
{
@@ -3581,8 +3581,8 @@ public class SevenSignsFestival implements SpawnListener
festivalId -= FESTIVAL_COUNT;
}
// Create a new StatsSet with "default" data for Dusk
final StatsSet tempStats = new StatsSet();
// Create a new StatSet with "default" data for Dusk
final StatSet tempStats = new StatSet();
tempStats.set("festivalId", festivalId);
tempStats.set("cycle", _signsCycle);
tempStats.set("date", "0");
@@ -3918,9 +3918,9 @@ public class SevenSignsFestival implements SpawnListener
* Returns a stats set containing the highest score <b>this cycle</b> for the the specified cabal and associated festival ID.
* @param oracle the oracle
* @param festivalId the festival id
* @return StatsSet festivalDat
* @return StatSet festivalDat
*/
public StatsSet getHighestScoreData(int oracle, int festivalId)
public StatSet getHighestScoreData(int oracle, int festivalId)
{
int offsetId = festivalId;
@@ -3930,7 +3930,7 @@ public class SevenSignsFestival implements SpawnListener
}
// Attempt to retrieve existing score data (if found), otherwise create a new blank data set and display a console warning.
StatsSet currData = null;
StatSet currData = null;
if ((_festivalData != null) && (_festivalData.get(_signsCycle) != null))
{
@@ -3938,7 +3938,7 @@ public class SevenSignsFestival implements SpawnListener
}
else
{
currData = new StatsSet();
currData = new StatSet();
currData.set("score", 0);
currData.set("members", "");
}
@@ -3949,16 +3949,16 @@ public class SevenSignsFestival implements SpawnListener
/**
* Returns a stats set containing the highest ever recorded score data for the specified festival.
* @param festivalId the festival id
* @return StatsSet result
* @return StatSet result
*/
public StatsSet getOverallHighestScoreData(int festivalId)
public StatSet getOverallHighestScoreData(int festivalId)
{
StatsSet result = null;
StatSet result = null;
int highestScore = 0;
for (Map<Integer, StatsSet> currCycleData : _festivalData.values())
for (Map<Integer, StatSet> currCycleData : _festivalData.values())
{
for (StatsSet currFestData : currCycleData.values())
for (StatSet currFestData : currCycleData.values())
{
final int currFestID = currFestData.getInt("festivalId");
final int festivalScore = currFestData.getInt("score");
@@ -4012,7 +4012,7 @@ public class SevenSignsFestival implements SpawnListener
_duskFestivalScores.put(festivalId, offeringScore);
}
final StatsSet currFestData = getHighestScoreData(oracle, festivalId);
final StatSet currFestData = getHighestScoreData(oracle, festivalId);
// Check if this is the highest score for this level range so far for the player's cabal.
if (offeringScore > thisCabalHighScore)
@@ -4139,7 +4139,7 @@ public class SevenSignsFestival implements SpawnListener
if (_festivalData.get(_signsCycle) != null)
{
for (StatsSet festivalData : _festivalData.get(_signsCycle).values())
for (StatSet festivalData : _festivalData.get(_signsCycle).values())
{
if (festivalData.getString("members").contains(playerName))
{

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Castle.java
View File

@@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction;
import org.l2jmobius.gameserver.instancemanager.CrownManager;
import org.l2jmobius.gameserver.model.Manor;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -68,7 +68,7 @@ public class Castle
private int _castleId = 0;
private final List<DoorInstance> _doors = new ArrayList<>();
private final List<StatsSet> _doorDefault = new ArrayList<>();
private final List<StatSet> _doorDefault = new ArrayList<>();
private String _name = "";
private int _ownerId = 0;
private Siege _siege = null;
@@ -571,7 +571,7 @@ public class Castle
while (rs.next())
{
// Create set of the door default for use when respawning dead doors
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
set.set("name", rs.getString("name"));
set.set("id", rs.getInt("id"));
set.set("x", rs.getInt("x"));

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Fort.java
View File

@@ -28,7 +28,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.datatables.sql.ClanTable;
import org.l2jmobius.gameserver.datatables.xml.DoorData;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -48,7 +48,7 @@ public class Fort
private int _fortId = 0;
private final List<DoorInstance> _doors = new ArrayList<>();
private final List<StatsSet> _doorDefault = new ArrayList<>();
private final List<StatSet> _doorDefault = new ArrayList<>();
private String _name = "";
private int _ownerId = 0;
private Clan _fortOwner = null;
@@ -396,7 +396,7 @@ public class Fort
while (rs.next())
{
// Create set of the door default for use when respawning dead doors
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
set.set("name", rs.getString("name"));
set.set("id", rs.getInt("id"));
set.set("x", rs.getInt("x"));

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java
View File

@@ -1622,7 +1622,7 @@ public class Siege
final NpcTemplate template = NpcTable.getInstance().getTemplate(_sp.getNpcId());
template.getStatsSet().set("baseHpMax", _sp.getHp());
template.getStatSet().set("baseHpMax", _sp.getHp());
ct = new ControlTowerInstance(IdFactory.getInstance().getNextId(), template);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/holders/HelperBuffHolder.java
View File

@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.model.holders;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
/**
* This class represents a Newbie Helper Buff Author: Ayor
@@ -46,7 +46,7 @@ public class HelperBuffHolder
* <BR>
* @param set
*/
public HelperBuffHolder(StatsSet set)
public HelperBuffHolder(StatSet set)
{
_lowerLevel = set.getInt("lowerLevel");
_upperLevel = set.getInt("upperLevel");

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.items.type.ArmorType;
@@ -50,10 +50,10 @@ public class Armor extends Item
* <LI>_pDef & _mDef</LI>
* <LI>_mpBonus & _hpBonus</LI>
* @param type : ArmorType designating the type of armor
* @param set : StatsSet designating the set of couples (key,value) caracterizing the armor
* @param set : StatSet designating the set of couples (key,value) caracterizing the armor
* @see Item constructor
*/
public Armor(ArmorType type, StatsSet set)
public Armor(ArmorType type, StatSet set)
{
super(type, set);
_avoidModifier = set.getInt("avoid_modify");

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java
View File

@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.model.items;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.items.type.EtcItemType;
/**
@@ -29,9 +29,9 @@ public class EtcItem extends Item
* Constructor for EtcItem.
* @see Item constructor
* @param type : EtcItemType designating the type of object Etc
* @param set : StatsSet designating the set of couples (key,value) for description of the Etc
* @param set : StatSet designating the set of couples (key,value) for description of the Etc
*/
public EtcItem(EtcItemType type, StatsSet set)
public EtcItem(EtcItemType type, StatSet set)
{
super(type, set);
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java
View File

@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.model.items;
import org.l2jmobius.commons.util.Util;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
/**
@@ -37,7 +37,7 @@ public class Henna
private final int _WIT;
private final int[] _classes;
public Henna(StatsSet set)
public Henna(StatSet set)
{
_symbolId = set.getInt("symbolId");
_dyeId = set.getInt("dyeId");

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -22,7 +22,7 @@ import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.model.Effect;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.items.type.EtcItemType;
@@ -159,9 +159,9 @@ public abstract class Item
* <LI>_referencePrice</LI>
* <LI>_sellable</LI>
* @param type : Enum designating the type of the item
* @param set : StatsSet corresponding to a set of couples (key,value) for description of the item
* @param set : StatSet corresponding to a set of couples (key,value) for description of the item
*/
protected Item(Enum<?> type, StatsSet set)
protected Item(Enum<?> type, StatSet set)
{
_type = type;
_itemId = set.getInt("item_id");

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java
View File

@@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.handler.SkillHandler;
import org.l2jmobius.gameserver.model.Effect;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.Skill.SkillType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -78,10 +78,10 @@ public class Weapon extends Item
* <LI>_atkSpeed & _AtkReuse</LI>
* <LI>_mpConsume</LI>
* @param type : ArmorType designating the type of armor
* @param set : StatsSet designating the set of couples (key,value) caracterizing the armor
* @param set : StatSet designating the set of couples (key,value) caracterizing the armor
* @see Item constructor
*/
public Weapon(WeaponType type, StatsSet set)
public Weapon(WeaponType type, StatSet set)
{
super(type, set);
_soulShotCount = set.getInt("soulshots");

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java
View File

@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.model.skills.handlers;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class SkillCharge extends Skill
{
public SkillCharge(StatsSet set)
public SkillCharge(StatSet set)
{
super(set);
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java
View File

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.skills.handlers;
import org.l2jmobius.gameserver.model.Effect;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -36,7 +36,7 @@ public class SkillChargeDmg extends Skill
final int chargeSkillId;
public SkillChargeDmg(StatsSet set)
public SkillChargeDmg(StatSet set)
{
super(set);
chargeSkillId = set.getInt("charge_skill_id");

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java
View File

@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.model.skills.handlers;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -30,7 +30,7 @@ public class SkillChargeEffect extends Skill
{
final int chargeSkillId;
public SkillChargeEffect(StatsSet set)
public SkillChargeEffect(StatSet set)
{
super(set);
chargeSkillId = set.getInt("charge_skill_id");

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCreateItem.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.idfactory.IdFactory;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -39,7 +39,7 @@ public class SkillCreateItem extends Skill
private final int _createItemCount;
private final int _randomCount;
public SkillCreateItem(StatsSet set)
public SkillCreateItem(StatSet set)
{
super(set);
_createItemId = set.getList("create_item_id", Integer.class);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDefault.java
View File

@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.model.skills.handlers;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class SkillDefault extends Skill
{
public SkillDefault(StatsSet set)
public SkillDefault(StatSet set)
{
super(set);
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java
View File

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.skills.handlers;
import org.l2jmobius.gameserver.model.Effect;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.CubicInstance;
@@ -35,7 +35,7 @@ public class SkillDrain extends Skill
private final float _absorbPart;
private final int _absorbAbs;
public SkillDrain(StatsSet set)
public SkillDrain(StatSet set)
{
super(set);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java
View File

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.skills.handlers;
import org.l2jmobius.gameserver.model.Effect;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skills.Formulas;
@@ -30,7 +30,7 @@ public class SkillElemental extends Skill
private final int[] _seeds;
private final boolean _seedAny;
public SkillElemental(StatsSet set)
public SkillElemental(StatSet set)
{
super(set);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java
View File

@@ -18,14 +18,14 @@ package org.l2jmobius.gameserver.model.skills.handlers;
import org.l2jmobius.gameserver.model.Effect;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skills.effects.EffectSeed;
public class SkillSeed extends Skill
{
public SkillSeed(StatsSet set)
public SkillSeed(StatSet set)
{
super(set);
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java
View File

@@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.datatables.sql.NpcTable;
import org.l2jmobius.gameserver.idfactory.IdFactory;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -33,7 +33,7 @@ public class SkillSignet extends Skill
private final int _effectNpcId;
public int effectId;
public SkillSignet(StatsSet set)
public SkillSignet(StatSet set)
{
super(set);
_effectNpcId = set.getInt("effectNpcId", -1);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java
View File

@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.model.skills.handlers;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -26,7 +26,7 @@ public class SkillSignetCasttime extends Skill
public int _effectNpcId;
public int effectId;
public SkillSignetCasttime(StatsSet set)
public SkillSignetCasttime(StatSet set)
{
super(set);
_effectNpcId = set.getInt("effectNpcId", -1);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSummon.java
View File

@@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.datatables.sql.NpcTable;
import org.l2jmobius.gameserver.datatables.xml.ExperienceData;
import org.l2jmobius.gameserver.idfactory.IdFactory;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -52,7 +52,7 @@ public class SkillSummon extends Skill
// What is the total lifetime of summons (in millisecs)
private final int _summonTotalLifeTime;
public SkillSummon(StatsSet set)
public SkillSummon(StatSet set)
{
super(set);

16
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.interfaces.IDeletable;
import org.l2jmobius.gameserver.model.interfaces.IRestorable;
import org.l2jmobius.gameserver.model.interfaces.IStorable;
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable;
/**
* @author UnAfraid
*/
public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable
public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable
{
private final AtomicBoolean _hasChanges = new AtomicBoolean(false);
@@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable,
*/
@Override
public StatsSet set(String name, boolean value)
public StatSet set(String name, boolean value)
{
_hasChanges.compareAndSet(false, true);
return super.set(name, value);
}
@Override
public StatsSet set(String name, double value)
public StatSet set(String name, double value)
{
_hasChanges.compareAndSet(false, true);
return super.set(name, value);
}
@Override
public StatsSet set(String name, Enum<?> value)
public StatSet set(String name, Enum<?> value)
{
_hasChanges.compareAndSet(false, true);
return super.set(name, value);
}
@Override
public StatsSet set(String name, int value)
public StatSet set(String name, int value)
{
_hasChanges.compareAndSet(false, true);
return super.set(name, value);
}
@Override
public StatsSet set(String name, long value)
public StatSet set(String name, long value)
{
_hasChanges.compareAndSet(false, true);
return super.set(name, value);
}
@Override
public StatsSet set(String name, String value)
public StatSet set(String name, String value)
{
_hasChanges.compareAndSet(false, true);
return super.set(name, value);

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java
View File

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Map;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.entity.Hero;
import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad;
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad;
*/
public class ExHeroList extends GameServerPacket
{
private final Map<Integer, StatsSet> _heroList;
private final Map<Integer, StatSet> _heroList;
public ExHeroList()
{
@@ -42,7 +42,7 @@ public class ExHeroList extends GameServerPacket
writeH(0x23);
writeD(_heroList.size());
for (StatsSet hero : _heroList.values())
for (StatSet hero : _heroList.values())
{
writeS(hero.getString(Olympiad.CHAR_NAME));
writeD(hero.getInt(Olympiad.CLASS_ID));

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java
View File

@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns;
import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSignsFestival;
@@ -164,7 +164,7 @@ public class SSQStatus extends GameServerPacket
final int dawnScore = SevenSignsFestival.getInstance().getHighestScore(SevenSigns.CABAL_DAWN, i);
// Dusk Score \\
writeD(duskScore);
StatsSet highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, i);
StatSet highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, i);
String[] partyMembers = highScoreData.getString("members").split(",");
if (partyMembers != null)
{