From d4a8f7b74436531cca07a93ffbdd4abebd129c4a Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 24 Jan 2020 19:46:48 +0000 Subject: [PATCH] Addition of getters for creature template values. --- .../custom/RaidbossInfo/RaidbossInfo.java | 2 +- .../Q336_CoinsOfMagic/Q336_CoinsOfMagic.java | 4 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 6 +- .../gameserver/ai/ControllableMobAI.java | 6 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 4 +- .../gameserver/ai/FortSiegeGuardAI.java | 2 +- .../l2jmobius/gameserver/ai/SiegeGuardAI.java | 2 +- .../datatables/sql/CharTemplateTable.java | 2 +- .../gameserver/datatables/sql/NpcTable.java | 15 +- .../gameserver/datatables/sql/SpawnTable.java | 16 +- .../gameserver/geoengine/GeoEngine.java | 6 +- .../admincommandhandlers/AdminEditChar.java | 10 +- .../admincommandhandlers/AdminEditNpc.java | 94 +-- .../admincommandhandlers/AdminExpSp.java | 2 +- .../AdminFightCalculator.java | 14 +- .../admincommandhandlers/AdminMammon.java | 2 +- .../admincommandhandlers/AdminMobGroup.java | 2 +- .../admincommandhandlers/AdminSkill.java | 4 +- .../admincommandhandlers/AdminSpawn.java | 8 +- .../admincommandhandlers/AdminTeleport.java | 4 +- .../admincommandhandlers/AdminTest.java | 4 +- .../handler/itemhandlers/JackpotSeed.java | 2 +- .../handler/itemhandlers/SummonItems.java | 2 +- .../handler/usercommandhandlers/Mount.java | 2 +- .../instancemanager/GrandBossManager.java | 2 +- .../instancemanager/RaidBossSpawnManager.java | 2 +- .../gameserver/model/actor/Attackable.java | 6 +- .../gameserver/model/actor/Creature.java | 18 +- .../gameserver/model/actor/Summon.java | 2 +- .../instance/CastleChamberlainInstance.java | 2 +- .../model/actor/instance/ChestInstance.java | 10 +- .../model/actor/instance/CubicInstance.java | 2 +- .../model/actor/instance/DoormanInstance.java | 8 +- .../model/actor/instance/FolkInstance.java | 10 +- .../model/actor/instance/GourdInstance.java | 2 +- .../actor/instance/MerchantInstance.java | 10 +- .../model/actor/instance/MonsterInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 68 +-- .../model/actor/instance/PetInstance.java | 12 +- .../model/actor/instance/PlayerInstance.java | 16 +- .../actor/instance/RaceManagerInstance.java | 16 +- .../actor/instance/SiegeNpcInstance.java | 2 +- .../model/actor/instance/SummonInstance.java | 4 +- .../actor/instance/TeleporterInstance.java | 2 +- .../model/actor/stat/CreatureStat.java | 78 +-- .../gameserver/model/actor/stat/NpcStat.java | 4 +- .../gameserver/model/actor/stat/PetStat.java | 30 +- .../model/actor/status/PetStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 4 +- .../actor/templates/CreatureTemplate.java | 543 ++++++++++++++---- .../model/actor/templates/NpcTemplate.java | 252 +++++--- .../model/actor/templates/PlayerTemplate.java | 147 +++-- .../gameserver/model/entity/MonsterRace.java | 4 +- .../gameserver/model/entity/Rebirth.java | 4 +- .../gameserver/model/entity/event/VIP.java | 2 +- .../gameserver/model/skills/Formulas.java | 58 +- .../conditions/ConditionTargetRaceId.java | 4 +- .../model/skills/effects/EffectGrow.java | 8 +- .../model/skills/handlers/SkillSummon.java | 4 +- .../gameserver/model/spawn/GroupSpawn.java | 2 +- .../gameserver/model/spawn/Spawn.java | 12 +- .../clientpackets/CharacterCreate.java | 4 +- .../clientpackets/RequestActionUse.java | 2 +- .../network/clientpackets/RequestBuyItem.java | 2 +- .../clientpackets/RequestChangePetName.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../network/serverpackets/CharInfo.java | 8 +- .../network/serverpackets/CharTemplates.java | 16 +- .../serverpackets/GMViewCharacterInfo.java | 4 +- .../network/serverpackets/MonRaceInfo.java | 6 +- .../network/serverpackets/NpcInfo.java | 18 +- .../network/serverpackets/NpcInfoPoly.java | 8 +- .../network/serverpackets/PetInfo.java | 8 +- .../network/serverpackets/UserInfo.java | 10 +- .../org/l2jmobius/gameserver/util/Util.java | 4 +- 75 files changed, 1049 insertions(+), 616 deletions(-) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java index 999faa544f..21831f599c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java @@ -131,7 +131,7 @@ public class RaidbossInfo extends Quest for (Spawn spawn : SpawnTable.getInstance().getSpawnTable().values()) { final NpcTemplate template = NpcTable.getInstance().getTemplate(spawn.getNpcId()); - if ((template != null) && template.type.equals(BOSS_CLASS_TYPE)) + if ((template != null) && template.getType().equals(BOSS_CLASS_TYPE)) { RADARS.put(spawn.getNpcId(), new Location(spawn.getX(), spawn.getY(), spawn.getZ())); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java index dfc2967414..1d8824e42d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java @@ -356,7 +356,7 @@ public class Q336_CoinsOfMagic extends Quest final int npcId = npc.getNpcId(); if ((npcId == HARIT_LIZARDMAN_MATRIARCH) || (npcId == HARIT_LIZARDMAN_SHAMAN)) { - if ((cond == 2) && (Rnd.get(100) < (10.0 * npc.getTemplate().baseHpConsumeRate))) + if ((cond == 2) && (Rnd.get(100) < (10.0 * npc.getTemplate().getBaseHpConsumeRate()))) { st.giveItems(KALDIS_COIN, 1); st.set("cond", "3"); @@ -378,7 +378,7 @@ public class Q336_CoinsOfMagic extends Quest { if (u == npcId) { - if (Rnd.get(100) < (chance * npc.getTemplate().baseHpConsumeRate)) + if (Rnd.get(100) < (chance * npc.getTemplate().getBaseHpConsumeRate())) { st.giveItems(BASIC_COINS[Rnd.get(BASIC_COINS.length)], 1); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 634131c477..831193380f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -752,7 +752,7 @@ public class AttackableAI extends CreatureAI _actor.setTarget(originalAttackTarget); skills = _actor.getAllSkills(); // dist2 = _actor.getPlanDistanceSq(originalAttackTarget.getX(), originalAttackTarget.getY()); - range = _actor.getPhysicalAttackRange() + _actor.getTemplate().collisionRadius + originalAttackTarget.getTemplate().collisionRadius; + range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + originalAttackTarget.getTemplate().getCollisionRadius(); } catch (NullPointerException e) { @@ -761,8 +761,8 @@ public class AttackableAI extends CreatureAI } final Weapon weapon = _actor.getActiveWeaponItem(); - final int collision = _actor.getTemplate().collisionRadius; - final int combinedCollision = collision + originalAttackTarget.getTemplate().collisionRadius; + final int collision = _actor.getTemplate().getCollisionRadius(); + final int combinedCollision = collision + originalAttackTarget.getTemplate().getCollisionRadius(); // ------------------------------------------------------ // In case many mobs are trying to hit from same place, move a bit, diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/ControllableMobAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/ControllableMobAI.java index 952c19dd75..24bd7790dd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/ControllableMobAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/ControllableMobAI.java @@ -193,7 +193,7 @@ public class ControllableMobAI extends AttackableAI final Skill[] skills = _actor.getAllSkills(); final double dist2 = _actor.getPlanDistanceSq(target.getX(), target.getY()); - final int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().collisionRadius + target.getTemplate().collisionRadius; + final int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + target.getTemplate().getCollisionRadius(); int maxRange = range; if (!_actor.isMuted() && (dist2 > ((range + 20) * (range + 20)))) @@ -231,7 +231,7 @@ public class ControllableMobAI extends AttackableAI _actor.setTarget(getForcedTarget()); final Skill[] skills = _actor.getAllSkills(); final double dist2 = _actor.getPlanDistanceSq(getForcedTarget().getX(), getForcedTarget().getY()); - final int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().collisionRadius + getForcedTarget().getTemplate().collisionRadius; + final int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + getForcedTarget().getTemplate().getCollisionRadius(); int maxRange = range; if (!_actor.isMuted() && (dist2 > ((range + 20) * (range + 20)))) @@ -301,7 +301,7 @@ public class ControllableMobAI extends AttackableAI _actor.setTarget(getAttackTarget()); final Skill[] skills = _actor.getAllSkills(); final double dist2 = _actor.getPlanDistanceSq(getAttackTarget().getX(), getAttackTarget().getY()); - final int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().collisionRadius + getAttackTarget().getTemplate().collisionRadius; + final int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + getAttackTarget().getTemplate().getCollisionRadius(); int maxRange = range; if (!_actor.isMuted() && (dist2 > ((range + 20) * (range + 20)))) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java index f7cfd72ccf..88a14cb1d3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -1000,10 +1000,10 @@ public class CreatureAI extends AbstractAI return false; } - int offsetWithCollision = offset + _actor.getTemplate().collisionRadius; + int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius(); if (target instanceof Creature) { - offsetWithCollision += ((Creature) target).getTemplate().collisionRadius; + offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius(); } if (!_actor.isInsideRadius(target, offsetWithCollision, false, false)) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java index 8f093fadc6..1977c9acb9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java @@ -610,7 +610,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable _actor.setTarget(attackTarget); skills = _actor.getAllSkills(); dist2 = _actor.getPlanDistanceSq(attackTarget.getX(), attackTarget.getY()); - range = _actor.getPhysicalAttackRange() + _actor.getTemplate().collisionRadius + attackTarget.getTemplate().collisionRadius; + range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + attackTarget.getTemplate().getCollisionRadius(); if (attackTarget.isMoving()) { range += 50; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java index 897a9cd43f..a9638cc9f2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java @@ -331,7 +331,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable _actor.setTarget(attackTarget); skills = _actor.getAllSkills(); dist2 = _actor.getPlanDistanceSq(attackTarget.getX(), attackTarget.getY()); - range = _actor.getPhysicalAttackRange() + _actor.getTemplate().collisionRadius + attackTarget.getTemplate().collisionRadius; + range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + attackTarget.getTemplate().getCollisionRadius(); } catch (NullPointerException e) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java index b21ba3876c..178df8a935 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java @@ -223,7 +223,7 @@ public class CharTemplateTable ct.addItem(rset.getInt("items" + x)); } } - _templates.put(ct.classId.getId(), ct); + _templates.put(ct.getClassId().getId(), ct); } statement.close(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java index e13e2fcbc6..ef1666a2bf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java @@ -107,7 +107,7 @@ public class NpcTable final int skillId = npcskills.getInt("skillid"); final int level = npcskills.getInt("level"); - if ((npcDat.race == null) && (skillId == 4416)) + if ((npcDat.getRace() == null) && (skillId == 4416)) { npcDat.setRace(level); continue; @@ -548,7 +548,8 @@ public class NpcTable { categories.addAll(old.getDropData()); } - final ClassId[] classIds = old.getTeachInfo().clone(); + + final List classIds = old.getTeachInfo(); final List minions = new ArrayList<>(); @@ -657,7 +658,7 @@ public class NpcTable public void replaceTemplate(NpcTemplate npc) { - _npcs.put(npc.npcId, npc); + _npcs.put(npc.getNpcId(), npc); } public NpcTemplate getTemplate(int id) @@ -669,7 +670,7 @@ public class NpcTable { for (NpcTemplate npcTemplate : _npcs.values()) { - if (npcTemplate.name.equalsIgnoreCase(name)) + if (npcTemplate.getName().equalsIgnoreCase(name)) { return npcTemplate; } @@ -684,7 +685,7 @@ public class NpcTable for (NpcTemplate t : _npcs.values()) { - if (t.level == lvl) + if (t.getLevel() == lvl) { list.add(t); } @@ -699,7 +700,7 @@ public class NpcTable for (NpcTemplate t : _npcs.values()) { - if ((t.level == lvl) && "Monster".equals(t.type)) + if ((t.getLevel() == lvl) && "Monster".equals(t.getType())) { list.add(t); } @@ -714,7 +715,7 @@ public class NpcTable for (NpcTemplate t : _npcs.values()) { - if (t.name.startsWith(letter) && "Npc".equals(t.type)) + if (t.getName().startsWith(letter) && "Npc".equals(t.getType())) { list.add(t); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SpawnTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SpawnTable.java index 4649cc7494..037cbf7163 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SpawnTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SpawnTable.java @@ -82,19 +82,19 @@ public class SpawnTable template1 = NpcTable.getInstance().getTemplate(rset.getInt("npc_templateid")); if (template1 != null) { - if (template1.type.equalsIgnoreCase("SiegeGuard")) + if (template1.getType().equalsIgnoreCase("SiegeGuard")) { // Don't spawn } - else if (template1.type.equalsIgnoreCase("RaidBoss")) + else if (template1.getType().equalsIgnoreCase("RaidBoss")) { // Don't spawn raidboss } - else if (template1.type.equalsIgnoreCase("GrandBoss")) + else if (template1.getType().equalsIgnoreCase("GrandBoss")) { // Don't spawn grandboss } - else if (!Config.ALLOW_CLASS_MASTERS && template1.type.equals("ClassMaster")) + else if (!Config.ALLOW_CLASS_MASTERS && template1.getType().equals("ClassMaster")) { // Dont' spawn class masters } @@ -188,15 +188,15 @@ public class SpawnTable if (template1 != null) { - if (template1.type.equalsIgnoreCase("SiegeGuard")) + if (template1.getType().equalsIgnoreCase("SiegeGuard")) { // Don't spawn } - else if (template1.type.equalsIgnoreCase("RaidBoss")) + else if (template1.getType().equalsIgnoreCase("RaidBoss")) { // Don't spawn raidboss } - else if (!Config.ALLOW_CLASS_MASTERS && template1.type.equals("ClassMaster")) + else if (!Config.ALLOW_CLASS_MASTERS && template1.getType().equals("ClassMaster")) { // Dont' spawn class masters } @@ -368,7 +368,7 @@ public class SpawnTable } else { - player.sendMessage(index + " - " + spawn.getTemplate().name + " (" + spawn.getId() + "): " + spawn.getX() + " " + spawn.getY() + " " + spawn.getZ()); + player.sendMessage(index + " - " + spawn.getTemplate().getName() + " (" + spawn.getId() + "): " + spawn.getX() + " " + spawn.getY() + " " + spawn.getZ()); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java index a5ba9e8bdb..da1ccf3cd6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -407,13 +407,13 @@ public class GeoEngine double oheight = 0; if (origin.isCreature()) { - oheight = ((Creature) origin).getTemplate().collisionHeight * 2; + oheight = ((Creature) origin).getTemplate().getCollisionHeight() * 2; } double theight = 0; if (target.isCreature()) { - theight = ((Creature) target).getTemplate().collisionHeight * 2; + theight = ((Creature) target).getTemplate().getCollisionHeight() * 2; } // perform geodata check @@ -475,7 +475,7 @@ public class GeoEngine double oheight = 0; if (origin.isCreature()) { - oheight = ((Creature) origin).getTemplate().collisionHeight; + oheight = ((Creature) origin).getTemplate().getCollisionHeight(); } // perform geodata check diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java index af1cdd9920..2173fa4554 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java @@ -503,7 +503,7 @@ public class AdminEditChar implements IAdminCommandHandler { player.setBaseClass(classId); } - final String newclass = player.getTemplate().className; + final String newclass = player.getTemplate().getClassName(); player.store(); if (player != activeChar) { @@ -992,7 +992,7 @@ public class AdminEditChar implements IAdminCommandHandler for (int i = CharactersStart; i < charactersEnd; i++) { - replyMSG.append("" + players[i].getName() + "" + players[i].getTemplate().className + "" + players[i].getLevel() + ""); + replyMSG.append("" + players[i].getName() + "" + players[i].getTemplate().getClassName() + "" + players[i].getLevel() + ""); } adminReply.replace("%players%", replyMSG.toString()); @@ -1038,7 +1038,7 @@ public class AdminEditChar implements IAdminCommandHandler } adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%sp%", String.valueOf(player.getSp())); - adminReply.replace("%class%", player.getTemplate().className); + adminReply.replace("%class%", player.getTemplate().getClassName()); adminReply.replace("%ordinal%", String.valueOf(player.getClassId().ordinal())); adminReply.replace("%classid%", String.valueOf(player.getClassId())); adminReply.replace("%x%", String.valueOf(player.getX())); @@ -1215,7 +1215,7 @@ public class AdminEditChar implements IAdminCommandHandler if (name.toLowerCase().contains(characterToFind.toLowerCase())) { charactersFound = charactersFound + 1; - replyMSG.append("" + name + "" + player.getTemplate().className + "" + player.getLevel() + ""); + replyMSG.append("" + name + "" + player.getTemplate().getClassName() + "" + player.getLevel() + ""); } if (charactersFound > 20) @@ -1341,7 +1341,7 @@ public class AdminEditChar implements IAdminCommandHandler { name = player.getName(); charactersFound = charactersFound + 1; - replyMSG.append("" + name + "" + player.getTemplate().className + "" + player.getLevel() + ""); + replyMSG.append("" + name + "" + player.getTemplate().getClassName() + "" + player.getLevel() + ""); } if (charactersFound > 20) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java index 379433ae9d..104b1ecafa 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java @@ -913,46 +913,46 @@ public class AdminEditNpc implements IAdminCommandHandler if (content != null) { adminReply.setHtml(content); - adminReply.replace("%npcId%", String.valueOf(npc.npcId)); - adminReply.replace("%templateId%", String.valueOf(npc.idTemplate)); - adminReply.replace("%name%", npc.name); - adminReply.replace("%serverSideName%", npc.serverSideName ? "1" : "0"); - adminReply.replace("%title%", npc.title); - adminReply.replace("%serverSideTitle%", npc.serverSideTitle ? "1" : "0"); - adminReply.replace("%collisionRadius%", String.valueOf(npc.collisionRadius)); - adminReply.replace("%collisionHeight%", String.valueOf(npc.collisionHeight)); - adminReply.replace("%level%", String.valueOf(npc.level)); - adminReply.replace("%sex%", npc.sex); - adminReply.replace("%type%", npc.type); - adminReply.replace("%attackRange%", String.valueOf(npc.baseAtkRange)); - adminReply.replace("%hp%", String.valueOf(npc.baseHpMax)); - adminReply.replace("%mp%", String.valueOf(npc.baseMpMax)); - adminReply.replace("%hpRegen%", String.valueOf(npc.baseHpReg)); - adminReply.replace("%mpRegen%", String.valueOf(npc.baseMpReg)); - adminReply.replace("%str%", String.valueOf(npc.baseSTR)); - adminReply.replace("%con%", String.valueOf(npc.baseCON)); - adminReply.replace("%dex%", String.valueOf(npc.baseDEX)); - adminReply.replace("%int%", String.valueOf(npc.baseINT)); - adminReply.replace("%wit%", String.valueOf(npc.baseWIT)); - adminReply.replace("%men%", String.valueOf(npc.baseMEN)); - adminReply.replace("%exp%", String.valueOf(npc.rewardExp)); - adminReply.replace("%sp%", String.valueOf(npc.rewardSp)); - adminReply.replace("%pAtk%", String.valueOf(npc.basePAtk)); - adminReply.replace("%pDef%", String.valueOf(npc.basePDef)); - adminReply.replace("%mAtk%", String.valueOf(npc.baseMAtk)); - adminReply.replace("%mDef%", String.valueOf(npc.baseMDef)); - adminReply.replace("%pAtkSpd%", String.valueOf(npc.basePAtkSpd)); - adminReply.replace("%aggro%", String.valueOf(npc.aggroRange)); - adminReply.replace("%mAtkSpd%", String.valueOf(npc.baseMAtkSpd)); - adminReply.replace("%rHand%", String.valueOf(npc.rhand)); - adminReply.replace("%lHand%", String.valueOf(npc.lhand)); - adminReply.replace("%armor%", String.valueOf(npc.armor)); - adminReply.replace("%walkSpd%", String.valueOf(npc.baseWalkSpd)); - adminReply.replace("%runSpd%", String.valueOf(npc.baseRunSpd)); - adminReply.replace("%factionId%", npc.factionId == null ? "" : npc.factionId); - adminReply.replace("%factionRange%", String.valueOf(npc.factionRange)); - adminReply.replace("%isUndead%", npc.isUndead ? "1" : "0"); - adminReply.replace("%absorbLevel%", String.valueOf(npc.absorbLevel)); + adminReply.replace("%npcId%", String.valueOf(npc.getNpcId())); + adminReply.replace("%templateId%", String.valueOf(npc.getIdTemplate())); + adminReply.replace("%name%", npc.getName()); + adminReply.replace("%serverSideName%", npc.isServerSideName() ? "1" : "0"); + adminReply.replace("%title%", npc.getTitle()); + adminReply.replace("%serverSideTitle%", npc.isServerSideTitle() ? "1" : "0"); + adminReply.replace("%collisionRadius%", String.valueOf(npc.getCollisionRadius())); + adminReply.replace("%collisionHeight%", String.valueOf(npc.getCollisionHeight())); + adminReply.replace("%level%", String.valueOf(npc.getLevel())); + adminReply.replace("%sex%", npc.getSex()); + adminReply.replace("%type%", npc.getType()); + adminReply.replace("%attackRange%", String.valueOf(npc.getBaseAtkRange())); + adminReply.replace("%hp%", String.valueOf(npc.getBaseHpMax())); + adminReply.replace("%mp%", String.valueOf(npc.getBaseMpMax())); + adminReply.replace("%hpRegen%", String.valueOf(npc.getBaseHpReg())); + adminReply.replace("%mpRegen%", String.valueOf(npc.getBaseMpReg())); + adminReply.replace("%str%", String.valueOf(npc.getBaseSTR())); + adminReply.replace("%con%", String.valueOf(npc.getBaseCON())); + adminReply.replace("%dex%", String.valueOf(npc.getBaseDEX())); + adminReply.replace("%int%", String.valueOf(npc.getBaseINT())); + adminReply.replace("%wit%", String.valueOf(npc.getBaseWIT())); + adminReply.replace("%men%", String.valueOf(npc.getBaseMEN())); + adminReply.replace("%exp%", String.valueOf(npc.getRewardExp())); + adminReply.replace("%sp%", String.valueOf(npc.getRewardSp())); + adminReply.replace("%pAtk%", String.valueOf(npc.getBasePAtk())); + adminReply.replace("%pDef%", String.valueOf(npc.getBasePDef())); + adminReply.replace("%mAtk%", String.valueOf(npc.getBaseMAtk())); + adminReply.replace("%mDef%", String.valueOf(npc.getBaseMDef())); + adminReply.replace("%pAtkSpd%", String.valueOf(npc.getBasePAtkSpd())); + adminReply.replace("%aggro%", String.valueOf(npc.getAggroRange())); + adminReply.replace("%mAtkSpd%", String.valueOf(npc.getBaseMAtkSpd())); + adminReply.replace("%rHand%", String.valueOf(npc.getRhand())); + adminReply.replace("%lHand%", String.valueOf(npc.getLhand())); + adminReply.replace("%armor%", String.valueOf(npc.getArmor())); + adminReply.replace("%walkSpd%", String.valueOf(npc.getBaseWalkSpd())); + adminReply.replace("%runSpd%", String.valueOf(npc.getBaseRunSpd())); + adminReply.replace("%factionId%", npc.getFactionId() == null ? "" : npc.getFactionId()); + adminReply.replace("%factionRange%", String.valueOf(npc.getFactionRange())); + adminReply.replace("%isUndead%", npc.isUndead() ? "1" : "0"); + adminReply.replace("%absorbLevel%", String.valueOf(npc.getAbsorbLevel())); } else { @@ -1213,7 +1213,7 @@ public class AdminEditNpc implements IAdminCommandHandler final NpcHtmlMessage adminReply = new NpcHtmlMessage(5); - final StringBuilder replyMSG = new StringBuilder("NPC: " + npcData.name + "(" + npcData.npcId + ") 's drop manage"); + final StringBuilder replyMSG = new StringBuilder("NPC: " + npcData.getName() + "(" + npcData.getNpcId() + ") 's drop manage"); replyMSG.append(""); replyMSG.append("
Notes: click[drop_id]to show the detail of drop data,click[del] to delete the drop data!"); replyMSG.append(""); @@ -1226,10 +1226,10 @@ public class AdminEditNpc implements IAdminCommandHandler itemTemplate = ItemTable.getInstance().getTemplate(drop.getItemId()); if (itemTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Unkown item Id: " + drop.getItemId() + " for NPC: " + npcData.npcId); + LOGGER.warning(getClass().getSimpleName() + ": Unkown item Id: " + drop.getItemId() + " for NPC: " + npcData.getNpcId()); continue; } - replyMSG.append(""); + replyMSG.append(""); } } @@ -1258,7 +1258,7 @@ public class AdminEditNpc implements IAdminCommandHandler if (dropData.next()) { replyMSG.append("
" + npcData.npcId + " " + drop.getItemId() + " " + cat.getCategoryType() + "" + itemTemplate.getName() + "[" + drop.getItemId() + "]" + (drop.isQuestDrop() ? "Q" : cat.isSweep() ? "S" : "D") + "del
" + npcData.getNpcId() + " " + drop.getItemId() + " " + cat.getCategoryType() + "" + itemTemplate.getName() + "[" + drop.getItemId() + "]" + (drop.isQuestDrop() ? "Q" : cat.isSweep() ? "S" : "D") + "del
"); - replyMSG.append(""); + replyMSG.append(""); replyMSG.append(""); replyMSG.append(""); replyMSG.append(""); @@ -1288,7 +1288,7 @@ public class AdminEditNpc implements IAdminCommandHandler { final NpcHtmlMessage adminReply = new NpcHtmlMessage(5); - final StringBuilder replyMSG = new StringBuilder("Add dropdata to " + npcData.name + "(" + npcData.npcId + ")"); + final StringBuilder replyMSG = new StringBuilder("Add dropdata to " + npcData.getName() + "(" + npcData.getNpcId() + ")"); replyMSG.append(""); replyMSG.append("
Appertain of NPC" + NpcTable.getInstance().getTemplate(dropData.getInt("mobId")).name + "
Appertain of NPC" + NpcTable.getInstance().getTemplate(dropData.getInt("mobId")).getName() + "
ItemName" + ItemTable.getInstance().getTemplate(dropData.getInt("itemId")).getName() + "(" + dropData.getInt("itemId") + ")
Category" + (category == -1 ? "sweep" : Integer.toString(category)) + "
MIN(" + dropData.getInt("min") + ")
"); replyMSG.append(""); @@ -1298,8 +1298,8 @@ public class AdminEditNpc implements IAdminCommandHandler replyMSG.append(""); replyMSG.append("
Item-Id
CHANCE(0-1000000)
"); replyMSG.append("
"); - replyMSG.append("
"); replyMSG.append(""); adminReply.setHtml(replyMSG.toString()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminExpSp.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminExpSp.java index 07744faf40..564f05ede8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminExpSp.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminExpSp.java @@ -111,7 +111,7 @@ public class AdminExpSp implements IAdminCommandHandler adminReply.replace("%level%", String.valueOf(player.getLevel())); adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%sp%", String.valueOf(player.getSp())); - adminReply.replace("%class%", player.getTemplate().className); + adminReply.replace("%class%", player.getTemplate().getClassName()); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFightCalculator.java index d4dddec113..7f669cc638 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFightCalculator.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFightCalculator.java @@ -136,11 +136,11 @@ public class AdminFightCalculator implements IAdminCommandHandler replyMSG.append(""); replyMSG.append(""); replyMSG.append(""); - replyMSG.append(""); - replyMSG.append(""); + replyMSG.append(""); + replyMSG.append(""); replyMSG.append("
FirstSecond
level " + lvl1 + "level " + lvl2 + "
id " + npc1.npcId + "id " + npc2.npcId + "
" + npc1.name + "" + npc2.name + "
id " + npc1.getNpcId() + "id " + npc2.getNpcId() + "
" + npc1.getName() + "" + npc2.getName() + "
"); replyMSG.append("



"); - replyMSG.append("
"); replyMSG.append(""); } @@ -153,7 +153,7 @@ public class AdminFightCalculator implements IAdminCommandHandler for (NpcTemplate n : npcs) { - replyMSG.append("" + n.name + ""); + replyMSG.append("" + n.getName() + ""); } replyMSG.append(""); @@ -167,7 +167,7 @@ public class AdminFightCalculator implements IAdminCommandHandler for (NpcTemplate n : npcs) { - replyMSG.append("" + n.name + ""); + replyMSG.append("" + n.getName() + ""); } replyMSG.append(""); @@ -369,7 +369,7 @@ public class AdminFightCalculator implements IAdminCommandHandler } else { - replyMSG.append("Parameter" + ((NpcTemplate) npc1.getTemplate()).name + "" + ((NpcTemplate) npc2.getTemplate()).name + ""); + replyMSG.append("Parameter" + ((NpcTemplate) npc1.getTemplate()).getName() + "" + ((NpcTemplate) npc2.getTemplate()).getName() + ""); } replyMSG.append("miss" + miss1 + "%" + miss2 + "%"); @@ -412,7 +412,7 @@ public class AdminFightCalculator implements IAdminCommandHandler } else { - replyMSG.append("