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

Sync with L2JServer Jan 24th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-24 20:02:32 +00:00
parent d349bd3924
commit 1c6301c46d
1012 changed files with 23069 additions and 6307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/AllyDismiss.java
View File

@ -19,7 +19,7 @@
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;

12
trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java
View File

@ -24,12 +24,12 @@ import java.util.logging.LogRecord;
import java.util.logging.Logger;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.datatables.CharTemplateTable;
import com.l2jserver.gameserver.datatables.InitialEquipmentData;
import com.l2jserver.gameserver.datatables.InitialShortcutData;
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
import com.l2jserver.gameserver.data.xml.impl.InitialEquipmentData;
import com.l2jserver.gameserver.data.xml.impl.InitialShortcutData;
import com.l2jserver.gameserver.data.xml.impl.PlayerTemplateData;
import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.datatables.SkillTreesData;
import com.l2jserver.gameserver.model.L2SkillLearn;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.Location;
@ -180,7 +180,7 @@ public final class CharacterCreate extends L2GameClientPacket
return;
}
template = CharTemplateTable.getInstance().getTemplate(_classId);
template = PlayerTemplateData.getInstance().getTemplate(_classId);
if ((template == null) || (ClassId.getClassId(_classId).level() > 0))
{
if (Config.DEBUG)

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java
View File

@ -23,8 +23,8 @@ import java.util.logging.LogRecord;
import java.util.logging.Logger;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.datatables.SecondaryAuthData;
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
import com.l2jserver.gameserver.data.xml.impl.SecondaryAuthData;
import com.l2jserver.gameserver.instancemanager.AntiFeedManager;
import com.l2jserver.gameserver.instancemanager.PunishmentManager;
import com.l2jserver.gameserver.model.CharSelectInfoPackage;

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/DlgAnswer.java
View File

@ -19,7 +19,7 @@
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.enums.PlayerAction;
import com.l2jserver.gameserver.handler.AdminCommandHandler;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
@ -84,7 +84,7 @@ public final class DlgAnswer extends L2GameClientPacket
}
String command = cmd.split(" ")[0];
IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
if (AdminTable.getInstance().hasAccess(command, activeChar.getAccessLevel()))
if (AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
{
if (Config.GMAUDIT)
{

24
trunk/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java
View File

@ -21,11 +21,11 @@ package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.LoginServerThread;
import com.l2jserver.gameserver.cache.HtmCache;
import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.datatables.AnnouncementsTable;
import com.l2jserver.gameserver.datatables.BeautyShopData;
import com.l2jserver.gameserver.datatables.OfflineTradersTable;
import com.l2jserver.gameserver.datatables.SkillTreesData;
import com.l2jserver.gameserver.data.sql.impl.AnnouncementsTable;
import com.l2jserver.gameserver.data.sql.impl.OfflineTradersTable;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.data.xml.impl.BeautyShopData;
import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
import com.l2jserver.gameserver.instancemanager.CastleManager;
@ -175,34 +175,34 @@ public class EnterWorld extends L2GameClientPacket
// Apply special GM properties to the GM when entering
if (activeChar.isGM())
{
if (Config.GM_STARTUP_INVULNERABLE && AdminTable.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
if (Config.GM_STARTUP_INVULNERABLE && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
{
activeChar.setIsInvul(true);
}
if (Config.GM_STARTUP_INVISIBLE && AdminTable.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
if (Config.GM_STARTUP_INVISIBLE && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
{
activeChar.setInvisible(true);
}
if (Config.GM_STARTUP_SILENCE && AdminTable.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
if (Config.GM_STARTUP_SILENCE && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
{
activeChar.setSilenceMode(true);
}
if (Config.GM_STARTUP_DIET_MODE && AdminTable.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
if (Config.GM_STARTUP_DIET_MODE && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
{
activeChar.setDietMode(true);
activeChar.refreshOverloaded();
}
if (Config.GM_STARTUP_AUTO_LIST && AdminTable.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
if (Config.GM_STARTUP_AUTO_LIST && AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
{
AdminTable.getInstance().addGm(activeChar, false);
AdminData.getInstance().addGm(activeChar, false);
}
else
{
AdminTable.getInstance().addGm(activeChar, true);
AdminData.getInstance().addGm(activeChar, true);
}
if (Config.GM_GIVE_SPECIAL_SKILLS)

22
trunk/java/com/l2jserver/gameserver/network/clientpackets/MoveBackwardToLocation.java
View File

@ -47,6 +47,8 @@ public class MoveBackwardToLocation extends L2GameClientPacket
private int _originX;
private int _originY;
private int _originZ;
@SuppressWarnings("unused")
private int _moveMovement;
@Override
@ -133,23 +135,15 @@ public class MoveBackwardToLocation extends L2GameClientPacket
return;
}
// Disable keyboard movement when geodata is not enabled and player is not flying.
if ((_moveMovement == 0) && (Config.GEODATA < 1) && !activeChar.isFlying())
double dx = _targetX - activeChar.getX();
double dy = _targetY - activeChar.getY();
// Can't move if character is confused, or trying to move a huge distance
if (activeChar.isOutOfControl() || (((dx * dx) + (dy * dy)) > 98010000)) // 9900*9900
{
activeChar.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else
{
double dx = _targetX - activeChar.getX();
double dy = _targetY - activeChar.getY();
// Can't move if character is confused, or trying to move a huge distance
if (activeChar.isOutOfControl() || (((dx * dx) + (dy * dy)) > 98010000)) // 9900*9900
{
activeChar.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(_targetX, _targetY, _targetZ));
}
activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(_targetX, _targetY, _targetZ));
}
@Override

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -23,7 +23,7 @@ import java.util.ArrayList;
import javolution.util.FastList;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.MultisellData;
import com.l2jserver.gameserver.data.xml.impl.MultisellData;
import com.l2jserver.gameserver.model.Elementals;
import com.l2jserver.gameserver.model.L2Augmentation;
import com.l2jserver.gameserver.model.actor.L2Npc;

28
trunk/java/com/l2jserver/gameserver/network/clientpackets/NewCharacter.java
View File

@ -19,7 +19,7 @@
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.CharTemplateTable;
import com.l2jserver.gameserver.data.xml.impl.PlayerTemplateData;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.network.serverpackets.NewCharacterSuccess;
@ -45,19 +45,19 @@ public final class NewCharacter extends L2GameClientPacket
}
final NewCharacterSuccess ct = new NewCharacterSuccess();
ct.addChar(CharTemplateTable.getInstance().getTemplate(ClassId.FIGHTER)); // Human Figther
ct.addChar(CharTemplateTable.getInstance().getTemplate(ClassId.MAGE)); // Human Mystic
ct.addChar(CharTemplateTable.getInstance().getTemplate(ClassId.ELVEN_FIGHTER)); // Elven Fighter
ct.addChar(CharTemplateTable.getInstance().getTemplate(ClassId.ELVEN_MAGE)); // Elven Mystic
ct.addChar(CharTemplateTable.getInstance().getTemplate(ClassId.DARK_FIGHTER)); // Dark Fighter
ct.addChar(CharTemplateTable.getInstance().getTemplate(ClassId.DARK_MAGE)); // Dark Mystic
ct.addChar(CharTemplateTable.getInstance().getTemplate(ClassId.ORC_FIGHTER)); // Orc Fighter
ct.addChar(CharTemplateTable.getInstance().getTemplate(ClassId.ORC_MAGE)); // Orc Mystic
ct.addChar(CharTemplateTable.getInstance().getTemplate(ClassId.DWARVEN_FIGHTER)); // Dwarf Fighter
ct.addChar(CharTemplateTable.getInstance().getTemplate(ClassId.MALE_SOLDIER)); // Male Kamael Soldier
ct.addChar(CharTemplateTable.getInstance().getTemplate(ClassId.FEMALE_SOLDIER)); // Female Kamael Soldier
ct.addChar(CharTemplateTable.getInstance().getTemplate(ClassId.ERTHEIA_FIGHTER)); // Ertheia Fighter
ct.addChar(CharTemplateTable.getInstance().getTemplate(ClassId.ERTHEIA_WIZARD)); // Ertheia Wizard
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.FIGHTER)); // Human Figther
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.MAGE)); // Human Mystic
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.ELVEN_FIGHTER)); // Elven Fighter
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.ELVEN_MAGE)); // Elven Mystic
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.DARK_FIGHTER)); // Dark Fighter
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.DARK_MAGE)); // Dark Mystic
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.ORC_FIGHTER)); // Orc Fighter
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.ORC_MAGE)); // Orc Mystic
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.DWARVEN_FIGHTER)); // Dwarf Fighter
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.MALE_SOLDIER)); // Male Kamael Soldier
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.FEMALE_SOLDIER)); // Female Kamael Soldier
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.ERTHEIA_FIGHTER)); // Ertheia Fighter
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.ERTHEIA_WIZARD)); // Ertheia Wizard
sendPacket(ct);
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireAbilityList.java
View File

@ -21,7 +21,7 @@ package com.l2jserver.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.List;
import com.l2jserver.gameserver.datatables.SkillTreesData;
import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
import com.l2jserver.gameserver.model.L2SkillLearn;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;

22
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@ -21,8 +21,8 @@ package com.l2jserver.gameserver.network.clientpackets;
import java.util.List;
import com.l2jserver.Config;
import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.datatables.SkillTreesData;
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.IllegalActionPunishmentType;
import com.l2jserver.gameserver.enums.Race;
@ -310,6 +310,16 @@ public final class RequestAcquireSkill extends L2GameClientPacket
{
giveSkill(activeChar, trainer, skill);
}
final List<L2SkillLearn> skills = SkillTreesData.getInstance().getAvailableTransferSkills(activeChar);
if (skills.isEmpty())
{
activeChar.sendPacket(SystemMessageId.THERE_ARE_NO_OTHER_SKILLS_TO_LEARN);
}
else
{
activeChar.sendPacket(new ExAcquirableSkillListByClass(skills, AcquireSkillType.TRANSFER));
}
break;
}
case SUBCLASS:
@ -619,11 +629,15 @@ public final class RequestAcquireSkill extends L2GameClientPacket
if (!s.getRemoveSkills().isEmpty())
{
s.getRemoveSkills().forEach(sk ->
s.getRemoveSkills().forEach(skillId ->
{
if (player.getSkillLevel(sk) > 0)
if (player.getSkillLevel(skillId) > 0)
{
player.removeSkill(sk, true);
final Skill skillToRemove = player.getKnownSkill(skillId);
if (skillToRemove != null)
{
player.removeSkill(skillToRemove, true);
}
}
});
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
View File

@ -18,8 +18,8 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.datatables.SkillTreesData;
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.ClanPrivilege;

343
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java
View File

@ -25,10 +25,10 @@ import com.l2jserver.gameserver.ai.CtrlEvent;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.ai.L2SummonAI;
import com.l2jserver.gameserver.ai.NextAction;
import com.l2jserver.gameserver.data.sql.impl.SummonSkillsTable;
import com.l2jserver.gameserver.data.xml.impl.PetDataTable;
import com.l2jserver.gameserver.datatables.BotReportTable;
import com.l2jserver.gameserver.datatables.PetDataTable;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.datatables.SummonSkillsTable;
import com.l2jserver.gameserver.enums.MountType;
import com.l2jserver.gameserver.enums.PrivateStoreType;
import com.l2jserver.gameserver.instancemanager.AirShipManager;
@ -134,7 +134,8 @@ public final class RequestActionUse extends L2GameClientPacket
}
}
final L2Summon summon = activeChar.getSummon();
final L2Summon pet = activeChar.getPet();
final L2Summon servitor = activeChar.getAnyServitor();
final L2Object target = activeChar.getTarget();
switch (_actionId)
{
@ -167,48 +168,48 @@ public final class RequestActionUse extends L2GameClientPacket
activeChar.tryOpenPrivateSellStore(false);
break;
case 15: // Change Movement Mode (Pets)
if (validateSummon(summon, true))
if (validateSummon(pet, true))
{
((L2SummonAI) summon.getAI()).notifyFollowStatusChange();
((L2SummonAI) pet.getAI()).notifyFollowStatusChange();
}
break;
case 16: // Attack (Pets)
if (validateSummon(summon, true))
if (validateSummon(pet, true))
{
if (summon.canAttack(_ctrlPressed))
if (pet.canAttack(_ctrlPressed))
{
summon.doAttack();
pet.doAttack();
}
}
break;
case 17: // Stop (Pets)
if (validateSummon(summon, true))
if (validateSummon(pet, true))
{
summon.cancelAction();
pet.cancelAction();
}
break;
case 19: // Unsummon Pet
if (!validateSummon(summon, true))
if (!validateSummon(pet, true))
{
break;
}
if (summon.isDead())
if (pet.isDead())
{
sendPacket(SystemMessageId.DEAD_PETS_CANNOT_BE_RETURNED_TO_THEIR_SUMMONING_ITEM);
break;
}
if (summon.isAttackingNow() || summon.isInCombat() || summon.isMovementDisabled())
if (pet.isAttackingNow() || pet.isInCombat() || pet.isMovementDisabled())
{
sendPacket(SystemMessageId.A_PET_CANNOT_BE_UNSUMMONED_DURING_BATTLE);
break;
}
if (summon.isHungry())
if (pet.isHungry())
{
if (summon.isPet() && !((L2PetInstance) summon).getPetData().getFood().isEmpty())
if (!((L2PetInstance) pet).getPetData().getFood().isEmpty())
{
sendPacket(SystemMessageId.YOU_MAY_NOT_RESTORE_A_HUNGRY_PET);
}
@ -219,27 +220,27 @@ public final class RequestActionUse extends L2GameClientPacket
break;
}
summon.unSummon(activeChar);
pet.unSummon(activeChar);
break;
case 21: // Change Movement Mode (Servitors)
if (validateSummon(summon, false))
if (validateSummon(servitor, false))
{
((L2SummonAI) summon.getAI()).notifyFollowStatusChange();
((L2SummonAI) servitor.getAI()).notifyFollowStatusChange();
}
break;
case 22: // Attack (Servitors)
if (validateSummon(summon, false))
if (validateSummon(servitor, false))
{
if (summon.canAttack(_ctrlPressed))
if (servitor.canAttack(_ctrlPressed))
{
summon.doAttack();
servitor.doAttack();
}
}
break;
case 23: // Stop (Servitors)
if (validateSummon(summon, false))
if (validateSummon(servitor, false))
{
summon.cancelAction();
servitor.cancelAction();
}
break;
case 28: // Private Store - Buy
@ -270,13 +271,13 @@ public final class RequestActionUse extends L2GameClientPacket
sendPacket(new RecipeShopManageList(activeChar, true));
break;
case 38: // Mount/Dismount
activeChar.mountPlayer(summon);
activeChar.mountPlayer(pet);
break;
case 39: // Soulless - Parasite Burst
useSkill(4138, false);
break;
case 41: // Wild Hog Cannon - Attack
if (validateSummon(summon, false))
if (validateSummon(servitor, false))
{
if ((target != null) && (target.isDoor() || (target instanceof L2SiegeFlagInstance)))
{
@ -329,33 +330,33 @@ public final class RequestActionUse extends L2GameClientPacket
sendPacket(new RecipeShopManageList(activeChar, false));
break;
case 52: // Unsummon Servitor
if (validateSummon(summon, false))
if (validateSummon(servitor, false))
{
if (summon.isAttackingNow() || summon.isInCombat())
if (servitor.isAttackingNow() || servitor.isInCombat())
{
sendPacket(SystemMessageId.A_SERVITOR_WHOM_IS_ENGAGED_IN_BATTLE_CANNOT_BE_DE_ACTIVATED);
break;
}
summon.unSummon(activeChar);
servitor.unSummon(activeChar);
}
break;
case 53: // Move to target (Servitors)
if (validateSummon(summon, false))
if (validateSummon(servitor, false))
{
if ((target != null) && (summon != target) && !summon.isMovementDisabled())
if ((target != null) && (servitor != target) && !servitor.isMovementDisabled())
{
summon.setFollowStatus(false);
summon.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, target.getLocation());
servitor.setFollowStatus(false);
servitor.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, target.getLocation());
}
}
break;
case 54: // Move to target (Pets)
if (validateSummon(summon, true))
if (validateSummon(pet, true))
{
if ((target != null) && (summon != target) && !summon.isMovementDisabled())
if ((target != null) && (pet != target) && !pet.isMovementDisabled())
{
summon.setFollowStatus(false);
summon.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, target.getLocation());
pet.setFollowStatus(false);
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, target.getLocation());
}
}
break;
@ -447,9 +448,9 @@ public final class RequestActionUse extends L2GameClientPacket
}
break;
case 1001: // Sin Eater - Ultimate Bombastic Buster
if (validateSummon(summon, true) && (summon.getId() == SIN_EATER_ID))
if (validateSummon(pet, true) && (pet.getId() == SIN_EATER_ID))
{
summon.broadcastPacket(new NpcSay(summon.getObjectId(), Say2.NPC_ALL, summon.getId(), NPC_STRINGS[Rnd.get(NPC_STRINGS.length)]));
pet.broadcastPacket(new NpcSay(pet.getObjectId(), Say2.NPC_ALL, pet.getId(), NPC_STRINGS[Rnd.get(NPC_STRINGS.length)]));
}
break;
case 1003: // Wind Hatchling/Strider - Wild Stun
@ -663,9 +664,9 @@ public final class RequestActionUse extends L2GameClientPacket
useSkill(6044, false);
break;
case 1084: // Switch State
if (summon instanceof L2BabyPetInstance)
if (pet instanceof L2BabyPetInstance)
{
useSkill(6054, true);
useSkill(SWITCH_STANCE_ID, true);
}
break;
case 1086: // Panther Cancel
@ -707,6 +708,172 @@ public final class RequestActionUse extends L2GameClientPacket
case 1098: // Elite Maguen - Maguen Party Return
useSkill(6684, true);
break;
case 1099: // All servitor attack
activeChar.getServitors().values().forEach(s ->
{
if (validateSummon(s, false))
{
if (s.canAttack(_ctrlPressed))
{
s.doAttack();
}
}
});
break;
case 1100: // All servitor move to
activeChar.getServitors().values().forEach(s ->
{
if (validateSummon(s, false))
{
if ((target != null) && (s != target) && !s.isMovementDisabled())
{
s.setFollowStatus(false);
s.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, target.getLocation());
}
}
});
break;
case 1101: // All servitor stop
activeChar.getServitors().values().forEach(summon ->
{
if (validateSummon(summon, false))
{
summon.cancelAction();
}
});
break;
case 1102: // Unsummon all servitors
boolean canUnsummon = true;
OUT: for (L2Summon s : activeChar.getServitors().values())
{
if (validateSummon(s, false))
{
if (s.isAttackingNow() || s.isInCombat())
{
sendPacket(SystemMessageId.A_SERVITOR_WHOM_IS_ENGAGED_IN_BATTLE_CANNOT_BE_DE_ACTIVATED);
canUnsummon = false;
break OUT;
}
s.unSummon(activeChar);
}
}
if (canUnsummon)
{
activeChar.getServitors().values().stream().forEach(s ->
{
s.unSummon(activeChar);
});
}
break;
case 1103: // seems to be passive mode
break;
case 1104: // seems to be defend mode
break;
case 1106: // Cute Bear - Bear Claw
useServitorsSkill(11278);
break;
case 1107: // Cute Bear - Bear Tumbling
useServitorsSkill(11279);
break;
case 1108: // Saber Tooth Cougar- Cougar Bite
useServitorsSkill(11280);
break;
case 1109: // Saber Tooth Cougar - Cougar Pounce
useServitorsSkill(11281);
break;
case 1110: // Grim Reaper - Reaper Touch
useServitorsSkill(11282);
break;
case 1111: // Grim Reaper - Reaper Power
useServitorsSkill(11283);
break;
case 1113: // Golden Lion - Lion Roar
useSkill(10051, false);
break;
case 1114: // Golden Lion - Lion Claw
useSkill(10052, false);
break;
case 1115: // Golden Lion - Lion Dash
useSkill(10053, false);
break;
case 1116: // Golden Lion - Lion Flame
useSkill(10054, false);
break;
case 1117: // Thunder Hawk - Thunder Flight
useSkill(10794, false);
break;
case 1118: // Thunder Hawk - Thunder Purity
useSkill(10795, false);
break;
case 1120: // Thunder Hawk - Thunder Feather Blast
useSkill(10797, false);
break;
case 1121: // Thunder Hawk - Thunder Sharp Claw
useSkill(10798, false);
break;
case 1122: // Tree of Life - Blessing of Tree
useServitorsSkill(11806);
break;
case 1124: // Wynn Kai the Cat - Feline Aggression
useServitorsSkill(11323);
break;
case 1125: // Wynn Kai the Cat - Feline Stun
useServitorsSkill(11324);
break;
case 1126: // Wynn Feline King - Feline Bite
useServitorsSkill(11325);
break;
case 1127: // Wynn Feline King - Feline Pounce
useServitorsSkill(11326);
break;
case 1128: // Wynn Feline Queen - Feline Touch
useServitorsSkill(11327);
break;
case 1129: // Wynn Feline Queen - Feline Power
useServitorsSkill(11328);
break;
case 1130: // Wynn Merrow - Unicorn's Aggression
useServitorsSkill(11332);
break;
case 1131: // Wynn Merrow - Unicorn's Stun
useServitorsSkill(11333);
break;
case 1132: // Wynn Magnus - Unicorn's Bite
useServitorsSkill(11334);
break;
case 1133: // Wynn Magnus - Unicorn's Pounce
useServitorsSkill(11335);
break;
case 1134: // Wynn Seraphim - Unicorn's Touch
useServitorsSkill(11336);
break;
case 1135: // Wynn Seraphim - Unicorn's Power
useServitorsSkill(11337);
break;
case 1136: // Wynn Nightshade - Phantom Aggression
useServitorsSkill(11341);
break;
case 1137: // Wynn Nightshade - Phantom Stun
useServitorsSkill(11342);
break;
case 1138: // Wynn Spectral Lord - Phantom Bite
useServitorsSkill(11343);
break;
case 1139: // Wynn Spectral Lord - Phantom Pounce
useServitorsSkill(11344);
break;
case 1140: // Wynn Soulless - Phantom Touch
useServitorsSkill(11345);
break;
case 1141: // Wynn Soulless - Phantom Power
useServitorsSkill(11346);
break;
case 1142: // Blood Panther - Panther Roar
useServitorsSkill(10087);
break;
case 1143: // Blood Panther - Panther Rush
useServitorsSkill(10088);
break;
case 5000: // Baby Rudolph - Reindeer Scratch
useSkill(23155, true);
break;
@ -866,45 +1033,57 @@ public final class RequestActionUse extends L2GameClientPacket
return;
}
final L2Summon summon = activeChar.getSummon();
if (!validateSummon(summon, pet))
if (pet)
{
return;
}
if (summon instanceof L2BabyPetInstance)
{
if (!((L2BabyPetInstance) summon).isInSupportMode())
final L2Summon summon = activeChar.getPet();
if (!validateSummon(summon, pet))
{
sendPacket(SystemMessageId.A_PET_ON_AUXILIARY_MODE_CANNOT_USE_SKILLS);
return;
}
}
int lvl = 0;
if (summon.isPet())
{
if (summon instanceof L2BabyPetInstance)
{
if (!((L2BabyPetInstance) summon).isInSupportMode())
{
sendPacket(SystemMessageId.A_PET_ON_AUXILIARY_MODE_CANNOT_USE_SKILLS);
return;
}
}
if ((summon.getLevel() - activeChar.getLevel()) > 20)
{
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
return;
}
lvl = PetDataTable.getInstance().getPetData(summon.getId()).getAvailableLevel(skillId, summon.getLevel());
final int lvl = PetDataTable.getInstance().getPetData(summon.getId()).getAvailableLevel(skillId, summon.getLevel());
if (lvl > 0)
{
summon.setTarget(target);
summon.useMagic(SkillData.getInstance().getSkill(skillId, lvl), _ctrlPressed, _shiftPressed);
}
if (skillId == SWITCH_STANCE_ID)
{
summon.switchMode();
}
}
else
{
lvl = SummonSkillsTable.getInstance().getAvailableLevel(summon, skillId);
}
if (lvl > 0)
{
summon.setTarget(target);
summon.useMagic(SkillData.getInstance().getSkill(skillId, lvl), _ctrlPressed, _shiftPressed);
}
if (skillId == SWITCH_STANCE_ID)
{
summon.switchMode();
final L2Summon servitor = activeChar.getAnyServitor();
if (!validateSummon(servitor, pet))
{
return;
}
final int lvl = SummonSkillsTable.getInstance().getAvailableLevel(servitor, skillId);
if (lvl > 0)
{
servitor.setTarget(target);
servitor.useMagic(SkillData.getInstance().getSkill(skillId, lvl), _ctrlPressed, _shiftPressed);
}
}
}
@ -925,6 +1104,36 @@ public final class RequestActionUse extends L2GameClientPacket
useSkill(skillId, activeChar.getTarget(), pet);
}
/**
* Cast a skill for all active summon.<br>
* Target is retrieved from owner's target
* @param skillId the skill Id to use
*/
private void useServitorsSkill(int skillId)
{
final L2PcInstance activeChar = getActiveChar();
if (activeChar == null)
{
return;
}
activeChar.getServitors().values().forEach(servitor ->
{
if (!validateSummon(servitor, false))
{
return;
}
final int lvl = SummonSkillsTable.getInstance().getAvailableLevel(servitor, skillId);
if (lvl > 0)
{
servitor.setTarget(activeChar.getTarget());
servitor.useMagic(SkillData.getInstance().getSkill(skillId, lvl), _ctrlPressed, _shiftPressed);
}
});
}
/**
* Validates the given summon and sends a system message to the master.
* @param summon the summon to validate

177
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAutoSoulShot.java
View File

@ -18,22 +18,21 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.enums.PrivateStoreType;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.L2Item;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.model.items.type.ActionType;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExAutoSoulShot;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* This class ...
* @version $Revision: 1.0.0.0 $ $Date: 2005/07/11 15:29:30 $
* @author Unknown, UnAfraid
*/
public final class RequestAutoSoulShot extends L2GameClientPacket
{
private static final String _C__D0_0D_REQUESTAUTOSOULSHOT = "[C] D0:0D RequestAutoSoulShot";
// format cd
private int _itemId;
private int _type; // 1 = on : 0 = off;
@ -56,11 +55,6 @@ public final class RequestAutoSoulShot extends L2GameClientPacket
if ((activeChar.getPrivateStoreType() == PrivateStoreType.NONE) && (activeChar.getActiveRequester() == null) && !activeChar.isDead())
{
if (Config.DEBUG)
{
_log.fine("AutoSoulShot:" + _itemId);
}
final L2ItemInstance item = activeChar.getInventory().getItemByItemId(_itemId);
if (item == null)
{
@ -75,100 +69,145 @@ public final class RequestAutoSoulShot extends L2GameClientPacket
return;
}
// Fishingshots are not automatic on retail
if ((_itemId < 6535) || (_itemId > 6540))
if (isSummonShot(item.getItem()))
{
// Attempt to charge first shot on activation
if ((_itemId == 6645) || (_itemId == 6646) || (_itemId == 6647) || (_itemId == 20332) || (_itemId == 20333) || (_itemId == 20334))
if (activeChar.hasSummon())
{
if (activeChar.hasSummon())
final boolean isSoulshot = item.getEtcItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT;
final boolean isSpiritshot = item.getEtcItem().getDefaultAction() == ActionType.SUMMON_SPIRITSHOT;
if (isSoulshot)
{
if (item.getEtcItem().getHandlerName().equals("BeastSoulShot"))
int soulshotCount = 0;
final L2Summon pet = activeChar.getPet();
if (pet != null)
{
if (activeChar.getSummon().getSoulShotsPerHit() > item.getCount())
{
activeChar.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_PET_SERVITOR);
return;
}
soulshotCount += pet.getSoulShotsPerHit();
}
else
for (L2Summon servitor : activeChar.getServitors().values())
{
if (activeChar.getSummon().getSpiritShotsPerHit() > item.getCount())
{
activeChar.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_PET_SERVITOR);
return;
}
soulshotCount += servitor.getSoulShotsPerHit();
}
if (soulshotCount > item.getCount())
{
activeChar.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_PET_SERVITOR);
return;
}
activeChar.addAutoSoulShot(_itemId);
activeChar.sendPacket(new ExAutoSoulShot(_itemId, _type));
// start the auto soulshot use
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED);
sm.addItemName(item);
activeChar.sendPacket(sm);
activeChar.rechargeShots(true, true);
activeChar.getSummon().rechargeShots(true, true);
}
else
else if (isSpiritshot)
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
}
}
else
{
if ((activeChar.getActiveWeaponItem() != activeChar.getFistsWeaponItem()) && (item.getItem().getCrystalType() == activeChar.getActiveWeaponItem().getItemGradeSPlus()))
{
activeChar.addAutoSoulShot(_itemId);
activeChar.sendPacket(new ExAutoSoulShot(_itemId, _type));
}
else
{
if (((_itemId >= 2509) && (_itemId <= 2514)) || ((_itemId >= 3947) && (_itemId <= 3952)) || (_itemId == 5790) || ((_itemId >= 22072) && (_itemId <= 22081)))
int spiritshotCount = 0;
final L2Summon pet = activeChar.getPet();
if (pet != null)
{
activeChar.sendPacket(SystemMessageId.YOUR_SPIRITSHOT_DOES_NOT_MATCH_THE_WEAPON_S_GRADE);
spiritshotCount += pet.getSpiritShotsPerHit();
}
else
for (L2Summon servitor : activeChar.getServitors().values())
{
activeChar.sendPacket(SystemMessageId.THE_SOULSHOT_YOU_ARE_ATTEMPTING_TO_USE_DOES_NOT_MATCH_THE_GRADE_OF_YOUR_EQUIPPED_WEAPON);
spiritshotCount += servitor.getSpiritShotsPerHit();
}
if (spiritshotCount > item.getCount())
{
activeChar.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_PET_SERVITOR);
return;
}
activeChar.addAutoSoulShot(_itemId);
activeChar.sendPacket(new ExAutoSoulShot(_itemId, _type));
}
// start the auto soulshot use
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED);
// Activate shots
activeChar.addAutoSoulShot(_itemId);
activeChar.sendPacket(new ExAutoSoulShot(_itemId, _type));
// Send message
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED);
sm.addItemName(item);
activeChar.sendPacket(sm);
activeChar.rechargeShots(true, true);
// Recharge summon's shots
final L2Summon pet = activeChar.getPet();
if (pet != null)
{
pet.rechargeShots(isSoulshot, isSpiritshot);
}
activeChar.getServitors().values().forEach(s ->
{
s.rechargeShots(isSoulshot, isSpiritshot);
});
}
else
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
}
}
else if (isPlayerShot(item.getItem()))
{
final boolean isSoulshot = (item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT) || (item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT);
final boolean isSpiritshot = item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT;
if ((activeChar.getActiveWeaponItem() == activeChar.getFistsWeaponItem()) || (item.getItem().getCrystalType() != activeChar.getActiveWeaponItem().getItemGradeSPlus()))
{
activeChar.sendPacket(isSoulshot ? SystemMessageId.YOUR_SPIRITSHOT_DOES_NOT_MATCH_THE_WEAPON_S_GRADE : SystemMessageId.THE_SOULSHOT_YOU_ARE_ATTEMPTING_TO_USE_DOES_NOT_MATCH_THE_GRADE_OF_YOUR_EQUIPPED_WEAPON);
return;
}
// Activate shots
activeChar.addAutoSoulShot(_itemId);
activeChar.sendPacket(new ExAutoSoulShot(_itemId, _type));
// Send message
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED);
sm.addItemName(item);
activeChar.sendPacket(sm);
// Recharge player's shots
activeChar.rechargeShots(isSoulshot, isSpiritshot);
}
}
else if (_type == 0)
{
// Cancel auto shots
activeChar.removeAutoSoulShot(_itemId);
activeChar.sendPacket(new ExAutoSoulShot(_itemId, _type));
// cancel the auto soulshot use
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
// Send message
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
sm.addItemName(item);
activeChar.sendPacket(sm);
}
}
}
@Override
public String getType()
{
return _C__D0_0D_REQUESTAUTOSOULSHOT;
}
@Override
protected boolean triggersOnActionRequest()
{
return false;
}
public static boolean isPlayerShot(L2Item item)
{
switch (item.getDefaultAction())
{
case SPIRITSHOT:
case SOULSHOT:
case FISHINGSHOT:
return true;
default:
return false;
}
}
public static boolean isSummonShot(L2Item item)
{
switch (item.getDefaultAction())
{
case SUMMON_SPIRITSHOT:
case SUMMON_SOULSHOT:
return true;
default:
return false;
}
}
@Override
public String getType()
{
return getClass().getSimpleName();
}
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBlock.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
import com.l2jserver.gameserver.model.BlockList;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java
View File

@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.BuyListData;
import com.l2jserver.gameserver.data.xml.impl.BuyListData;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;

19
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java
View File

@ -23,7 +23,7 @@ import java.util.logging.Level;
import com.l2jserver.Config;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.enums.InstanceType;
import com.l2jserver.gameserver.enums.PlayerAction;
import com.l2jserver.gameserver.handler.AdminCommandHandler;
@ -39,6 +39,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.Hero;
import com.l2jserver.gameserver.model.events.EventDispatcher;
import com.l2jserver.gameserver.model.events.impl.character.npc.OnNpcManorBypass;
import com.l2jserver.gameserver.model.events.impl.character.npc.OnNpcMenuSelect;
import com.l2jserver.gameserver.model.events.impl.character.player.OnPlayerBypass;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
@ -65,6 +66,7 @@ public final class RequestBypassToServer extends L2GameClientPacket
"_match",
"_diary",
"_olympiad?command",
"menu_select",
"manor_menu_select"
};
@ -143,14 +145,14 @@ public final class RequestBypassToServer extends L2GameClientPacket
return;
}
if (!AdminTable.getInstance().hasAccess(command, activeChar.getAccessLevel()))
if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
{
activeChar.sendMessage("You don't have the access rights to use this command!");
_log.warning("Character " + activeChar.getName() + " tried to use admin command " + command + ", without proper access level!");
return;
}
if (AdminTable.getInstance().requireConfirm(command))
if (AdminData.getInstance().requireConfirm(command))
{
activeChar.setAdminConfirmCmd(_command);
ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S13);
@ -260,6 +262,17 @@ public final class RequestBypassToServer extends L2GameClientPacket
handler.useBypass("arenachange " + (arenaId - 1), activeChar, null);
}
}
else if (_command.startsWith("menu_select"))
{
final L2Npc lastNpc = activeChar.getLastFolkNPC();
if ((lastNpc != null) && lastNpc.canInteract(activeChar))
{
final String[] split = _command.substring(_command.indexOf("?") + 1).split("&");
final int ask = Integer.parseInt(split[0].split("=")[1]);
final int reply = Integer.parseInt(split[1].split("=")[1]);
EventDispatcher.getInstance().notifyEventAsync(new OnNpcMenuSelect(activeChar, lastNpc, ask, reply), lastNpc);
}
}
else if (_command.startsWith("manor_menu_select"))
{
final L2Npc lastNpc = activeChar.getLastFolkNPC();

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAbilityPoint.java
View File

@ -19,7 +19,7 @@
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.AbilityPointsData;
import com.l2jserver.gameserver.data.xml.impl.AbilityPointsData;
import com.l2jserver.gameserver.enums.UserInfoType;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePetName.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.PetNameTable;
import com.l2jserver.gameserver.data.sql.impl.PetNameTable;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
@ -48,7 +48,7 @@ public final class RequestChangePetName extends L2GameClientPacket
return;
}
final L2Summon pet = activeChar.getSummon();
final L2Summon pet = activeChar.getPet();
if (pet == null)
{
return;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCharacterNameCreatable.java
View File

@ -19,7 +19,7 @@
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
import com.l2jserver.gameserver.network.serverpackets.ExIsCharNameCreatable;
import com.l2jserver.gameserver.util.Util;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.instancemanager.CastleManager;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java
View File

@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.ItemCrystalizationData;
import com.l2jserver.gameserver.data.xml.impl.ItemCrystalizationData;
import com.l2jserver.gameserver.enums.PrivateStoreType;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.CrystalizationData;

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDestroyItem.java
View File

@ -27,6 +27,7 @@ import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.enums.PrivateStoreType;
import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
import com.l2jserver.gameserver.model.PcCondOverride;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
@ -148,9 +149,10 @@ public final class RequestDestroyItem extends L2GameClientPacket
if (itemToRemove.getItem().isPetItem())
{
if (activeChar.hasSummon() && (activeChar.getSummon().getControlObjectId() == _objectId))
final L2Summon pet = activeChar.getPet();
if ((pet != null) && (pet.getControlObjectId() == _objectId))
{
activeChar.getSummon().unSummon(activeChar);
pet.unSummon(activeChar);
}
try (Connection con = L2DatabaseFactory.getInstance().getConnection();

11
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDispel.java
View File

@ -20,6 +20,7 @@ package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.skills.AbnormalType;
import com.l2jserver.gameserver.model.skills.Skill;
@ -78,9 +79,15 @@ public class RequestDispel extends L2GameClientPacket
}
else
{
if (activeChar.hasSummon() && (activeChar.getSummon().getObjectId() == _objectId))
final L2Summon pet = activeChar.getPet();
if ((pet != null) && (pet.getObjectId() == _objectId))
{
activeChar.getSummon().stopSkillEffects(true, _skillId);
pet.stopSkillEffects(true, _skillId);
}
if (activeChar.hasServitor(_objectId))
{
activeChar.removeServitor(_objectId);
}
}
}

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDropItem.java
View File

@ -19,7 +19,7 @@
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.enums.PrivateStoreType;
import com.l2jserver.gameserver.model.PcCondOverride;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@ -223,7 +223,7 @@ public final class RequestDropItem extends L2GameClientPacket
{
String msg = "Character (" + activeChar.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")";
_log.warning(msg);
AdminTable.getInstance().broadcastMessageToGMs(msg);
AdminData.getInstance().broadcastMessageToGMs(msg);
}
}

5
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@ -23,7 +23,7 @@ import java.util.logging.LogRecord;
import java.util.logging.Logger;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.EnchantItemData;
import com.l2jserver.gameserver.data.xml.impl.EnchantItemData;
import com.l2jserver.gameserver.enums.UserInfoType;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@ -36,6 +36,7 @@ import com.l2jserver.gameserver.model.skills.CommonSkill;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.EnchantResult;
import com.l2jserver.gameserver.network.serverpackets.ExAdenaInvenCount;
import com.l2jserver.gameserver.network.serverpackets.ExUserInfoInvenWeight;
import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
import com.l2jserver.gameserver.network.serverpackets.ItemList;
@ -430,7 +431,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
activeChar.broadcastUserInfo(UserInfoType.ENCHANTLEVEL);
activeChar.sendPacket(new ExUserInfoInvenWeight(activeChar));
activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
activeChar.sendPacket(new ExAdenaInvenCount(activeChar));
}
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordCheck.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.SecondaryAuthData;
import com.l2jserver.gameserver.data.xml.impl.SecondaryAuthData;
import com.l2jserver.gameserver.network.serverpackets.Ex2ndPasswordCheck;
/**

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.SecondaryAuthData;
import com.l2jserver.gameserver.data.xml.impl.SecondaryAuthData;
import com.l2jserver.gameserver.network.serverpackets.Ex2ndPasswordAck;
import com.l2jserver.gameserver.security.SecondaryPasswordAuth;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordVerify.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.SecondaryAuthData;
import com.l2jserver.gameserver.data.xml.impl.SecondaryAuthData;
/**
* Format: (ch)S S: numerical password

7
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java
View File

@ -18,13 +18,12 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.EnchantItemData;
import com.l2jserver.gameserver.data.xml.impl.EnchantItemData;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.enchant.EnchantScroll;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExPutEnchantScrollItemResult;
import com.l2jserver.gameserver.network.serverpackets.ExPutEnchantSupportItemResult;
/**
* @author Sdw
@ -61,7 +60,6 @@ public class RequestExAddEnchantScrollItem extends L2GameClientPacket
{
// message may be custom
activeChar.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
activeChar.setActiveEnchantSupportItemId(L2PcInstance.ID_NONE);
return;
}
@ -71,8 +69,7 @@ public class RequestExAddEnchantScrollItem extends L2GameClientPacket
{
// message may be custom
activeChar.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
activeChar.setActiveEnchantSupportItemId(L2PcInstance.ID_NONE);
activeChar.sendPacket(new ExPutEnchantSupportItemResult(0));
activeChar.sendPacket(new ExPutEnchantScrollItemResult(0));
return;
}
activeChar.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId));

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java
View File

@ -23,7 +23,7 @@ import java.util.logging.LogRecord;
import java.util.logging.Logger;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
import com.l2jserver.gameserver.model.L2EnchantSkillLearn;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.skills.Skill;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java
View File

@ -23,7 +23,7 @@ import java.util.logging.LogRecord;
import java.util.logging.Logger;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
import com.l2jserver.gameserver.model.L2EnchantSkillLearn;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java
View File

@ -23,7 +23,7 @@ import java.util.logging.LogRecord;
import java.util.logging.Logger;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
import com.l2jserver.gameserver.model.L2EnchantSkillLearn;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java
View File

@ -23,7 +23,7 @@ import java.util.logging.LogRecord;
import java.util.logging.Logger;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
import com.l2jserver.gameserver.model.L2EnchantSkillLearn;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.CrestTable;
import com.l2jserver.gameserver.data.sql.impl.CrestTable;
import com.l2jserver.gameserver.model.L2Crest;
import com.l2jserver.gameserver.network.serverpackets.ExPledgeEmblem;

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java
View File

@ -47,12 +47,14 @@ public class RequestExRemoveEnchantSupportItem extends L2GameClientPacket
activeChar.setActiveEnchantTimestamp(System.currentTimeMillis());
final L2ItemInstance supportItem = activeChar.getInventory().getItemByItemId(activeChar.getActiveEnchantSupportItemId());
final L2ItemInstance supportItem = activeChar.getInventory().getItemByObjectId(activeChar.getActiveEnchantSupportItemId());
if ((supportItem == null) || (supportItem.getCount() < 1))
{
activeChar.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET);
activeChar.setActiveEnchantSupportItemId(L2PcInstance.ID_NONE);
}
activeChar.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET);
}
@Override

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.CrestTable;
import com.l2jserver.gameserver.data.sql.impl.CrestTable;
import com.l2jserver.gameserver.model.ClanPrivilege;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2Crest;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.EnchantItemData;
import com.l2jserver.gameserver.data.xml.impl.EnchantItemData;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.enchant.EnchantScroll;
import com.l2jserver.gameserver.model.items.enchant.EnchantSupportItem;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
View File

@ -20,7 +20,7 @@ package com.l2jserver.gameserver.network.clientpackets;
import java.util.logging.Level;
import com.l2jserver.gameserver.datatables.EnchantItemData;
import com.l2jserver.gameserver.data.xml.impl.EnchantItemData;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.enchant.EnchantScroll;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGMCommand.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGetItemFromPet.java
View File

@ -60,7 +60,7 @@ public final class RequestGetItemFromPet extends L2GameClientPacket
return;
}
final L2PetInstance pet = (L2PetInstance) player.getSummon();
final L2PetInstance pet = (L2PetInstance) player.getPet();
if (player.getActiveEnchantItemId() != L2PcInstance.ID_NONE)
{
return;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGiveItemToPet.java
View File

@ -98,7 +98,7 @@ public final class RequestGiveItemToPet extends L2GameClientPacket
return;
}
final L2PetInstance pet = (L2PetInstance) player.getSummon();
final L2PetInstance pet = (L2PetInstance) player.getPet();
if (pet.isDead())
{
player.sendPacket(SystemMessageId.YOUR_PET_IS_DEAD_AND_ANY_ATTEMPT_YOU_MAKE_TO_GIVE_IT_SOMETHING_GOES_UNRECOGNIZED);

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGmList.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
/**
* This class handles RequestGmLista packet triggered by /gmlist command
@ -41,7 +41,7 @@ public final class RequestGmList extends L2GameClientPacket
{
return;
}
AdminTable.getInstance().sendListToPlayer(getClient().getActiveChar());
AdminData.getInstance().sendListToPlayer(getClient().getActiveChar());
}
@Override

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaEquip.java
View File

@ -19,7 +19,7 @@
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.HennaData;
import com.l2jserver.gameserver.data.xml.impl.HennaData;
import com.l2jserver.gameserver.model.PcCondOverride;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.L2Henna;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaItemInfo.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.HennaData;
import com.l2jserver.gameserver.data.xml.impl.HennaData;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.L2Henna;
import com.l2jserver.gameserver.network.serverpackets.HennaItemDrawInfo;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.HennaData;
import com.l2jserver.gameserver.data.xml.impl.HennaData;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.L2Henna;
import com.l2jserver.gameserver.network.serverpackets.HennaItemRemoveInfo;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestMagicSkillUse.java
View File

@ -20,8 +20,8 @@ package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.datatables.SkillTreesData;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.effects.L2EffectType;
import com.l2jserver.gameserver.model.skills.CommonSkill;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetGetItem.java
View File

@ -63,7 +63,7 @@ public final class RequestPetGetItem extends L2GameClientPacket
return;
}
final L2PetInstance pet = (L2PetInstance) getClient().getActiveChar().getSummon();
final L2PetInstance pet = (L2PetInstance) getClient().getActiveChar().getPet();
if (pet.isDead() || pet.isOutOfControl())
{
sendPacket(ActionFailed.STATIC_PACKET);

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetUseItem.java
View File

@ -56,7 +56,7 @@ public final class RequestPetUseItem extends L2GameClientPacket
return;
}
final L2PetInstance pet = (L2PetInstance) activeChar.getSummon();
final L2PetInstance pet = (L2PetInstance) activeChar.getPet();
final L2ItemInstance item = pet.getInventory().getItemByObjectId(_objectId);
if (item == null)
{

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetition.java
View File

@ -19,7 +19,7 @@
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.instancemanager.PetitionManager;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
@ -58,7 +58,7 @@ public final class RequestPetition extends L2GameClientPacket
return;
}
if (!AdminTable.getInstance().isGmOnline(false))
if (!AdminData.getInstance().isGmOnline(false))
{
activeChar.sendPacket(SystemMessageId.THERE_ARE_NO_GMS_CURRENTLY_VISIBLE_IN_THE_PUBLIC_LIST_AS_THEY_MAY_BE_PERFORMING_OTHER_FUNCTIONS_AT_THE_MOMENT);
return;

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionCancel.java
View File

@ -19,7 +19,7 @@
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.instancemanager.PetitionManager;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
@ -81,7 +81,7 @@ public final class RequestPetitionCancel extends L2GameClientPacket
// Notify all GMs that the player's pending petition has been cancelled.
String msgContent = activeChar.getName() + " has canceled a pending petition.";
AdminTable.getInstance().broadcastToGMs(new CreatureSay(activeChar.getObjectId(), Say2.HERO_VOICE, "Petition System", msgContent));
AdminData.getInstance().broadcastToGMs(new CreatureSay(activeChar.getObjectId(), Say2.HERO_VOICE, "Petition System", msgContent));
}
else
{

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeInfo.java
View File

@ -21,7 +21,7 @@ package com.l2jserver.gameserver.network.clientpackets;
import java.util.logging.Level;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.PledgeInfo;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.ExPledgeRecruitInfo;

5
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.enums.ClanEntryStatus;
import com.l2jserver.gameserver.instancemanager.ClanEntryManager;
import com.l2jserver.gameserver.model.L2Clan;
@ -81,10 +81,9 @@ public class RequestPledgeWaitingApply extends L2GameClientPacket
}
else
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_AFTER_S1_MINUTE_S_DUE_TO_CANCELLING_YOUR_APPLICATION);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_AFTER_S1_MINUTE_S_DUE_TO_CANCELLING_YOUR_APPLICATION);
sm.addLong(ClanEntryManager.getInstance().getPlayerLockTime(activeChar.getObjectId()));
activeChar.sendPacket(sm);
System.out.println("fuck me ?");
}
}

5
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPreviewItem.java
View File

@ -25,7 +25,7 @@ import javolution.util.FastMap;
import com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.BuyListData;
import com.l2jserver.gameserver.data.xml.impl.BuyListData;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
@ -161,8 +161,7 @@ public final class RequestPreviewItem extends L2GameClientPacket
final L2BuyList buyList = BuyListData.getInstance().getBuyList(_listId);
if (buyList == null)
{
Util.handleIllegalPlayerAction(activeChar, "Warning!! Character " + activeChar.getName() + " of account " + activeChar
.getAccountName() + " sent a false BuyList list_id " + _listId, Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(activeChar, "Warning!! Character " + activeChar.getName() + " of account " + activeChar.getAccountName() + " sent a false BuyList list_id " + _listId, Config.DEFAULT_PUNISH);
return;
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
View File

@ -22,7 +22,7 @@ import static com.l2jserver.gameserver.model.actor.L2Npc.INTERACTION_DISTANCE;
import javolution.util.FastSet;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.OfflineTradersTable;
import com.l2jserver.gameserver.data.sql.impl.OfflineTradersTable;
import com.l2jserver.gameserver.enums.PrivateStoreType;
import com.l2jserver.gameserver.model.ItemRequest;
import com.l2jserver.gameserver.model.L2Object;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreSell.java
View File

@ -21,7 +21,7 @@ package com.l2jserver.gameserver.network.clientpackets;
import static com.l2jserver.gameserver.model.actor.L2Npc.INTERACTION_DISTANCE;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.OfflineTradersTable;
import com.l2jserver.gameserver.data.sql.impl.OfflineTradersTable;
import com.l2jserver.gameserver.enums.PrivateStoreType;
import com.l2jserver.gameserver.model.ItemRequest;
import com.l2jserver.gameserver.model.L2World;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeBookDestroy.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.RecipeData;
import com.l2jserver.gameserver.data.xml.impl.RecipeData;
import com.l2jserver.gameserver.model.L2RecipeList;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.RecipeBookItemList;

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopListSet.java
View File

@ -24,7 +24,7 @@ import java.util.Arrays;
import java.util.List;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.RecipeData;
import com.l2jserver.gameserver.data.xml.impl.RecipeData;
import com.l2jserver.gameserver.enums.PrivateStoreType;
import com.l2jserver.gameserver.model.L2ManufactureItem;
import com.l2jserver.gameserver.model.L2RecipeList;
@ -101,12 +101,6 @@ public final class RequestRecipeShopListSet extends L2GameClientPacket
return;
}
if (!player.canOpenPrivateStore())
{
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
List<L2RecipeList> dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook());
List<L2RecipeList> commonRecipes = Arrays.asList(player.getCommonRecipeBook());

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRefundItem.java
View File

@ -21,7 +21,7 @@ package com.l2jserver.gameserver.network.clientpackets;
import static com.l2jserver.gameserver.model.actor.L2Npc.INTERACTION_DISTANCE;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.BuyListData;
import com.l2jserver.gameserver.data.xml.impl.BuyListData;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRegistBeauty.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.BeautyShopData;
import com.l2jserver.gameserver.data.xml.impl.BeautyShopData;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.beautyshop.BeautyData;
import com.l2jserver.gameserver.model.beautyshop.BeautyItem;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
public final class RequestReplySurrenderPledgeWar extends L2GameClientPacket

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestResetAbilityPoint.java
View File

@ -19,7 +19,7 @@
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.SkillTreesData;
import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
import com.l2jserver.gameserver.enums.PrivateStoreType;
import com.l2jserver.gameserver.model.L2SkillLearn;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveKeyMapping.java
View File

@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.UIData;
import com.l2jserver.gameserver.data.xml.impl.UIData;
import com.l2jserver.gameserver.model.ActionKey;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.L2GameClient.GameClientState;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSellItem.java
View File

@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.BuyListData;
import com.l2jserver.gameserver.data.xml.impl.BuyListData;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSendPost.java
View File

@ -22,8 +22,8 @@ import static com.l2jserver.gameserver.model.itemcontainer.Inventory.ADENA_ID;
import static com.l2jserver.gameserver.model.itemcontainer.Inventory.MAX_ADENA;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.enums.PrivateStoreType;
import com.l2jserver.gameserver.instancemanager.MailManager;
import com.l2jserver.gameserver.model.BlockList;
@ -213,7 +213,7 @@ public final class RequestSendPost extends L2GameClientPacket
}
final int level = CharNameTable.getInstance().getAccessLevelById(receiverId);
final L2AccessLevel accessLevel = AdminTable.getInstance().getAccessLevel(level);
final L2AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(level);
if (accessLevel.isGm() && !activeChar.getAccessLevel().isGm())
{

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSetAllyCrest.java
View File

@ -18,8 +18,8 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.datatables.CrestTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.CrestTable;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2Crest;
import com.l2jserver.gameserver.model.L2Crest.CrestType;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSetPledgeCrest.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.CrestTable;
import com.l2jserver.gameserver.data.sql.impl.CrestTable;
import com.l2jserver.gameserver.model.ClanPrivilege;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2Crest;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestShowResetShopList.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.BeautyShopData;
import com.l2jserver.gameserver.data.xml.impl.BeautyShopData;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.beautyshop.BeautyData;
import com.l2jserver.gameserver.model.beautyshop.BeautyItem;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@ -19,7 +19,7 @@
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.model.ClanPrivilege;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.model.ClanPrivilege;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2ClanMember;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/SendBypassBuildCmd.java
View File

@ -19,7 +19,7 @@
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.handler.AdminCommandHandler;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@ -72,7 +72,7 @@ public final class SendBypassBuildCmd extends L2GameClientPacket
return;
}
if (!AdminTable.getInstance().hasAccess(command, activeChar.getAccessLevel()))
if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
{
activeChar.sendMessage("You don't have the access right to use this command!");
_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!");

11
trunk/java/com/l2jserver/gameserver/network/clientpackets/ValidatePosition.java
View File

@ -19,7 +19,6 @@
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.geoeditorcon.GeoEditorListener;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.zone.ZoneId;
@ -130,14 +129,6 @@ public class ValidatePosition extends L2GameClientPacket
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar));
// }
if (Config.ACCEPT_GEOEDITOR_CONN)
{
if ((GeoEditorListener.getInstance().getThread() != null) && GeoEditorListener.getInstance().getThread().isWorking() && GeoEditorListener.getInstance().getThread().isSend(activeChar))
{
GeoEditorListener.getInstance().getThread().sendGmPosition(_x, _y, (short) _z);
}
}
// Don't allow flying transformations outside gracia area!
if (activeChar.isFlyingMounted() && (_x > L2World.GRACIA_MAX_X))
{
@ -187,7 +178,7 @@ public class ValidatePosition extends L2GameClientPacket
// when too far from server calculated true coordinate.
// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
// Important: this code part must work together with L2Character.updatePosition
if ((Config.GEODATA > 0) && ((diffSq > 250000) || (Math.abs(dz) > 200)))
if ((diffSq > 250000) || (Math.abs(dz) > 200))
{
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
View File

@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.ItemCrystalizationData;
import com.l2jserver.gameserver.data.xml.impl.ItemCrystalizationData;
import com.l2jserver.gameserver.enums.PrivateStoreType;
import com.l2jserver.gameserver.model.CrystalizationData;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestFriendDel.java
View File

@ -23,7 +23,7 @@ import java.sql.PreparedStatement;
import java.util.logging.Level;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestFriendList.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets.friend;
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/mentoring/RequestMentorCancel.java
View File

@ -19,7 +19,7 @@
package com.l2jserver.gameserver.network.clientpackets.mentoring;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
import com.l2jserver.gameserver.instancemanager.MentorManager;
import com.l2jserver.gameserver.model.L2Mentee;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;