StatsSet properly named as StatSet.

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

View File

@ -18,7 +18,7 @@ package ai.areas.BeastFarm;
import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -133,7 +133,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
private boolean castBuff(Summon summon, int stepNumber, int buffNumber) private boolean castBuff(Summon summon, int stepNumber, int buffNumber)
{ {
final PlayerInstance owner = summon.getOwner(); final PlayerInstance owner = summon.getOwner();
final StatsSet parameters = summon.getTemplate().getParameters(); final StatSet parameters = summon.getTemplate().getParameters();
final SkillHolder skill = parameters.getObject("step" + stepNumber + "_buff0" + buffNumber, SkillHolder.class); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_buff0" + buffNumber, SkillHolder.class);
if ((skill != null) && (owner != null)) if ((skill != null) && (owner != null))
@ -174,7 +174,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
{ {
final boolean previousFollowStatus = summon.getFollowStatus(); final boolean previousFollowStatus = summon.getFollowStatus();
final PlayerInstance owner = summon.getOwner(); final PlayerInstance owner = summon.getOwner();
final StatsSet parameters = summon.getTemplate().getParameters(); final StatSet parameters = summon.getTemplate().getParameters();
final SkillHolder skill = parameters.getObject("step" + stepNumber + "_heal0" + healNumber, SkillHolder.class); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_heal0" + healNumber, SkillHolder.class);
final int targetType = parameters.getInt("step" + stepNumber + "_heal_target0" + healNumber, 0); final int targetType = parameters.getInt("step" + stepNumber + "_heal_target0" + healNumber, 0);

View File

@ -18,7 +18,7 @@ package ai.areas.FairySettlement;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.Spawn;
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.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -50,11 +50,11 @@ public class Wisp extends AbstractNpcAI
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
if (event.equals("DELETE_NPC")) if (event.equals("DELETE_NPC"))
{ {
params = new StatsSet(); params = new StatSet();
params.set("LOCATION_OBJECT", npc.getLocation()); params.set("LOCATION_OBJECT", npc.getLocation());
getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null); getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
npc.deleteMe(); npc.deleteMe();

View File

@ -19,7 +19,7 @@ package ai.areas.Parnassus.EntrancePortalToCrystalCaverns;
import java.util.Calendar; import java.util.Calendar;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
@ -107,7 +107,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
if (event.equals("LOOP_TIMER")) if (event.equals("LOOP_TIMER"))
{ {

View File

@ -16,7 +16,7 @@
*/ */
package ai.areas.SeedOfHellfire; package ai.areas.SeedOfHellfire;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
@ -61,7 +61,7 @@ public class Zofan extends AbstractNpcAI
{ {
if ((npc.getInstanceWorld() == null) && (npc.getSpawn() != null)) if ((npc.getInstanceWorld() == null) && (npc.getSpawn() != null))
{ {
final StatsSet params = npc.getParameters(); final StatSet params = npc.getParameters();
if (params.getInt("i_childrengarden_guard", 0) == 0) if (params.getInt("i_childrengarden_guard", 0) == 0)
{ {
for (String param : MINION_PARAMS) for (String param : MINION_PARAMS)

View File

@ -17,7 +17,7 @@
package ai.areas.TalkingIsland.Walkers; package ai.areas.TalkingIsland.Walkers;
import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
@ -45,7 +45,7 @@ public class Allada extends AbstractNpcAI
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
switch (event) switch (event)
{ {

View File

@ -17,7 +17,7 @@
package ai.areas.TalkingIsland.Walkers; package ai.areas.TalkingIsland.Walkers;
import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
@ -40,7 +40,7 @@ public class Mei extends AbstractNpcAI
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
if (event.equals("NPC_SHOUT")) if (event.equals("NPC_SHOUT"))
{ {

View File

@ -17,7 +17,7 @@
package ai.areas.TalkingIsland.Walkers; package ai.areas.TalkingIsland.Walkers;
import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
@ -43,7 +43,7 @@ public class Remons extends AbstractNpcAI
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
switch (event) switch (event)
{ {

View File

@ -17,7 +17,7 @@
package ai.areas.TalkingIsland.Walkers; package ai.areas.TalkingIsland.Walkers;
import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
@ -42,7 +42,7 @@ public class Rinne extends AbstractNpcAI
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
switch (event) switch (event)
{ {

View File

@ -17,7 +17,7 @@
package ai.areas.TalkingIsland.Walkers; package ai.areas.TalkingIsland.Walkers;
import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
@ -45,7 +45,7 @@ public class Rotina extends AbstractNpcAI
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
switch (event) switch (event)
{ {

View File

@ -17,7 +17,7 @@
package ai.areas.TalkingIsland.Walkers; package ai.areas.TalkingIsland.Walkers;
import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
@ -40,7 +40,7 @@ public class Soros extends AbstractNpcAI
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
switch (event) switch (event)
{ {

View File

@ -17,7 +17,7 @@
package ai.areas.WallOfArgos.ElmoredenServantsGhost; package ai.areas.WallOfArgos.ElmoredenServantsGhost;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,7 +58,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI
takeItems(player, USED_GRAVE_PASS, 1); takeItems(player, USED_GRAVE_PASS, 1);
final Location loc; final Location loc;
final StatsSet npcParameters = npc.getParameters(); final StatSet npcParameters = npc.getParameters();
if (event.equals("teleport1")) if (event.equals("teleport1"))
{ {
loc = new Location(npcParameters.getInt("TelPos_X1", 0), npcParameters.getInt("TelPos_Y1", 0), npcParameters.getInt("TelPos_Z1", 0)); loc = new Location(npcParameters.getInt("TelPos_X1", 0), npcParameters.getInt("TelPos_Y1", 0), npcParameters.getInt("TelPos_Z1", 0));

View File

@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.Spawn;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.TeleportWhereType;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
@ -341,7 +341,7 @@ public class Anakim extends AbstractNpcAI
addSkillSeeId(ALL_MOBS); addSkillSeeId(ALL_MOBS);
// Unlock // Unlock
final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM);
if (status == DEAD) if (status == DEAD)
{ {
@ -613,9 +613,9 @@ public class Anakim extends AbstractNpcAI
GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD);
final long respawnTime = getRespawnTime(); final long respawnTime = getRespawnTime();
final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
info.set("respawn_time", System.currentTimeMillis() + respawnTime); info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(ANAKIM, info); GrandBossManager.getInstance().setStatSet(ANAKIM, info);
startQuestTimer("unlock_anakim", respawnTime, null, null); startQuestTimer("unlock_anakim", respawnTime, null, null);
startQuestTimer("end_anakim", 900000, null, null); startQuestTimer("end_anakim", 900000, null, null);

View File

@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party; 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.World;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI
addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE);
addKillId(ANTHARAS, TERASQUE, BEHEMOTH); addKillId(ANTHARAS, TERASQUE, BEHEMOTH);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS);
final double curr_hp = info.getDouble("currentHP"); final double curr_hp = info.getDouble("currentHP");
final double curr_mp = info.getDouble("currentMP"); final double curr_mp = info.getDouble("currentMP");
final int loc_x = info.getInt("loc_x"); final int loc_x = info.getInt("loc_x");
@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI
private void setRespawn(long respawnTime) private void setRespawn(long respawnTime)
{ {
GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime);
} }
private final void refreshAiParams(PlayerInstance attacker, int damage) private final void refreshAiParams(PlayerInstance attacker, int damage)

View File

@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
@ -112,7 +112,7 @@ public class Baium extends AbstractNpcAI
addSeeCreatureId(BAIUM); addSeeCreatureId(BAIUM);
addSpellFinishedId(BAIUM); addSpellFinishedId(BAIUM);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM);
switch (getStatus()) switch (getStatus())
{ {
@ -666,7 +666,7 @@ public class Baium extends AbstractNpcAI
private void setRespawn(long respawnTime) private void setRespawn(long respawnTime)
{ {
GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime));
} }
private void manageSkills(Npc npc) private void manageSkills(Npc npc)

View File

@ -23,7 +23,7 @@ import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Movie;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
@ -122,7 +122,7 @@ public class BalokWarzone extends AbstractInstance
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (isInInstance(world)) if (isInInstance(world))

View File

@ -17,7 +17,7 @@
package ai.bosses.Baylor; package ai.bosses.Baylor;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
@ -77,7 +77,7 @@ public class BaylorWarzone extends AbstractInstance
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (isInInstance(world)) if (isInInstance(world))

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.TeleportWhereType;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@ -104,7 +104,7 @@ public class Beleth extends AbstractNpcAI
addStartNpc(STONE_COFFIN); addStartNpc(STONE_COFFIN);
addTalkId(STONE_COFFIN); addTalkId(STONE_COFFIN);
addFirstTalkId(ELF); addFirstTalkId(ELF);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
if (status == DEAD) if (status == DEAD)
{ {
@ -750,9 +750,9 @@ public class Beleth extends AbstractNpcAI
setBelethKiller(killer); setBelethKiller(killer);
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
info.set("respawn_time", System.currentTimeMillis() + respawnTime); info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(REAL_BELETH, info); GrandBossManager.getInstance().setStatSet(REAL_BELETH, info);
startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null);
deleteAll(); deleteAll();

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI
registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
_firstAttacked = false; _firstAttacked = false;
final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
{ {
// Load the unlock date and time for Core from DB. // Load the unlock date and time for Core from DB.
@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI
final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
startQuestTimer("core_unlock", respawnTime, null, null); startQuestTimer("core_unlock", respawnTime, null, null);
// Also save the respawn time so that the info is maintained past reboots. // Also save the respawn time so that the info is maintained past reboots.
final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
info.set("respawn_time", System.currentTimeMillis() + respawnTime); info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(CORE, info); GrandBossManager.getInstance().setStatSet(CORE, info);
startQuestTimer("despawn_minions", 20000, null, null); startQuestTimer("despawn_minions", 20000, null, null);
cancelQuestTimers("spawn_minion"); cancelQuestTimers("spawn_minion");
} }

View File

@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.enums.MountType;
import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Movie;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
@ -175,7 +175,7 @@ public class IceQueensCastleBattle extends AbstractInstance
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (world != null) if (world != null)
{ {
final StatsSet params = world.getParameters(); final StatSet params = world.getParameters();
final Npc controller = params.getObject("controller", Npc.class); final Npc controller = params.getObject("controller", Npc.class);
final Npc freya = params.getObject("freya", Npc.class); final Npc freya = params.getObject("freya", Npc.class);
switch (event) switch (event)
@ -734,7 +734,7 @@ public class IceQueensCastleBattle extends AbstractInstance
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (world != null) if (world != null)
{ {
final StatsSet params = world.getParameters(); final StatSet params = world.getParameters();
switch (npc.getId()) switch (npc.getId())
{ {
case FREYA_THRONE: case FREYA_THRONE:
@ -1069,7 +1069,7 @@ public class IceQueensCastleBattle extends AbstractInstance
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (world != null) if (world != null)
{ {
final StatsSet params = world.getParameters(); final StatSet params = world.getParameters();
final Npc controller = params.getObject("controller", Npc.class); final Npc controller = params.getObject("controller", Npc.class);
switch (npc.getId()) switch (npc.getId())
{ {

View File

@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.Movie;
import org.l2jmobius.gameserver.model.AggroInfo; import org.l2jmobius.gameserver.model.AggroInfo;
import org.l2jmobius.gameserver.model.DamageDoneInfo; import org.l2jmobius.gameserver.model.DamageDoneInfo;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
@ -153,13 +153,13 @@ public class IstinaCavern extends AbstractInstance
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
final Instance instance = npc.getInstanceWorld(); final Instance instance = npc.getInstanceWorld();
if (isInInstance(instance)) if (isInInstance(instance))
{ {
final StatsSet npcParams = npc.getParameters(); final StatSet npcParams = npc.getParameters();
final StatsSet npcVars = npc.getVariables(); final StatSet npcVars = npc.getVariables();
switch (event) switch (event)
{ {
case "DEATH_TIMER": case "DEATH_TIMER":
@ -391,7 +391,7 @@ public class IstinaCavern extends AbstractInstance
} }
else else
{ {
final StatsSet npcParams = npc.getParameters(); final StatSet npcParams = npc.getParameters();
if (skillId == npcParams.getSkillHolder("Istina_Death_Skill01").getSkillId()) if (skillId == npcParams.getSkillHolder("Istina_Death_Skill01").getSkillId())
{ {
@ -440,7 +440,7 @@ public class IstinaCavern extends AbstractInstance
final Instance instance = npc.getInstanceWorld(); final Instance instance = npc.getInstanceWorld();
if (isInInstance(instance)) if (isInInstance(instance))
{ {
final StatsSet npcVars = npc.getVariables(); final StatSet npcVars = npc.getVariables();
final int stage = npcVars.getInt("ISTINA_STAGE", -1); final int stage = npcVars.getInt("ISTINA_STAGE", -1);
if (npc.getId() == BALLISTA) if (npc.getId() == BALLISTA)
@ -657,7 +657,7 @@ public class IstinaCavern extends AbstractInstance
private PlayerInstance setPlayerRewardInfo(Npc npc) private PlayerInstance setPlayerRewardInfo(Npc npc)
{ {
final Map<PlayerInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>(); final Map<PlayerInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>();
final StatsSet npcVars = npc.getVariables(); final StatSet npcVars = npc.getVariables();
PlayerInstance maxDealer = null; PlayerInstance maxDealer = null;
long maxDamage = 0; long maxDamage = 0;
int totalDamage = 0; int totalDamage = 0;

View File

@ -19,7 +19,7 @@ package ai.bosses.Kimerian;
import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
@ -83,7 +83,7 @@ public class KimerianCommon extends AbstractInstance
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
final Instance instance = npc.getInstanceWorld(); final Instance instance = npc.getInstanceWorld();
if (isInInstance(instance)) if (isInInstance(instance))
@ -345,8 +345,8 @@ public class KimerianCommon extends AbstractInstance
{ {
final Creature creature = event.getSeen(); final Creature creature = event.getSeen();
final Npc npc = (Npc) event.getSeer(); final Npc npc = (Npc) event.getSeer();
final StatsSet npcParams = npc.getParameters(); final StatSet npcParams = npc.getParameters();
final StatsSet npcVars = npc.getVariables(); final StatSet npcVars = npc.getVariables();
final Instance instance = npc.getInstanceWorld(); final Instance instance = npc.getInstanceWorld();
if (isInInstance(instance)) if (isInInstance(instance))

View File

@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.Spawn;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.TeleportWhereType;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
@ -367,7 +367,7 @@ public class Lilith extends AbstractNpcAI
addSkillSeeId(ALL_MOBS); addSkillSeeId(ALL_MOBS);
// Unlock // Unlock
final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
final int status = GrandBossManager.getInstance().getBossStatus(LILITH); final int status = GrandBossManager.getInstance().getBossStatus(LILITH);
if (status == DEAD) if (status == DEAD)
{ {
@ -629,9 +629,9 @@ public class Lilith extends AbstractNpcAI
GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); GrandBossManager.getInstance().setBossStatus(LILITH, DEAD);
final long respawnTime = getRespawnTime(); final long respawnTime = getRespawnTime();
final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
info.set("respawn_time", System.currentTimeMillis() + respawnTime); info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(LILITH, info); GrandBossManager.getInstance().setStatSet(LILITH, info);
startQuestTimer("unlock_lilith", respawnTime, null, null); startQuestTimer("unlock_lilith", respawnTime, null, null);
startQuestTimer("end_lilith", 900000, null, null); startQuestTimer("end_lilith", 900000, null, null);

View File

@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.Movie;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
@ -244,7 +244,7 @@ public class Lindvior extends AbstractNpcAI
addSeeCreatureId(INVISIBLE); addSeeCreatureId(INVISIBLE);
_zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class); _zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
// Unlock // Unlock
final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
if (status == DEAD) if (status == DEAD)
{ {
@ -821,9 +821,9 @@ public class Lindvior extends AbstractNpcAI
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD);
final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000;
final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
info.set("respawn_time", System.currentTimeMillis() + respawnTime); info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(LINDVIOR_RAID, info); GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info);
startQuestTimer("unlock_lindvior", respawnTime, null, null); startQuestTimer("unlock_lindvior", respawnTime, null, null);
} }
else if (npc.getId() == NPC_GENERATOR) else if (npc.getId() == NPC_GENERATOR)
@ -867,7 +867,7 @@ public class Lindvior extends AbstractNpcAI
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
if (event.equals("NPC_SHOUT") && (npc != null) && !npc.isDead()) if (event.equals("NPC_SHOUT") && (npc != null) && !npc.isDead())
{ {

View File

@ -18,7 +18,7 @@ package ai.bosses.Lindvior;
import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.WalkingManager;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
@ -43,7 +43,7 @@ public class LionelHunter extends AbstractNpcAI
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
if (event.equals("NPC_SHOUT") && (npc != null)) if (event.equals("NPC_SHOUT") && (npc != null))
{ {

View File

@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.Movie;
import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.WalkingManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
@ -152,13 +152,13 @@ public class OctavisWarzone extends AbstractInstance
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (isInInstance(world)) if (isInInstance(world))
{ {
final StatsSet npcVars = npc.getVariables(); final StatSet npcVars = npc.getVariables();
final StatsSet npcParams = npc.getParameters(); final StatSet npcParams = npc.getParameters();
switch (event) switch (event)
{ {
@ -378,7 +378,7 @@ public class OctavisWarzone extends AbstractInstance
} }
else if (CommonUtil.contains(OCTAVIS_STAGE_2, npc.getId())) else if (CommonUtil.contains(OCTAVIS_STAGE_2, npc.getId()))
{ {
final StatsSet npcVars = npc.getVariables(); final StatSet npcVars = npc.getVariables();
if (npcVars.getBoolean("START_TIMERS", true)) if (npcVars.getBoolean("START_TIMERS", true))
{ {

View File

@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.Spawn;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
@ -92,7 +92,7 @@ public class Orfen extends AbstractNpcAI
registerMobs(mobs); registerMobs(mobs);
_IsTeleported = false; _IsTeleported = false;
ZONE = ZoneManager.getInstance().getZoneById(12013); ZONE = ZoneManager.getInstance().getZoneById(12013);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
if (status == DEAD) if (status == DEAD)
{ {
@ -327,9 +327,9 @@ public class Orfen extends AbstractNpcAI
respawnTime *= 3600000; respawnTime *= 3600000;
startQuestTimer("orfen_unlock", respawnTime, null, null); startQuestTimer("orfen_unlock", respawnTime, null, null);
// also save the respawn time so that the info is maintained past reboots // also save the respawn time so that the info is maintained past reboots
final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
info.set("respawn_time", System.currentTimeMillis() + respawnTime); info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(ORFEN, info); GrandBossManager.getInstance().setStatSet(ORFEN, info);
cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_minion_loc", npc, null);
cancelQuestTimer("check_orfen_pos", npc, null); cancelQuestTimer("check_orfen_pos", npc, null);
startQuestTimer("despawn_minions", 20000, null, null); startQuestTimer("despawn_minions", 20000, null, null);

View File

@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Playable;
@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI
addFactionCallId(NURSE); addFactionCallId(NURSE);
_zone = ZoneManager.getInstance().getZoneById(12012); _zone = ZoneManager.getInstance().getZoneById(12012);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
if (status == DEAD) if (status == DEAD)
{ {
@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI
cancelQuestTimer("action", npc, null); cancelQuestTimer("action", npc, null);
cancelQuestTimer("heal", null, null); cancelQuestTimer("heal", null, null);
// also save the respawn time so that the info is maintained past reboots // also save the respawn time so that the info is maintained past reboots
final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
info.set("respawn_time", System.currentTimeMillis() + respawnTime); info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(QUEEN, info); GrandBossManager.getInstance().setStatSet(QUEEN, info);
_nurses.clear(); _nurses.clear();
_larva.deleteMe(); _larva.deleteMe();
_larva = null; _larva = null;

View File

@ -19,7 +19,7 @@ package ai.bosses.Spezion.Cannon;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
@ -171,7 +171,7 @@ public class Cannon extends AbstractNpcAI
{ {
if (skill.getId() == PRESENT_SKILL.getSkillId()) if (skill.getId() == PRESENT_SKILL.getSkillId())
{ {
final StatsSet npcParams = npc.getParameters(); final StatSet npcParams = npc.getParameters();
npc.broadcastPacket(new Earthquake(npc, 10, 5)); npc.broadcastPacket(new Earthquake(npc, 10, 5));
npc.broadcastPacket(new OnEventTrigger(npcParams.getInt("TRIGGER_ID"), true)); npc.broadcastPacket(new OnEventTrigger(npcParams.getInt("TRIGGER_ID"), true));

View File

@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.WalkingManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
@ -105,13 +105,13 @@ public class TeredorWarzone extends AbstractInstance
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
final Instance instance = npc.getInstanceWorld(); final Instance instance = npc.getInstanceWorld();
if (isInInstance(instance)) if (isInInstance(instance))
{ {
final StatsSet npcVars = npc.getVariables(); final StatSet npcVars = npc.getVariables();
final StatsSet npcParams = npc.getParameters(); final StatSet npcParams = npc.getParameters();
switch (event) switch (event)
{ {
@ -236,7 +236,7 @@ public class TeredorWarzone extends AbstractInstance
final Instance instance = npc.getInstanceWorld(); final Instance instance = npc.getInstanceWorld();
if (isInInstance(instance)) if (isInInstance(instance))
{ {
final StatsSet npcParams = npc.getParameters(); final StatSet npcParams = npc.getParameters();
switch (npc.getId()) switch (npc.getId())
{ {
@ -292,7 +292,7 @@ public class TeredorWarzone extends AbstractInstance
if (isInInstance(instance)) if (isInInstance(instance))
{ {
final StatsSet npcParams = npc.getParameters(); final StatSet npcParams = npc.getParameters();
switch (npc.getId()) switch (npc.getId())
{ {
@ -472,7 +472,7 @@ public class TeredorWarzone extends AbstractInstance
{ {
case TEREDOR: case TEREDOR:
{ {
final StatsSet npcVars = npc.getVariables(); final StatSet npcVars = npc.getVariables();
final int hpPer = npc.getCurrentHpPercent(); final int hpPer = npc.getCurrentHpPercent();
int teredorStatus = npcVars.getInt("TEREDOR_STATUS", 1); int teredorStatus = npcVars.getInt("TEREDOR_STATUS", 1);

View File

@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.Movie;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
@ -322,7 +322,7 @@ public class Trasken extends AbstractNpcAI
DoorData.getInstance().getDoor(DOOR).openMe(); DoorData.getInstance().getDoor(DOOR).openMe();
} }
// Unlock // Unlock
final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
if (status == DEAD) if (status == DEAD)
{ {
@ -603,9 +603,9 @@ public class Trasken extends AbstractNpcAI
GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD);
final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000;
final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
info.set("respawn_time", System.currentTimeMillis() + respawnTime); info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(TRASKEN, info); GrandBossManager.getInstance().setStatSet(TRASKEN, info);
startQuestTimer("unlock_trasken", respawnTime, null, null); startQuestTimer("unlock_trasken", respawnTime, null, null);
break; break;
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
@ -123,7 +123,7 @@ public class Valakas extends AbstractNpcAI
registerMobs(VALAKAS); registerMobs(VALAKAS);
ZONE = ZoneManager.getInstance().getZoneById(12010); ZONE = ZoneManager.getInstance().getZoneById(12010);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS); final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
if (status == DEAD) if (status == DEAD)
@ -446,9 +446,9 @@ public class Valakas extends AbstractNpcAI
final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000; final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
startQuestTimer("valakas_unlock", respawnTime, null, null); startQuestTimer("valakas_unlock", respawnTime, null, null);
// also save the respawn time so that the info is maintained past reboots // also save the respawn time so that the info is maintained past reboots
final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
info.set("respawn_time", System.currentTimeMillis() + respawnTime); info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(VALAKAS, info); GrandBossManager.getInstance().setStatSet(VALAKAS, info);
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);
} }

View File

@ -21,7 +21,7 @@ import java.util.List;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -189,8 +189,8 @@ public class CavernOfThePirateCaptain extends AbstractInstance
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (world != null) if (world != null)
{ {
final StatsSet templParams = world.getTemplateParameters(); final StatSet templParams = world.getTemplateParameters();
final StatsSet params = world.getParameters(); final StatSet params = world.getParameters();
switch (event) switch (event)
{ {
case "BURN_BLUE": case "BURN_BLUE":

View File

@ -17,7 +17,7 @@
package ai.others; package ai.others;
import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
@ -109,7 +109,7 @@ public class AreaSkillNpc extends AbstractNpcAI
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
switch (event) switch (event)
{ {

View File

@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.PlayerCondOverride;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI
if (st.hasMoreTokens()) if (st.hasMoreTokens())
{ {
final int unknowInt = Integer.parseInt(st.nextToken()); final int unknowInt = Integer.parseInt(st.nextToken());
final StatsSet npcParams = npc.getParameters(); final StatSet npcParams = npc.getParameters();
Location teleLoc = null; Location teleLoc = null;
switch (unknowInt) switch (unknowInt)
{ {
@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI
return htmltext; return htmltext;
} }
private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3)
{ {
final Location loc; final Location loc;
if (getRandom(100) < 33) if (getRandom(100) < 33)

View File

@ -16,7 +16,7 @@
*/ */
package ai.others.NpcBuffers; package ai.others.NpcBuffers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.Skill;
@ -29,7 +29,7 @@ class NpcBufferSkillData
private final int _scaleToLevel; private final int _scaleToLevel;
private final int _initialDelay; private final int _initialDelay;
NpcBufferSkillData(StatsSet set) NpcBufferSkillData(StatSet set)
{ {
_skill = new SkillHolder(set.getInt("id"), set.getInt("level")); _skill = new SkillHolder(set.getInt("id"), set.getInt("level"));
_scaleToLevel = set.getInt("scaleToLevel", -1); _scaleToLevel = set.getInt("scaleToLevel", -1);

View File

@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
/** /**
* @author UnAfraid * @author UnAfraid
@ -54,7 +54,7 @@ class NpcBuffersData implements IXmlReader
@Override @Override
public void parseDocument(Document doc, File f) public void parseDocument(Document doc, File f)
{ {
StatsSet set; StatSet set;
Node attr; Node attr;
NamedNodeMap attrs; NamedNodeMap attrs;
for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
@ -75,7 +75,7 @@ class NpcBuffersData implements IXmlReader
case "skill": case "skill":
{ {
attrs = c.getAttributes(); attrs = c.getAttributes();
set = new StatsSet(); set = new StatSet();
for (int i = 0; i < attrs.getLength(); i++) for (int i = 0; i < attrs.getLength(); i++)
{ {
attr = attrs.item(i); attr = attrs.item(i);

View File

@ -17,7 +17,7 @@
package ai.others.Servitors; package ai.others.Servitors;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -51,7 +51,7 @@ public class ClanFlag extends AbstractNpcAI
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
switch (event) switch (event)
{ {

View File

@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.data.xml.impl.SkillData;
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.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -63,7 +63,7 @@ public class GateOfUnlimitedSummoning extends AbstractNpcAI
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
switch (event) switch (event)
{ {

View File

@ -17,7 +17,7 @@
package ai.others.Servitors; package ai.others.Servitors;
import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
if (player != null) if (player != null)
{ {

View File

@ -21,7 +21,7 @@ import java.util.List;
import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -91,7 +91,7 @@ public class TersisHerald extends AbstractNpcAI
} }
@Override @Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{ {
if (event.equals("DESPAWN_NPCS")) if (event.equals("DESPAWN_NPCS"))
{ {

View File

@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager;
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.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone;
@ -309,7 +309,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
} }
} }
final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId);
final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time"));
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);

View File

@ -19,7 +19,7 @@ package handlers.admincommandhandlers;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler
if (player.isNoble()) if (player.isNoble())
{ {
final StatsSet statDat = getPlayerSet(player); final StatSet statDat = getPlayerSet(player);
final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player);
final int points = Math.max(oldpoints + val, 0); final int points = Math.max(oldpoints + val, 0);
if (points > 1000) if (points > 1000)
@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler
if (player.isNoble()) if (player.isNoble())
{ {
final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId());
if (playerStat == null) if (playerStat == null)
{ {
BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!");
@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler
if (player.isNoble()) if (player.isNoble())
{ {
final StatsSet statDat = getPlayerSet(player); final StatSet statDat = getPlayerSet(player);
final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player);
final int points = oldpoints - val; final int points = oldpoints - val;
if ((points < 1) && (points > 1000)) if ((points < 1) && (points > 1000))
@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler
return Integer.decode(token); return Integer.decode(token);
} }
private StatsSet getPlayerSet(PlayerInstance player) private StatSet getPlayerSet(PlayerInstance player)
{ {
StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); StatSet statDat = Olympiad.getNobleStats(player.getObjectId());
if (statDat == null) if (statDat == null)
{ {
statDat = new StatsSet(); statDat = new StatSet();
statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.CHAR_NAME, player.getName());
statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);

View File

@ -19,7 +19,7 @@ package handlers.conditions;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.conditions.ICondition;
@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition
{ {
private final List<CategoryType> _categoryTypes; private final List<CategoryType> _categoryTypes;
public CategoryTypeCondition(StatsSet params) public CategoryTypeCondition(StatSet params)
{ {
_categoryTypes = params.getEnumList("category", CategoryType.class); _categoryTypes = params.getEnumList("category", CategoryType.class);
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.conditions; package handlers.conditions;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.conditions.ICondition;
@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition
private final int _minLevel; private final int _minLevel;
private final int _maxLevel; private final int _maxLevel;
public NpcLevelCondition(StatsSet params) public NpcLevelCondition(StatSet params)
{ {
_minLevel = params.getInt("minLevel"); _minLevel = params.getInt("minLevel");
_maxLevel = params.getInt("maxLevel"); _maxLevel = params.getInt("maxLevel");

View File

@ -16,7 +16,7 @@
*/ */
package handlers.conditions; package handlers.conditions;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.conditions.ICondition;
@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition
private final int _minLevel; private final int _minLevel;
private final int _maxLevel; private final int _maxLevel;
public PlayerLevelCondition(StatsSet params) public PlayerLevelCondition(StatSet params)
{ {
_minLevel = params.getInt("minLevel"); _minLevel = params.getInt("minLevel");
_maxLevel = params.getInt("maxLevel"); _maxLevel = params.getInt("maxLevel");

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectFlag;
@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect
{ {
private final int _times; private final int _times;
public AbnormalShield(StatsSet params) public AbnormalShield(StatSet params)
{ {
_times = params.getInt("times", -1); _times = params.getInt("times", -1);
} }

View File

@ -21,7 +21,7 @@ import java.util.HashSet;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect
private final int _time; private final int _time;
private final int _mode; private final int _mode;
public AbnormalTimeChange(StatsSet params) public AbnormalTimeChange(StatSet params)
{ {
final String abnormals = params.getString("slot", null); final String abnormals = params.getString("slot", null);
if ((abnormals != null) && !abnormals.isEmpty()) if ((abnormals != null) && !abnormals.isEmpty())

View File

@ -19,7 +19,7 @@ package handlers.effecthandlers;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect
private final double _damage; private final double _damage;
private static final Map<Integer, Double> _damageHolder = new ConcurrentHashMap<>(); private static final Map<Integer, Double> _damageHolder = new ConcurrentHashMap<>();
public AbsorbDamage(StatsSet params) public AbsorbDamage(StatSet params)
{ {
_damage = params.getDouble("damage", 0); _damage = params.getDouble("damage", 0);
} }

View File

@ -20,7 +20,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
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.Creature;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.ListenersContainer;
@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect
private final int _hpPercent; private final int _hpPercent;
private final Map<Creature, AtomicBoolean> _updates = new ConcurrentHashMap<>(); private final Map<Creature, AtomicBoolean> _updates = new ConcurrentHashMap<>();
protected AbstractConditionalHpEffect(StatsSet params, Stat stat) protected AbstractConditionalHpEffect(StatSet params, Stat stat)
{ {
super(params, stat); super(params, stat);
_hpPercent = params.getInt("hpPercent", 0); _hpPercent = params.getInt("hpPercent", 0);

View File

@ -17,7 +17,7 @@
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.enums.StatModifierType;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.Skill;
@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect
private final Stat _stat; private final Stat _stat;
protected final double _amount; protected final double _amount;
public AbstractStatAddEffect(StatsSet params, Stat stat) public AbstractStatAddEffect(StatSet params, Stat stat)
{ {
_stat = stat; _stat = stat;
_amount = params.getDouble("amount", 0); _amount = params.getDouble("amount", 0);

View File

@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.enums.StatModifierType;
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.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat;
@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect
protected final StatModifierType _mode; protected final StatModifierType _mode;
protected final List<Condition> _conditions = new ArrayList<>(); protected final List<Condition> _conditions = new ArrayList<>();
public AbstractStatEffect(StatsSet params, Stat stat) public AbstractStatEffect(StatSet params, Stat stat)
{ {
this(params, stat, stat); this(params, stat, stat);
} }
public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat)
{ {
_addStat = addStat; _addStat = addStat;
_mulStat = mulStat; _mulStat = mulStat;

View File

@ -17,7 +17,7 @@
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.enums.StatModifierType;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.Skill;
@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect
private final Stat _stat; private final Stat _stat;
protected final double _amount; protected final double _amount;
public AbstractStatPercentEffect(StatsSet params, Stat stat) public AbstractStatPercentEffect(StatSet params, Stat stat)
{ {
_stat = stat; _stat = stat;
_amount = params.getDouble("amount", 1); _amount = params.getDouble("amount", 1);

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat;
*/ */
public class Accuracy extends AbstractStatEffect public class Accuracy extends AbstractStatEffect
{ {
public Accuracy(StatsSet params) public Accuracy(StatSet params)
{ {
super(params, Stat.ACCURACY_COMBAT); super(params, Stat.ACCURACY_COMBAT);
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect
private final double _power; private final double _power;
private final boolean _affectSummoner; private final boolean _affectSummoner;
public AddHate(StatsSet params) public AddHate(StatSet params)
{ {
_power = params.getDouble("power", 0); _power = params.getDouble("power", 0);
_affectSummoner = params.getBoolean("affectSummoner", false); _affectSummoner = params.getBoolean("affectSummoner", false);

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
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.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect
private final int _existingSkillLevel; private final int _existingSkillLevel;
private final SkillHolder _addedSkill; private final SkillHolder _addedSkill;
public AddSkillBySkill(StatsSet params) public AddSkillBySkill(StatSet params)
{ {
_existingSkillId = params.getInt("existingSkillId"); _existingSkillId = params.getInt("existingSkillId");
_existingSkillLevel = params.getInt("existingSkillLevel"); _existingSkillLevel = params.getInt("existingSkillLevel");

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
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.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect
{ {
private final int _amount; private final int _amount;
public AddTeleportBookmarkSlot(StatsSet params) public AddTeleportBookmarkSlot(StatSet params)
{ {
_amount = params.getInt("amount", 0); _amount = params.getInt("amount", 0);
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat;
*/ */
public class AdditionalPotionCp extends AbstractStatAddEffect public class AdditionalPotionCp extends AbstractStatAddEffect
{ {
public AdditionalPotionCp(StatsSet params) public AdditionalPotionCp(StatSet params)
{ {
super(params, Stat.ADDITIONAL_POTION_CP); super(params, Stat.ADDITIONAL_POTION_CP);
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat;
*/ */
public class AdditionalPotionHp extends AbstractStatAddEffect public class AdditionalPotionHp extends AbstractStatAddEffect
{ {
public AdditionalPotionHp(StatsSet params) public AdditionalPotionHp(StatSet params)
{ {
super(params, Stat.ADDITIONAL_POTION_HP); super(params, Stat.ADDITIONAL_POTION_HP);
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat;
*/ */
public class AdditionalPotionMp extends AbstractStatAddEffect public class AdditionalPotionMp extends AbstractStatAddEffect
{ {
public AdditionalPotionMp(StatsSet params) public AdditionalPotionMp(StatSet params)
{ {
super(params, Stat.ADDITIONAL_POTION_MP); super(params, Stat.ADDITIONAL_POTION_MP);
} }

View File

@ -22,7 +22,7 @@ import java.util.Map;
import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -78,7 +78,7 @@ public class AirBind extends AbstractEffect
_chainedAirSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 11999); // Heavy Hit _chainedAirSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 11999); // Heavy Hit
} }
public AirBind(StatsSet params) public AirBind(StatSet params)
{ {
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat;
*/ */
public class AreaDamage extends AbstractStatAddEffect public class AreaDamage extends AbstractStatAddEffect
{ {
public AreaDamage(StatsSet params) public AreaDamage(StatSet params)
{ {
super(params, Stat.DAMAGE_ZONE_VULN); super(params, Stat.DAMAGE_ZONE_VULN);
} }

View File

@ -17,7 +17,7 @@
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.AttributeType;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.Skill;
@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect
private final AttributeType _attribute; private final AttributeType _attribute;
private final double _amount; private final double _amount;
public AttackAttribute(StatsSet params) public AttackAttribute(StatSet params)
{ {
_amount = params.getDouble("amount", 0); _amount = params.getDouble("amount", 0);
_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);

View File

@ -17,7 +17,7 @@
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.AttributeType;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.Skill;
@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect
{ {
private final double _amount; private final double _amount;
public AttackAttributeAdd(StatsSet params) public AttackAttributeAdd(StatSet params)
{ {
_amount = params.getDouble("amount", 0); _amount = params.getDouble("amount", 0);
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectFlag;
@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag;
*/ */
public class AttackBehind extends AbstractEffect public class AttackBehind extends AbstractEffect
{ {
public AttackBehind(StatsSet params) public AttackBehind(StatSet params)
{ {
} }

View File

@ -20,7 +20,7 @@ import java.util.EnumMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect
{ {
private final Map<TraitType, Float> _attackTraits = new EnumMap<>(TraitType.class); private final Map<TraitType, Float> _attackTraits = new EnumMap<>(TraitType.class);
public AttackTrait(StatsSet params) public AttackTrait(StatSet params)
{ {
if (params.isEmpty()) if (params.isEmpty())
{ {

View File

@ -17,7 +17,7 @@
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect
private final double _criticalChance; private final double _criticalChance;
private final boolean _overHit; private final boolean _overHit;
public Backstab(StatsSet params) public Backstab(StatSet params)
{ {
_power = params.getDouble("power"); _power = params.getDouble("power");
_chanceBoost = params.getDouble("chanceBoost"); _chanceBoost = params.getDouble("chanceBoost");

View File

@ -17,7 +17,7 @@
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.CtrlIntention;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectFlag;
@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/ */
public class Betray extends AbstractEffect public class Betray extends AbstractEffect
{ {
public Betray(StatsSet params) public Betray(StatSet params)
{ {
} }

View File

@ -19,7 +19,7 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@ -52,7 +52,7 @@ public class Blink extends AbstractEffect
private final int _flyDelay; private final int _flyDelay;
private final int _animationSpeed; private final int _animationSpeed;
public Blink(StatsSet params) public Blink(StatSet params)
{ {
_flyCourse = params.getInt("angle", 0); _flyCourse = params.getInt("angle", 0);
_flyRadius = params.getInt("range", 0); _flyRadius = params.getInt("range", 0);

View File

@ -18,7 +18,7 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
*/ */
public class BlinkSwap extends AbstractEffect public class BlinkSwap extends AbstractEffect
{ {
public BlinkSwap(StatsSet params) public BlinkSwap(StatSet params)
{ {
} }

View File

@ -20,7 +20,7 @@ import java.util.Arrays;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect
{ {
private final Set<AbnormalType> _blockAbnormalSlots; private final Set<AbnormalType> _blockAbnormalSlots;
public BlockAbnormalSlot(StatsSet params) public BlockAbnormalSlot(StatSet params)
{ {
_blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet());
} }

View File

@ -21,7 +21,7 @@ import java.util.Set;
import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.datatables.BotReportTable;
import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect
{ {
private final Set<Integer> _blockedActions = new HashSet<>(); private final Set<Integer> _blockedActions = new HashSet<>();
public BlockAction(StatsSet params) public BlockAction(StatSet params)
{ {
final String[] actions = params.getString("blockedActions").split(","); final String[] actions = params.getString("blockedActions").split(",");
for (String action : actions) for (String action : actions)

View File

@ -22,7 +22,7 @@ import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.CtrlIntention;
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.Creature;
import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect
{ {
private final Set<Integer> _allowedSkills; private final Set<Integer> _allowedSkills;
public BlockActions(StatsSet params) public BlockActions(StatSet params)
{ {
final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());

View File

@ -17,7 +17,7 @@
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectFlag;
@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/ */
public class BlockChat extends AbstractEffect public class BlockChat extends AbstractEffect
{ {
public BlockChat(StatsSet params) public BlockChat(StatSet params)
{ {
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectFlag;
import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.effects.EffectType;
@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType;
*/ */
public class BlockControl extends AbstractEffect public class BlockControl extends AbstractEffect
{ {
public BlockControl(StatsSet params) public BlockControl(StatSet params)
{ {
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectFlag;
@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag;
*/ */
public class BlockEscape extends AbstractEffect public class BlockEscape extends AbstractEffect
{ {
public BlockEscape(StatsSet params) public BlockEscape(StatSet params)
{ {
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/ */
public class BlockMove extends AbstractEffect public class BlockMove extends AbstractEffect
{ {
public BlockMove(StatsSet params) public BlockMove(StatSet params)
{ {
} }

View File

@ -17,7 +17,7 @@
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/ */
public class BlockParty extends AbstractEffect public class BlockParty extends AbstractEffect
{ {
public BlockParty(StatsSet params) public BlockParty(StatSet params)
{ {
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectFlag;
@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag;
*/ */
public class BlockResurrection extends AbstractEffect public class BlockResurrection extends AbstractEffect
{ {
public BlockResurrection(StatsSet params) public BlockResurrection(StatSet params)
{ {
} }

View File

@ -17,7 +17,7 @@
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.CommonUtil;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect
{ {
private final int[] _magicTypes; private final int[] _magicTypes;
public BlockSkill(StatsSet params) public BlockSkill(StatSet params)
{ {
_magicTypes = params.getIntArray("magicTypes", ";"); _magicTypes = params.getIntArray("magicTypes", ";");
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/ */
public class BlockTarget extends AbstractEffect public class BlockTarget extends AbstractEffect
{ {
public BlockTarget(StatsSet params) public BlockTarget(StatSet params)
{ {
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect
{ {
private final int _chance; private final int _chance;
public Bluff(StatsSet params) public Bluff(StatSet params)
{ {
_chance = params.getInt("chance", 100); _chance = params.getInt("chance", 100);
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat;
*/ */
public class BonusDropAmount extends AbstractStatPercentEffect public class BonusDropAmount extends AbstractStatPercentEffect
{ {
public BonusDropAmount(StatsSet params) public BonusDropAmount(StatSet params)
{ {
super(params, Stat.BONUS_DROP_AMOUNT); super(params, Stat.BONUS_DROP_AMOUNT);
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat;
*/ */
public class BonusDropRate extends AbstractStatPercentEffect public class BonusDropRate extends AbstractStatPercentEffect
{ {
public BonusDropRate(StatsSet params) public BonusDropRate(StatSet params)
{ {
super(params, Stat.BONUS_DROP_RATE); super(params, Stat.BONUS_DROP_RATE);
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat;
*/ */
public class BonusSpoilRate extends AbstractStatPercentEffect public class BonusSpoilRate extends AbstractStatPercentEffect
{ {
public BonusSpoilRate(StatsSet params) public BonusSpoilRate(StatSet params)
{ {
super(params, Stat.BONUS_SPOIL_RATE); super(params, Stat.BONUS_SPOIL_RATE);
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat;
*/ */
public class Breath extends AbstractStatEffect public class Breath extends AbstractStatEffect
{ {
public Breath(StatsSet params) public Breath(StatSet params)
{ {
super(params, Stat.BREATH); super(params, Stat.BREATH);
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectFlag;
@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag;
*/ */
public class BuffBlock extends AbstractEffect public class BuffBlock extends AbstractEffect
{ {
public BuffBlock(StatsSet params) public BuffBlock(StatSet params)
{ {
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect
{ {
private final int _skillId; private final int _skillId;
public CallLearnedSkill(StatsSet params) public CallLearnedSkill(StatSet params)
{ {
_skillId = params.getInt("skillId"); _skillId = params.getInt("skillId");
} }

View File

@ -17,7 +17,7 @@
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party;
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.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/ */
public class CallParty extends AbstractEffect public class CallParty extends AbstractEffect
{ {
public CallParty(StatsSet params) public CallParty(StatSet params)
{ {
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
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.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect
private final int _itemId; private final int _itemId;
private final int _itemCount; private final int _itemCount;
public CallPc(StatsSet params) public CallPc(StatSet params)
{ {
_itemId = params.getInt("itemId", 0); _itemId = params.getInt("itemId", 0);
_itemCount = params.getInt("itemCount", 0); _itemCount = params.getInt("itemCount", 0);

View File

@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect
{ {
private final List<SkillHolder> _skills = new ArrayList<>(); private final List<SkillHolder> _skills = new ArrayList<>();
public CallRandomSkill(StatsSet params) public CallRandomSkill(StatSet params)
{ {
final String skills = params.getString("skills", null); final String skills = params.getString("skills", null);
if (skills != null) if (skills != null)

View File

@ -17,7 +17,7 @@
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.data.xml.impl.SkillData;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect
private final SkillHolder _skill; private final SkillHolder _skill;
private final int _skillLevelScaleTo; private final int _skillLevelScaleTo;
public CallSkill(StatsSet params) public CallSkill(StatSet params)
{ {
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0));
_skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0);

View File

@ -18,7 +18,7 @@ package handlers.effecthandlers;
import java.util.Collections; import java.util.Collections;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect
{ {
private final SkillHolder _skill; private final SkillHolder _skill;
public CallSkillOnActionTime(StatsSet params) public CallSkillOnActionTime(StatSet params)
{ {
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0));
setTicks(params.getInt("ticks")); setTicks(params.getInt("ticks"));

View File

@ -17,7 +17,7 @@
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party;
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.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/ */
public class CallTargetParty extends AbstractEffect public class CallTargetParty extends AbstractEffect
{ {
public CallTargetParty(StatsSet params) public CallTargetParty(StatSet params)
{ {
} }

View File

@ -17,7 +17,7 @@
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.CtrlIntention;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectFlag;
@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect
{ {
private final double _power; private final double _power;
public ChameleonRest(StatsSet params) public ChameleonRest(StatSet params)
{ {
_power = params.getDouble("power", 0); _power = params.getDouble("power", 0);
setTicks(params.getInt("ticks")); setTicks(params.getInt("ticks"));

View File

@ -20,7 +20,7 @@ import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
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.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder;
@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect
{ {
private final Set<TemplateChanceHolder> _transformations = new HashSet<>(); private final Set<TemplateChanceHolder> _transformations = new HashSet<>();
public ChangeBody(StatsSet params) public ChangeBody(StatSet params)
{ {
for (StatsSet item : params.getList("templates", StatsSet.class)) for (StatSet item : params.getList("templates", StatSet.class))
{ {
_transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance")));
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
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.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect
{ {
private final int _value; private final int _value;
public ChangeFace(StatsSet params) public ChangeFace(StatSet params)
{ {
_value = params.getInt("value", 0); _value = params.getInt("value", 0);
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
/** /**
@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect;
*/ */
public class ChangeFishingMastery extends AbstractEffect public class ChangeFishingMastery extends AbstractEffect
{ {
public ChangeFishingMastery(StatsSet params) public ChangeFishingMastery(StatSet params)
{ {
} }
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
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.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect
{ {
private final int _value; private final int _value;
public ChangeHairColor(StatsSet params) public ChangeHairColor(StatSet params)
{ {
_value = params.getInt("value", 0); _value = params.getInt("value", 0);
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
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.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect
{ {
private final int _value; private final int _value;
public ChangeHairStyle(StatsSet params) public ChangeHairStyle(StatSet params)
{ {
_value = params.getInt("value", 0); _value = params.getInt("value", 0);
} }

View File

@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectFlag;
@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag;
*/ */
public class CheapShot extends AbstractEffect public class CheapShot extends AbstractEffect
{ {
public CheapShot(StatsSet params) public CheapShot(StatSet params)
{ {
} }

Some files were not shown because too many files have changed in this diff Show More