diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java
index a4fffa9e48cc09e7e96af814c07fb11b94b6f077..210a80a9b91d5d1fbff4fe3578dd211efa6127db 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExCubeGameChangeTimeToStart;
import com.l2jserver.gameserver.network.serverpackets.ExCubeGameRequestReady;
import com.l2jserver.gameserver.network.serverpackets.ExCubeGameTeamList;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* @authors BiggBoss, Gigiikun
@@ -67,12 +66,12 @@ public class HandysBlockCheckerEvent extends Quest
{
if (eventIsFull(arena))
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_REGISTER_CAUSE_QUEUE_FULL));
+ player.sendPacket(SystemMessageId.CANNOT_REGISTER_CAUSE_QUEUE_FULL);
return null;
}
if (HandysBlockCheckerManager.getInstance().arenaIsBeingUsed(arena))
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.MATCH_BEING_PREPARED_TRY_LATER));
+ player.sendPacket(SystemMessageId.MATCH_BEING_PREPARED_TRY_LATER);
return null;
}
if(HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
index 9dbb515d6cbba8c8aa57a9a9e22f6484b301c836..f44438cd5ccccea224944ac4283660022061cffd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
@@ -29,11 +29,9 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2TamedBeastInstance;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo;
import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.SkillHolder;
import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
import com.l2jserver.gameserver.util.Util;
@@ -419,7 +417,7 @@ public class BeastFarm extends L2AttackableAIScript
}
else
{
- caster.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1).addString("The beast spit out the feed instead of eating it."));
+ caster.sendMessage("The beast spit out the feed instead of eating it.");
((L2Attackable) npc).dropItem(caster, food, 1);
}
return super.onSkillSee(npc, caster, skill, targets, isPet);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EnergySeeds.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EnergySeeds.java
index f199b025161f3d13d8018c4fc6cc2b4017832fd3..90e6971dc530fdc3d54483905bc96b6c1dbc1753 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EnergySeeds.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EnergySeeds.java
@@ -38,7 +38,6 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.zone.L2ZoneType;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
import com.l2jserver.gameserver.util.Util;
import com.l2jserver.util.Rnd;
@@ -184,12 +183,12 @@ public class EnergySeeds extends L2AttackableAIScript
}
if (Rnd.get(100) < 33)
{
- caster.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_COLLECTION_HAS_SUCCEEDED));
+ caster.sendPacket(SystemMessageId.THE_COLLECTION_HAS_SUCCEEDED);
caster.addItem("EnergySeed", itemId, Rnd.get(RATE + 1, 2 * RATE), null, true);
}
else
{
- caster.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_COLLECTION_HAS_SUCCEEDED));
+ caster.sendPacket(SystemMessageId.THE_COLLECTION_HAS_SUCCEEDED);
caster.addItem("EnergySeed", itemId, Rnd.get(1, RATE), null, true);
}
seedCollectEvent(caster, npc, spawn._seedId);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DecoyAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DecoyAction.java
index 586c3e25146fc625d26a2df0d07bf5bb3992c84a..63bc101a8d2276ff52efee362c21c47e8f29cc5c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DecoyAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DecoyAction.java
@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
public class L2DecoyAction implements IActionHandler
{
@@ -30,7 +29,7 @@ public class L2DecoyAction implements IActionHandler
// Aggression target lock effect
if (activeChar.isLockedTarget() && activeChar.getLockedTarget() != target)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FAILED_CHANGE_TARGET));
+ activeChar.sendPacket(SystemMessageId.FAILED_CHANGE_TARGET);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java
index e6d4da04a8cc15b05fd0629da4d7ad0b1ff0e0ae..b2636959dad8f5e0f580809583f33aa44006fdfa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java
@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.model.entity.TvTEvent;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
public class L2PcInstanceAction implements IActionHandler
@@ -63,7 +62,7 @@ public class L2PcInstanceAction implements IActionHandler
// Aggression target lock effect
if (activeChar.isLockedTarget() && activeChar.getLockedTarget() != target)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FAILED_CHANGE_TARGET));
+ activeChar.sendPacket(SystemMessageId.FAILED_CHANGE_TARGET);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java
index a803f1e08e4c82e596356b6e31720183252e3871..3b5512895e85a9dd920b13e394b4e7b39a6616c1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java
@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
import com.l2jserver.gameserver.network.serverpackets.PetStatusShow;
import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
public class L2PetInstanceAction implements IActionHandler
@@ -37,7 +36,7 @@ public class L2PetInstanceAction implements IActionHandler
// Aggression target lock effect
if (activeChar.isLockedTarget() && activeChar.getLockedTarget() != target)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FAILED_CHANGE_TARGET));
+ activeChar.sendPacket(SystemMessageId.FAILED_CHANGE_TARGET);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java
index 2765188b527585b5a636304ee0cb9c447b362546..fdafe79570b9ef6b5a0832496b67cb51caf8af29 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java
@@ -28,7 +28,6 @@ import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
import com.l2jserver.gameserver.network.serverpackets.PetStatusShow;
import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
public class L2SummonAction implements IActionHandler
@@ -38,7 +37,7 @@ public class L2SummonAction implements IActionHandler
// Aggression target lock effect
if (activeChar.isLockedTarget() && activeChar.getLockedTarget() != target)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FAILED_CHANGE_TARGET));
+ activeChar.sendPacket(SystemMessageId.FAILED_CHANGE_TARGET);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2TrapAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2TrapAction.java
index fd7453c2fdfcde6b6176017abdf1ce335374bbe6..b680139f734031a81f3cb1748f07627cb975704a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2TrapAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2TrapAction.java
@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
public class L2TrapAction implements IActionHandler
{
@@ -30,7 +29,7 @@ public class L2TrapAction implements IActionHandler
// Aggression target lock effect
if (activeChar.isLockedTarget() && activeChar.getLockedTarget() != target)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FAILED_CHANGE_TARGET));
+ activeChar.sendPacket(SystemMessageId.FAILED_CHANGE_TARGET);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index 1c1bee96ea6cb039fcf4d08df65801188cb278e7..7e467d8aa3cb5ae5a32043165aee23dc6e4136ac 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -40,7 +40,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.olympiad.Olympiad;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
@@ -117,12 +116,12 @@ public class AdminAdmin implements IAdminCommandHandler
if (activeChar.isSilenceMode()) // already in message refusal mode
{
activeChar.setSilenceMode(false);
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.MESSAGE_ACCEPTANCE_MODE));
+ activeChar.sendPacket(SystemMessageId.MESSAGE_ACCEPTANCE_MODE);
}
else
{
activeChar.setSilenceMode(true);
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.MESSAGE_REFUSAL_MODE));
+ activeChar.sendPacket(SystemMessageId.MESSAGE_REFUSAL_MODE);
}
AdminHelpPage.showHelpPage(activeChar,"gm_menu.htm");
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBan.java
index 74e113eef75f42d3fd24bfcb2517233e243cfe76..4974206adee628143d86da91fade03c6d2ed8e37 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBan.java
@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.GMAudit;
@@ -96,7 +95,7 @@ public class AdminBan implements IAdminCommandHandler {
if (targetPlayer != null && targetPlayer.equals(activeChar))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_USE_ON_YOURSELF));
+ activeChar.sendPacket(SystemMessageId.CANNOT_USE_ON_YOURSELF);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java
index 0f21cacbc2de7490a8a6851ac7de653721b3dfdb..14f92f5e9ff73403cf3fa2beee40b8ab1756b081 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
@@ -72,7 +71,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler
if (activeChar.getTarget() instanceof L2PcInstance)
onLineChange(activeChar, (L2PcInstance) activeChar.getTarget(), lvl);
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
catch (Exception e)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
index 51bb20cadd91068a027f76e4ba0caef364bf4670..80c9e6d82a2aa5e133c977e8f610f7b480ea8013 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.util.StringUtil;
@@ -86,7 +85,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler
{
activeChar.sendMessage(" Don't exist in the world.");
}
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FRIEND_LIST_FOOTER));
+ activeChar.sendPacket(SystemMessageId.FRIEND_LIST_FOOTER);
}
}
else
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index f5a158e48bb1519c82944176a7cb4561ba1507b3..c2acb07ab6de2a42760db02dfcd141b8f2e56c1f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -143,7 +143,7 @@ public class AdminEditChar implements IAdminCommandHandler
else if (activeChar.getTarget() instanceof L2PcInstance)
showCharacterInfo(activeChar, activeChar.getTarget().getActingPlayer());
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
else if (command.startsWith("admin_character_list"))
{
@@ -210,7 +210,7 @@ public class AdminEditChar implements IAdminCommandHandler
else if (activeChar.getTarget() instanceof L2PcInstance)
editCharacter(activeChar, null);
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
// Karma control commands
else if (command.equals("admin_nokarma"))
@@ -248,7 +248,7 @@ public class AdminEditChar implements IAdminCommandHandler
activeChar.sendMessage(player.getName()+"'s PK count changed to "+pk);
}
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
catch (Exception e)
{
@@ -275,7 +275,7 @@ public class AdminEditChar implements IAdminCommandHandler
activeChar.sendMessage(player.getName()+"'s PVP count changed to "+pvp);
}
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
catch (Exception e)
{
@@ -302,7 +302,7 @@ public class AdminEditChar implements IAdminCommandHandler
activeChar.sendMessage(player.getName()+"'s Fame changed to "+fame);
}
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
catch (Exception e)
{
@@ -343,7 +343,7 @@ public class AdminEditChar implements IAdminCommandHandler
activeChar.sendMessage(player.getName()+"'s Recommend changed to "+recVal);
}
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
catch (Exception e)
{
@@ -536,7 +536,7 @@ public class AdminEditChar implements IAdminCommandHandler
targetPet.sendPacket(new SetSummonRemainTime(targetPet.getMaxFed(), targetPet.getCurrentFed()));
}
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
else if(command.startsWith("admin_remove_clan_penalty"))
{
@@ -637,7 +637,7 @@ public class AdminEditChar implements IAdminCommandHandler
if (pl == null)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return false;
}
@@ -961,7 +961,9 @@ public class AdminEditChar implements IAdminCommandHandler
// update karma
player.setKarma(newKarma);
//Common character information
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_KARMA_HAS_BEEN_CHANGED_TO_S1).addString(String.valueOf(newKarma)));
+ SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_KARMA_HAS_BEEN_CHANGED_TO_S1);
+ sm.addNumber(newKarma);
+ player.sendPacket(sm);
//Admin information
activeChar.sendMessage("Successfully Changed karma for " + player.getName() + " from (" + oldKarma + ") to (" + newKarma + ").");
if (Config.DEBUG)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index f154942f7930ba6f5c2d4f97e73a069cca2f0aec..a8ad77bfb4f96ab351593fb3bc8a3e4ad3f37d0b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -338,7 +338,9 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.stopSkillEffects(7029);
if (val == 0 && sendMessage)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.EFFECT_S1_DISAPPEARED).addSkillName(7029));
+ final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EFFECT_S1_DISAPPEARED);
+ sm.addSkillName(7029);
+ activeChar.sendPacket(sm);
}
else if ((val >= 1) && (val <= 4))
{
@@ -499,7 +501,7 @@ public class AdminEffects implements IAdminCommandHandler
if (performSocial(social, obj, activeChar))
activeChar.sendMessage(obj.getName() + " was affected by your request.");
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOTHING_HAPPENED));
+ activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
}
else if (!command.contains("menu"))
activeChar.sendMessage("Usage: //social <social_id> [player_name|radius]");
@@ -529,7 +531,7 @@ public class AdminEffects implements IAdminCommandHandler
if (performAbnormal(abnormal, player))
activeChar.sendMessage(player.getName() + "'s abnormal status was affected by your request.");
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOTHING_HAPPENED));
+ activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
}
else
{
@@ -563,7 +565,7 @@ public class AdminEffects implements IAdminCommandHandler
if (performAbnormal(abnormal, obj))
activeChar.sendMessage(obj.getName() + "'s abnormal status was affected by your request.");
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOTHING_HAPPENED));
+ activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
}
else if (!command.contains("menu"))
activeChar.sendMessage("Usage: //abnormal <abnormal_mask> [player_name|radius]");
@@ -593,7 +595,7 @@ public class AdminEffects implements IAdminCommandHandler
if (performSpecial(special, player))
activeChar.sendMessage(player.getName() + "'s special status was affected by your request.");
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOTHING_HAPPENED));
+ activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
}
else
{
@@ -626,7 +628,7 @@ public class AdminEffects implements IAdminCommandHandler
if (performSpecial(special, obj))
activeChar.sendMessage(obj.getName() + "'s special status was affected by your request.");
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOTHING_HAPPENED));
+ activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
}
else if (!command.contains("menu"))
activeChar.sendMessage("Usage: //special <special_mask> [player_name|radius]");
@@ -651,7 +653,7 @@ public class AdminEffects implements IAdminCommandHandler
if (obj == null)
obj = activeChar;
if (!(obj instanceof L2Character))
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
else
{
L2Character target = (L2Character) obj;
@@ -733,17 +735,17 @@ public class AdminEffects implements IAdminCommandHandler
{
if (target instanceof L2ChestInstance)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOTHING_HAPPENED));
+ activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
return false;
}
if ((target instanceof L2Npc) && (action < 1 || action > 3))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOTHING_HAPPENED));
+ activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
return false;
}
if ((target instanceof L2PcInstance) && (action < 2 || action > 18 && action != SocialAction.LEVEL_UP))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOTHING_HAPPENED));
+ activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
return false;
}
L2Character character = (L2Character) target;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java
index 31cdf4f387207deef2266762e5d784f500667dad..566dd65b1e79426843b072e73dc1d7afa56dd19e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java
@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* This class handles following admin commands: - delete = deletes target
@@ -109,7 +108,7 @@ public class AdminElement implements IAdminCommandHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java
index 7651a3d99d5dd647fbf95eb8fe04c2ff14224081..1a8515ff0765389e67646ea701bdaa197aece944 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java
@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.CharInfo;
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
@@ -147,7 +146,7 @@ public class AdminEnchant implements IAdminCommandHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
index 167366bba815b26a536af7293f499744e7591621..cfc304025fac291df69409d4ebd27595ba2ff3bc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
@@ -23,8 +23,6 @@ import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-
/**
* This class handles following admin commands:
@@ -89,7 +87,7 @@ public class AdminExpSp implements IAdminCommandHandler
player = (L2PcInstance) target;
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
@@ -112,7 +110,7 @@ public class AdminExpSp implements IAdminCommandHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return false;
}
StringTokenizer st = new StringTokenizer(ExpSp);
@@ -159,7 +157,7 @@ public class AdminExpSp implements IAdminCommandHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return false;
}
StringTokenizer st = new StringTokenizer(ExpSp);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 5b778891e1b98e7b4ff7b532e12f6c311c54bcea..23d08754da2f1a888dbabc3e7189a7414757f3f8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.Formulas;
import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
import com.l2jserver.util.StringUtil;
@@ -225,7 +224,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
npc2 = (L2Character) activeChar.getTarget();
if (npc2 == null)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index 534674ace8dc498eeb1dd2a1b11210295059d13b..0accc3bdbc63a249f6c264edfaad48809300f458 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.Fort;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.util.StringUtil;
@@ -79,7 +78,7 @@ public class AdminFortSiege implements IAdminCommandHandler
if (command.equalsIgnoreCase("admin_add_fortattacker"))
{
if (player == null)
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
else
{
if (fort.getSiege().checkIfCanRegister(player))
@@ -101,7 +100,7 @@ public class AdminFortSiege implements IAdminCommandHandler
else if (command.equalsIgnoreCase("admin_setfort"))
{
if (player == null || player.getClan() == null)
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
else
fort.setOwner(player.getClan(), false);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java
index c541f78d26674695dcb0a29448d8955365b786a0..5255e8b3537a68bd7550bc1efe014a8d68381905 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java
@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* This class handles following admin commands:
@@ -68,12 +67,12 @@ public class AdminGmChat implements IAdminCommandHandler
if (target == null)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SELECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.SELECT_TARGET);
return;
}
if (!(target instanceof L2PcInstance))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
L2PcInstance player = (L2PcInstance) target;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java
index 166b8842098081898d5b4b58b210b8c99d37a295..6c66420a03b241bd55b330de48b92b20afea324c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
@@ -123,6 +122,6 @@ public class AdminHeal implements IAdminCommandHandler
_log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") healed character " + target.getName());
}
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java
index 36ddee7c80c355576423f115860fde7ddaaa6527..1d7074c52fdcbf40f8801566aa26b782c3b15602 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java
@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2ControllableMobInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* This class handles following admin commands:
@@ -113,7 +112,7 @@ public class AdminKill implements IAdminCommandHandler
{
L2Object obj = activeChar.getTarget();
if (obj instanceof L2ControllableMobInstance || !(obj instanceof L2Character))
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
else
kill(activeChar, (L2Character) obj);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java
index 2cb9282e6f249b95dcf77895fb46853adec0deee..19b96c6c712bd8fb0120ee73447659cdc2843f49 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java
@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
public class AdminLevel implements IAdminCommandHandler
@@ -67,7 +66,7 @@ public class AdminLevel implements IAdminCommandHandler
{
if (!(targetChar instanceof L2PcInstance))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT)); // incorrect target!
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); // incorrect target!
return false;
}
L2PcInstance targetPlayer = (L2PcInstance) targetChar;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
index 11570d8282f5a9f1897ba8bb026c1d3a06a95ca8..7ff398aeb438c107743454d2b9581449533cfdb6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
@@ -28,7 +28,6 @@ import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
@@ -93,7 +92,7 @@ public class AdminMenu implements IAdminCommandHandler
L2PcInstance player = L2World.getInstance().getPlayer(targetName);
if (player == null)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return true;
}
if (!player.isInParty())
@@ -119,7 +118,7 @@ public class AdminMenu implements IAdminCommandHandler
L2PcInstance player = L2World.getInstance().getPlayer(targetName);
if (player == null)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return true;
}
L2Clan clan = player.getClan();
@@ -249,7 +248,7 @@ public class AdminMenu implements IAdminCommandHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
AdminHelpPage.showHelpPage(activeChar, filename);
}
@@ -271,11 +270,11 @@ public class AdminMenu implements IAdminCommandHandler
player = (L2PcInstance) target;
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
if (player.getObjectId() == activeChar.getObjectId())
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_USE_ON_YOURSELF));
+ player.sendPacket(SystemMessageId.CANNOT_USE_ON_YOURSELF);
else
{
activeChar.setInstanceId(player.getInstanceId());
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java
index cca4cb1e7966a2681d2d931ef817933ca14d4742..faa076f1d919c91e95b24607c4156f726d750c55 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jserver.gameserver.network.serverpackets.SetupGauge;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
import com.l2jserver.gameserver.util.Broadcast;
@@ -564,7 +563,7 @@ public class AdminMobGroup implements IAdminCommandHandler
for (MobGroup mobGroup : mobGroupList)
activeChar.sendMessage(mobGroup.getGroupId() + ": " + mobGroup.getActiveMobCount() + " alive out of " + mobGroup.getMaxMobCount() + " of NPC ID " + mobGroup.getTemplate().getNpcId() + " (" + mobGroup.getStatus() + ")");
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FRIEND_LIST_FOOTER));
+ activeChar.sendPacket(SystemMessageId.FRIEND_LIST_FOOTER);
}
public String[] getAdminCommandList()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java
index f3345e0ed481642f14b93a45e613a302c99ba08c..9520fa7e5eae660b751119f2cf906570a7a68eef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java
@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.instancemanager.PetitionManager;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* This class handles commands for GMs to respond to petitions.
@@ -59,30 +58,30 @@ public class AdminPetition implements IAdminCommandHandler
{
if (PetitionManager.getInstance().isPlayerInConsultation(activeChar))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_ONE_ACTIVE_PETITION_AT_TIME));
+ activeChar.sendPacket(SystemMessageId.ONLY_ONE_ACTIVE_PETITION_AT_TIME);
return true;
}
if (PetitionManager.getInstance().isPetitionInProcess(petitionId))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PETITION_UNDER_PROCESS));
+ activeChar.sendPacket(SystemMessageId.PETITION_UNDER_PROCESS);
return true;
}
if (!PetitionManager.getInstance().acceptPetition(activeChar, petitionId))
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_UNDER_PETITION_CONSULTATION));
+ activeChar.sendPacket(SystemMessageId.NOT_UNDER_PETITION_CONSULTATION);
}
else if (command.startsWith("admin_reject_petition"))
{
if (!PetitionManager.getInstance().rejectPetition(activeChar, petitionId))
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FAILED_CANCEL_PETITION_TRY_LATER));
+ activeChar.sendPacket(SystemMessageId.FAILED_CANCEL_PETITION_TRY_LATER);
PetitionManager.getInstance().sendPendingPetitionList(activeChar);
}
else if (command.equals("admin_reset_petitions"))
{
if (PetitionManager.getInstance().isPetitionInProcess())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PETITION_UNDER_PROCESS));
+ activeChar.sendPacket(SystemMessageId.PETITION_UNDER_PROCESS);
return false;
}
PetitionManager.getInstance().clearPendingPetitions();
@@ -95,7 +94,7 @@ public class AdminPetition implements IAdminCommandHandler
L2Object targetChar = activeChar.getTarget();
if (targetChar == null || !(targetChar instanceof L2PcInstance))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return false;
}
L2PcInstance targetPlayer = (L2PcInstance) targetChar;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index da57c4b3b8b6e0ae627207015ba3b93025217a1b..f88947d32be0988c9f864b71f603130558824307 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
@@ -52,7 +52,7 @@ public class AdminPledge implements IAdminCommandHandler
player = (L2PcInstance) target;
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
showMainPage(activeChar);
return false;
}
@@ -86,7 +86,9 @@ public class AdminPledge implements IAdminCommandHandler
}
else if (!player.isClanLeader())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER).addString(name));
+ SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER);
+ sm.addString(name);
+ activeChar.sendPacket(sm);
showMainPage(activeChar);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
index 597d561d24c4c3580e2bfef2dd2d31ec38bf9876..c2a85d43fbedaa6bd1612433949a1f0e5bd6adc7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jserver.gameserver.network.serverpackets.SetupGauge;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
@@ -63,7 +62,7 @@ public class AdminPolymorph implements IAdminCommandHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
}
else if (command.startsWith("admin_transform"))
@@ -98,7 +97,7 @@ public class AdminPolymorph implements IAdminCommandHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
}
if (command.startsWith("admin_polymorph"))
@@ -165,7 +164,7 @@ public class AdminPolymorph implements IAdminCommandHandler
activeChar.sendMessage("Polymorph succeed");
}
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
/**
@@ -182,7 +181,7 @@ public class AdminPolymorph implements IAdminCommandHandler
activeChar.sendMessage("Unpolymorph succeed");
}
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
private void showMainPage(L2PcInstance activeChar, String command)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java
index 37de8595585c24bacafeb4baac2d2aaf8f4803c2..34b8166cdf0886a235fa58cbe75c44708f2c6209 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2ControllableMobInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
@@ -106,7 +105,7 @@ public class AdminRes implements IAdminCommandHandler
if (obj instanceof L2ControllableMobInstance)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
@@ -148,7 +147,7 @@ public class AdminRes implements IAdminCommandHandler
if (obj instanceof L2PcInstance || obj instanceof L2ControllableMobInstance)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java
index 252c11d731897d3b5308c0f7abdef97e54718617..992631573f7ba0a3e549a457aaa02617193d29af 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java
@@ -34,7 +34,6 @@ import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExShowQuestMark;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.QuestList;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* @author Korvin
@@ -85,7 +84,7 @@ public class AdminShowQuests implements IAdminCommandHandler
if (target == null)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
index a3e15ad1225e9485c6b1cdb6479becf0bd494566..8ad8fe36ca5e826069793b63a5ede07ca8c99c48 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
@@ -33,7 +33,6 @@ import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
import com.l2jserver.gameserver.model.zone.type.L2ClanHallZone;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.util.StringUtil;
@@ -104,14 +103,14 @@ public class AdminSiege implements IAdminCommandHandler
if (command.equalsIgnoreCase("admin_add_attacker"))
{
if (player == null)
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
else
castle.getSiege().registerAttacker(player, true);
}
else if (command.equalsIgnoreCase("admin_add_defender"))
{
if (player == null)
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
else
castle.getSiege().registerDefender(player, true);
}
@@ -147,7 +146,7 @@ public class AdminSiege implements IAdminCommandHandler
else if (command.equalsIgnoreCase("admin_setcastle"))
{
if (player == null || player.getClan() == null)
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
else
castle.setOwner(player.getClan());
}
@@ -187,7 +186,7 @@ public class AdminSiege implements IAdminCommandHandler
else if (command.equalsIgnoreCase("admin_clanhallset"))
{
if (player == null || player.getClan() == null)
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
else if (clanhall.getOwnerId() > 0)
activeChar.sendMessage("This ClanHall isn't free!");
else if (player.getClan().getHasHideout() == 0)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 1150bc23ec5b2ca38b5fd7a3efe74999659e26ea..9bb3951b9259ed2ebfa0ff0c8bd4093fd8a22e32 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -195,7 +195,7 @@ public class AdminSkill implements IAdminCommandHandler
player = (L2PcInstance) target;
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
//Notify player and admin
@@ -216,7 +216,7 @@ public class AdminSkill implements IAdminCommandHandler
player = (L2PcInstance) target;
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return;
}
@@ -314,7 +314,7 @@ public class AdminSkill implements IAdminCommandHandler
player = (L2PcInstance) target;
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
@@ -333,11 +333,11 @@ public class AdminSkill implements IAdminCommandHandler
player = (L2PcInstance) target;
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
if (player.getName().equals(activeChar.getName()))
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_USE_ON_YOURSELF));
+ player.sendPacket(SystemMessageId.CANNOT_USE_ON_YOURSELF);
else
{
L2Skill[] skills = player.getAllSkills();
@@ -360,7 +360,7 @@ public class AdminSkill implements IAdminCommandHandler
player = (L2PcInstance) target;
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
if (adminSkills == null)
@@ -394,7 +394,7 @@ public class AdminSkill implements IAdminCommandHandler
else
{
showMainPage(activeChar);
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
StringTokenizer st = new StringTokenizer(val);
@@ -444,7 +444,7 @@ public class AdminSkill implements IAdminCommandHandler
player = (L2PcInstance) target;
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
L2Skill skill = SkillTable.getInstance().getInfo(idval, player.getSkillLevel(idval));
@@ -473,12 +473,14 @@ public class AdminSkill implements IAdminCommandHandler
else
{
showMainPage(activeChar);
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
if (!player.isClanLeader())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER).addString(player.getName()));
+ final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER);
+ sm.addString(player.getName());
+ activeChar.sendPacket(sm);
showMainPage(activeChar);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index 0d32ac0378f027102529b76f5cd8a8b2ff515af2..0f651c16b9ea1235b04fe7802a8b0e8cf82a84a8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -391,7 +391,7 @@ public class AdminSpawn implements IAdminCommandHandler
}
catch (Exception e)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_CANT_FOUND));
+ activeChar.sendPacket(SystemMessageId.TARGET_CANT_FOUND);
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index a0751cd2b2e3f217fa2bd420c6c49f6ad08fec74..c56b6410676167f5d16024089c37f3fc28a51e20 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -38,7 +38,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
import com.l2jserver.util.StringUtil;
@@ -290,7 +289,7 @@ public class AdminTeleport implements IAdminCommandHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
@@ -333,13 +332,13 @@ public class AdminTeleport implements IAdminCommandHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
if (player.getObjectId() == activeChar.getObjectId())
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_USE_ON_YOURSELF));
+ player.sendPacket(SystemMessageId.CANNOT_USE_ON_YOURSELF);
}
else
{
@@ -397,7 +396,7 @@ public class AdminTeleport implements IAdminCommandHandler
{
if (target == null)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
@@ -408,13 +407,13 @@ public class AdminTeleport implements IAdminCommandHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
if (player.getObjectId() == activeChar.getObjectId())
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_USE_ON_YOURSELF));
+ player.sendPacket(SystemMessageId.CANNOT_USE_ON_YOURSELF);
}
else
{
@@ -558,12 +557,12 @@ public class AdminTeleport implements IAdminCommandHandler
}
catch (Exception e)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_CANT_FOUND));
+ activeChar.sendPacket(SystemMessageId.TARGET_CANT_FOUND);
}
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java
index 2f6aa444f3dc050ffe1cd9afa9bae872a91bda82..526e6a58d36c896d8ed943adc3ae8726711085a4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java
@@ -29,7 +29,6 @@ import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.SortedWareHouseWithdrawalList;
import com.l2jserver.gameserver.network.serverpackets.SortedWareHouseWithdrawalList.WarehouseListType;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.network.serverpackets.WareHouseDepositList;
import com.l2jserver.gameserver.network.serverpackets.WareHouseWithdrawalList;
@@ -57,13 +56,13 @@ public class ClanWarehouse implements IBypassHandler
if (activeChar.getClan() == null)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_THE_RIGHT_TO_USE_CLAN_WAREHOUSE));
+ activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_RIGHT_TO_USE_CLAN_WAREHOUSE);
return false;
}
if (activeChar.getClan().getLevel() == 0)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_LEVEL_1_CLAN_OR_HIGHER_CAN_USE_WAREHOUSE));
+ activeChar.sendPacket(SystemMessageId.ONLY_LEVEL_1_CLAN_OR_HIGHER_CAN_USE_WAREHOUSE);
return false;
}
@@ -132,7 +131,7 @@ public class ClanWarehouse implements IBypassHandler
if ((player.getClanPrivileges() & L2Clan.CP_CL_VIEW_WAREHOUSE) != L2Clan.CP_CL_VIEW_WAREHOUSE)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_THE_RIGHT_TO_USE_CLAN_WAREHOUSE));
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_RIGHT_TO_USE_CLAN_WAREHOUSE);
return;
}
@@ -140,7 +139,7 @@ public class ClanWarehouse implements IBypassHandler
if (player.getActiveWarehouse().getSize() == 0)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NO_ITEM_DEPOSITED_IN_WH));
+ player.sendPacket(SystemMessageId.NO_ITEM_DEPOSITED_IN_WH);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/FortSiege.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/FortSiege.java
index 22b9313942da5e8baf81637110e81863924aa074..e32f7214f044bab5f18ff27ecee7def9af48b352 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/FortSiege.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/FortSiege.java
@@ -46,12 +46,12 @@ public class FortSiege implements IBypassHandler
{
if ((System.currentTimeMillis() < TerritoryWarManager.getInstance().getTWStartTimeInMillis()) && TerritoryWarManager.getInstance().getIsRegistrationOver())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_SIEGE_REGISTRATION_TIME2));
+ activeChar.sendPacket(SystemMessageId.NOT_SIEGE_REGISTRATION_TIME2);
return false;
}
else if ((System.currentTimeMillis() > TerritoryWarManager.getInstance().getTWStartTimeInMillis()) && TerritoryWarManager.getInstance().isTWChannelOpen())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_SIEGE_REGISTRATION_TIME2));
+ activeChar.sendPacket(SystemMessageId.NOT_SIEGE_REGISTRATION_TIME2);
return false;
}
else if (((L2Npc) target).getFort().getSiege().registerAttacker(activeChar, false))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Freight.java
index 65a4f2039b550243da3136e076cf8c9efcfba2af..3652bc927f2159953400f73995ff20c05486936e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Freight.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Freight.java
@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.itemcontainer.PcFreight;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.PackageToList;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.network.serverpackets.WareHouseWithdrawalList;
/**
@@ -55,7 +54,7 @@ public class Freight implements IBypassHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NO_ITEM_DEPOSITED_IN_WH));
+ activeChar.sendPacket(SystemMessageId.NO_ITEM_DEPOSITED_IN_WH);
}
}
}
@@ -63,7 +62,7 @@ public class Freight implements IBypassHandler
{
if (activeChar.getAccountChars().size() < 1)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHARACTER_DOES_NOT_EXIST));
+ activeChar.sendPacket(SystemMessageId.CHARACTER_DOES_NOT_EXIST);
}
else
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java
index b82edf64007195593d9ca72324a5125e1d52a238..c8b252d18fbef9b585c4cab46bb66aac70a3b30c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java
@@ -29,7 +29,6 @@ import com.l2jserver.gameserver.model.itemauction.ItemAuction;
import com.l2jserver.gameserver.model.itemauction.ItemAuctionInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExItemAuctionInfoPacket;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
public class ItemAuctionLink implements IBypassHandler
{
@@ -50,7 +49,7 @@ public class ItemAuctionLink implements IBypassHandler
if (!Config.ALT_ITEM_AUCTION_ENABLED)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NO_AUCTION_PERIOD));
+ activeChar.sendPacket(SystemMessageId.NO_AUCTION_PERIOD);
return true;
}
@@ -87,7 +86,7 @@ public class ItemAuctionLink implements IBypassHandler
if (currentAuction == null)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NO_AUCTION_PERIOD));
+ activeChar.sendPacket(SystemMessageId.NO_AUCTION_PERIOD);
if (nextAuction != null)
{
@@ -111,7 +110,7 @@ public class ItemAuctionLink implements IBypassHandler
}
if (!returned)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NO_OFFERINGS_OWN_OR_MADE_BID_FOR));
+ activeChar.sendPacket(SystemMessageId.NO_OFFERINGS_OWN_OR_MADE_BID_FOR);
}
}
else
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Loto.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Loto.java
index 70436da85b5d85a58ad8921458998555b2ff5e22..4a549e1e6c7f67c9061dc7608af38b0b43651da5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Loto.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Loto.java
@@ -104,13 +104,13 @@ public class Loto implements IBypassHandler
if (!Lottery.getInstance().isStarted())
{
// tickets can't be sold
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NO_LOTTERY_TICKETS_CURRENT_SOLD));
+ player.sendPacket(SystemMessageId.NO_LOTTERY_TICKETS_CURRENT_SOLD);
return;
}
if (!Lottery.getInstance().isSellableTickets())
{
// tickets can't be sold
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NO_LOTTERY_TICKETS_AVAILABLE));
+ player.sendPacket(SystemMessageId.NO_LOTTERY_TICKETS_AVAILABLE);
return;
}
@@ -177,13 +177,13 @@ public class Loto implements IBypassHandler
if (!Lottery.getInstance().isStarted())
{
// tickets can't be sold
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NO_LOTTERY_TICKETS_CURRENT_SOLD));
+ player.sendPacket(SystemMessageId.NO_LOTTERY_TICKETS_CURRENT_SOLD);
return;
}
if (!Lottery.getInstance().isSellableTickets())
{
// tickets can't be sold
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NO_LOTTERY_TICKETS_AVAILABLE));
+ player.sendPacket(SystemMessageId.NO_LOTTERY_TICKETS_AVAILABLE);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ManorManager.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ManorManager.java
index a4cda25fbc25e5d0253e374fcd1db9dd3043e403..fba37449b92c54d2258bcf29cf882ee6fbee00f2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ManorManager.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ManorManager.java
@@ -82,7 +82,7 @@ public class ManorManager implements IBypassHandler
if (CastleManorManager.getInstance().isUnderMaintenance())
{
activeChar.sendPacket(ActionFailed.STATIC_PACKET);
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_MANOR_SYSTEM_IS_CURRENTLY_UNDER_MAINTENANCE));
+ activeChar.sendPacket(SystemMessageId.THE_MANOR_SYSTEM_IS_CURRENTLY_UNDER_MAINTENANCE);
return true;
}
@@ -163,7 +163,7 @@ public class ManorManager implements IBypassHandler
}
if (castle.isNextPeriodApproved())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_6_AM_AND_8_PM));
+ activeChar.sendPacket(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_6_AM_AND_8_PM);
}
else
{
@@ -177,7 +177,7 @@ public class ManorManager implements IBypassHandler
}
if (castle.isNextPeriodApproved())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_6_AM_AND_8_PM));
+ activeChar.sendPacket(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_6_AM_AND_8_PM);
}
else
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Observation.java
index 373e7bf84582e253383b4f1c560b1fc459bc0c3b..db4849ceebace9e9f32afd6501bd857f232237f8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Observation.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Observation.java
@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
import com.l2jserver.gameserver.network.serverpackets.ItemList;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
public class Observation implements IBypassHandler
{
@@ -58,7 +57,7 @@ public class Observation implements IBypassHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_VIEW_SIEGE));
+ activeChar.sendPacket(SystemMessageId.ONLY_VIEW_SIEGE);
}
return true;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java
index 1b28799f6ed537ae0d6631e2268aa2a8fa4118a1..b01d0ba016d7a6822ffd5c43a749bbbb25689172 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java
@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.model.olympiad.OlympiadGameTask;
import com.l2jserver.gameserver.model.olympiad.OlympiadManager;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.util.StringUtil;
/**
@@ -211,7 +210,7 @@ public class OlympiadObservation implements IBypassHandler
{
if (OlympiadManager.getInstance().isRegisteredInComp(activeChar))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.WHILE_YOU_ARE_ON_THE_WAITING_LIST_YOU_ARE_NOT_ALLOWED_TO_WATCH_THE_GAME));
+ activeChar.sendPacket(SystemMessageId.WHILE_YOU_ARE_ON_THE_WAITING_LIST_YOU_ARE_NOT_ALLOWED_TO_WATCH_THE_GAME);
return false;
}
if (!TvTEvent.isInactive() && TvTEvent.isPlayerParticipant(activeChar.getObjectId()))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java
index 0426ccda640a6d0ab002023fcbbfd40ba87350d3..f622f8e521ff821a1562bac45d2c1184977d0c20 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java
@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.SortedWareHouseWithdrawalList;
import com.l2jserver.gameserver.network.serverpackets.SortedWareHouseWithdrawalList.WarehouseListType;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.network.serverpackets.WareHouseDepositList;
import com.l2jserver.gameserver.network.serverpackets.WareHouseWithdrawalList;
@@ -118,7 +117,7 @@ public class PrivateWarehouse implements IBypassHandler
if (player.getActiveWarehouse().getSize() == 0)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NO_ITEM_DEPOSITED_IN_WH));
+ player.sendPacket(SystemMessageId.NO_ITEM_DEPOSITED_IN_WH);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index cf9eb3b3676051bb348a068eefab0d16489b8d81..ecdc7c3bf9433aeb27224db32b093f638b34bf86 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -30,7 +30,6 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.util.StringUtil;
public class QuestLink implements IBypassHandler
@@ -156,7 +155,7 @@ public class QuestLink implements IBypassHandler
{
if (((q.getQuestIntId() >= 1) && (q.getQuestIntId() < 20000)) && ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder80(true)))
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INVENTORY_LESS_THAN_80_PERCENT));
+ player.sendPacket(SystemMessageId.INVENTORY_LESS_THAN_80_PERCENT);
return;
}
@@ -166,7 +165,7 @@ public class QuestLink implements IBypassHandler
{
if (player.getAllActiveQuests().length > 40) // if too many ongoing quests, don't show window and send message
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TOO_MANY_QUESTS));
+ player.sendPacket(SystemMessageId.TOO_MANY_QUESTS);
return;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ReceivePremium.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ReceivePremium.java
index b569a18dbb6c15f161ae192acfcbf59ca53d3d8d..aa0b7259d40dc3aace64ce329337dfe33e0b1a06 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ReceivePremium.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ReceivePremium.java
@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExGetPremiumItemList;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
public class ReceivePremium implements IBypassHandler
{
@@ -39,7 +38,7 @@ public class ReceivePremium implements IBypassHandler
if (activeChar.getPremiumItemList().isEmpty())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_NO_MORE_VITAMIN_ITEMS_TO_BE_FOUND));
+ activeChar.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_VITAMIN_ITEMS_TO_BE_FOUND);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveDeathPenalty.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveDeathPenalty.java
index c32caa6daae289bdacc0b1b811d105f011a57fbc..9fc29dbb064d2df1404d86324a8ad28fc599244b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveDeathPenalty.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveDeathPenalty.java
@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.EtcStatusUpdate;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.util.StringUtil;
public class RemoveDeathPenalty implements IBypassHandler
@@ -71,7 +70,7 @@ public class RemoveDeathPenalty implements IBypassHandler
return false;
}
activeChar.setDeathPenaltyBuffLevel(activeChar.getDeathPenaltyBuffLevel() - 1);
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.DEATH_PENALTY_LIFTED));
+ activeChar.sendPacket(SystemMessageId.DEATH_PENALTY_LIFTED);
activeChar.sendPacket(new EtcStatusUpdate(activeChar));
return true;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAll.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAll.java
index 70200b7e37c10606bf211ad92f902e4a88a65640..7eceecd93a289cd63e8fbbeeea651a8b3a94a704 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAll.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAll.java
@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.model.BlockList;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
@@ -87,7 +86,7 @@ public class ChatAll implements IChatHandler
{
if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED));
+ activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED);
return;
}
@@ -96,7 +95,7 @@ public class ChatAll implements IChatHandler
* Match any character that is NOT a . character. Between one and unlimited times as possible, giving back as needed (greedy)
*/
if (text.matches("\\.{1}[^\\.]+"))
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_SYNTAX));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_SYNTAX);
else
{
CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java
index 37f4815724fa1ddcec8f7ae3f66d7dda25bb17ca..e599727c876b8b1e905a3eb0f3e205ee4bcd8a5e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java
@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.handler.IChatHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
public class ChatAlliance implements IChatHandler
@@ -39,7 +38,7 @@ public class ChatAlliance implements IChatHandler
{
if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED));
+ activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java
index 044c89bffc7aef93c38cea442567b4383ba2af90..fb44dfc6604b4d4f293d703522ac1fdc19869dca 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java
@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
/**
@@ -47,7 +46,7 @@ public class ChatBattlefield implements IChatHandler
{
if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED));
+ activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatClan.java
index 9382c16b28644d999210ed3e4f8b94c3505f0bc1..590ee1f02028411710572b0f5a74e48ac53d4c5f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatClan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatClan.java
@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.handler.IChatHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
/**
@@ -44,7 +43,7 @@ public class ChatClan implements IChatHandler
{
if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED));
+ activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java
index 4a45959442c8fab808bc0fbbcdeaf41f6bdc563b..c0937bd171a74a03d36fe2bd9df34fb39e516455 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java
@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
@@ -48,7 +47,7 @@ public class ChatHeroVoice implements IChatHandler
{
if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED));
+ activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatParty.java
index 876b5d0367c7e2ccc219e80d5fd9855d41946f85..41e9c160d586e91d5d9114575ff09a14d2dd9c8f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatParty.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatParty.java
@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.handler.IChatHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
/**
@@ -44,7 +43,7 @@ public class ChatParty implements IChatHandler
{
if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED));
+ activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java
index 2c17b87d490c892b57210e2d883e5b36e87d769f..26abaa3f5f89b321255454efb9ecaca9716f887d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java
@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.PartyMatchRoomList;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
/**
@@ -47,7 +46,7 @@ public class ChatPartyMatchRoom implements IChatHandler
{
if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED));
+ activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java
index b0b3b8f5c27fb40fbe2d545c2e764cd905a3f87a..e94792b42e81ab56c97dddeb09b3f554223ae6f4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java
@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.handler.IChatHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
/**
@@ -46,7 +45,7 @@ public class ChatPartyRoomAll implements IChatHandler
{
if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED));
+ activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java
index f8b841166951d8a626cef3ab7192077a5273ec71..5c8bbcdd447408828a35dfaf2131e2f75fd31da7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java
@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.handler.IChatHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
/**
@@ -46,7 +45,7 @@ public class ChatPartyRoomCommander implements IChatHandler
{
if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED));
+ activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPetition.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPetition.java
index 5fbdc77b8b4637dbad2c9702561d5a671f99d325..f9d3adb045dcac0fbfcb1614b5d43a8883cd1173 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPetition.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPetition.java
@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.handler.IChatHandler;
import com.l2jserver.gameserver.instancemanager.PetitionManager;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
/**
@@ -43,13 +42,13 @@ public class ChatPetition implements IChatHandler
{
if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED));
+ activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED);
return;
}
if (!PetitionManager.getInstance().isPlayerInConsultation(activeChar))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_ARE_NOT_IN_PETITION_CHAT));
+ activeChar.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_PETITION_CHAT);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatShout.java
index 27b5874c445f1ed76a77a8b275be9f7b0aadc57e..29119b3123103d8174bf010710581e8851355eba 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatShout.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatShout.java
@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
@@ -47,7 +46,7 @@ public class ChatShout implements IChatHandler
{
if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED));
+ activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTell.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTell.java
index 9d72b975ef30b3892b16f255ec4471ee47654086..2a01c4f806333b2624a16cc9b78072665d7f60a0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTell.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTell.java
@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
/**
@@ -44,13 +43,13 @@ public class ChatTell implements IChatHandler
{
if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED));
+ activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED);
return;
}
if (Config.JAIL_DISABLE_CHAT && activeChar.isInJail() && !activeChar.isGM())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_PROHIBITED));
+ activeChar.sendPacket(SystemMessageId.CHATTING_PROHIBITED);
return;
}
@@ -72,7 +71,7 @@ public class ChatTell implements IChatHandler
}
if (receiver.isChatBanned())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_PERSON_IS_IN_MESSAGE_REFUSAL_MODE));
+ activeChar.sendPacket(SystemMessageId.THE_PERSON_IS_IN_MESSAGE_REFUSAL_MODE);
return;
}
if (receiver.getClient() == null || receiver.getClient().isDetached())
@@ -90,10 +89,10 @@ public class ChatTell implements IChatHandler
activeChar.sendPacket(new CreatureSay(activeChar.getObjectId(), type, "->" + receiver.getName(), text));
}
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_PERSON_IS_IN_MESSAGE_REFUSAL_MODE));
+ activeChar.sendPacket(SystemMessageId.THE_PERSON_IS_IN_MESSAGE_REFUSAL_MODE);
}
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME));
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
}
/**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java
index 3e2f43508bddd4d4b239a6b1faf7d27f34993a51..a5236e1248505b947655d4b5d28c0de609b7b225 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java
@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
@@ -47,7 +46,7 @@ public class ChatTrade implements IChatHandler
{
if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED));
+ activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java
index f28ed1ac019aed08d0e1bc712768188b46b4e9ce..373d88174809b8191853b46c7a4efcc81b447949 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java
@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.model.CharEffectList;
import com.l2jserver.gameserver.model.L2Effect;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.Env;
import com.l2jserver.gameserver.templates.effects.EffectTemplate;
import com.l2jserver.gameserver.templates.skills.L2EffectType;
@@ -92,7 +91,7 @@ public class ChameleonRest extends L2Effect
if (manaDam > getEffected().getCurrentMp())
{
- getEffected().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
+ getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
index b73cab815d3f2aeaf860c5468fc3dc7798063020..6dd8eeaf0c5d6b45d609ebc0338aad4bc61f5d46 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
@@ -16,7 +16,6 @@ package handlers.effecthandlers;
import com.l2jserver.gameserver.model.L2Effect;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.Env;
import com.l2jserver.gameserver.templates.effects.EffectTemplate;
import com.l2jserver.gameserver.templates.skills.L2EffectType;
@@ -53,7 +52,7 @@ public class DamOverTime extends L2Effect
{
if (getSkill().isToggle())
{
- getEffected().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_HP));
+ getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_HP);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java
index 29d0309a3949d8f5be527eb5a02ab657c0719f34..93d5d5f9b536416dcc0c1b6a91d5cf8540f25833 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java
@@ -16,7 +16,6 @@ package handlers.effecthandlers;
import com.l2jserver.gameserver.model.L2Effect;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.Env;
import com.l2jserver.gameserver.templates.effects.EffectTemplate;
import com.l2jserver.gameserver.templates.skills.L2EffectType;
@@ -79,7 +78,7 @@ public class FakeDeath extends L2Effect
{
if (getSkill().isToggle())
{
- getEffected().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
+ getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
return false;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java
index 519f169c9f85a2dd6befb03d53e9e41663e3c0e1..c1e1e1e1fcc486c909f958e838f72311e1e2ea2d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java
@@ -16,7 +16,6 @@ package handlers.effecthandlers;
import com.l2jserver.gameserver.model.L2Effect;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.Env;
import com.l2jserver.gameserver.templates.effects.EffectTemplate;
import com.l2jserver.gameserver.templates.skills.L2EffectType;
@@ -54,7 +53,7 @@ public class ManaDamOverTime extends L2Effect
{
if (getSkill().isToggle())
{
- getEffected().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
+ getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
return false;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java
index ec2ddcbabe266dcad9909f8d6470ed711c360adb..0ad6e23ad30f6e19662d8202605c7b85d1669535 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java
@@ -16,7 +16,6 @@ package handlers.effecthandlers;
import com.l2jserver.gameserver.model.L2Effect;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.Env;
import com.l2jserver.gameserver.templates.effects.EffectTemplate;
import com.l2jserver.gameserver.templates.skills.L2EffectType;
@@ -54,7 +53,7 @@ public class MpConsumePerLevel extends L2Effect
if (consume > getEffected().getCurrentMp())
{
- getEffected().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
+ getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java
index 33b1855e0db61bf543c0dbcce738af48f5e73d47..bc9e34c12661cfae005c32543d7f4fb07d2c5fb3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java
@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.model.CharEffectList;
import com.l2jserver.gameserver.model.L2Effect;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.Env;
import com.l2jserver.gameserver.templates.effects.EffectTemplate;
import com.l2jserver.gameserver.templates.skills.L2EffectType;
@@ -87,7 +86,7 @@ public class Relax extends L2Effect
{
if (getSkill().isToggle())
{
- getEffected().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SKILL_DEACTIVATED_HP_FULL));
+ getEffected().sendPacket(SystemMessageId.SKILL_DEACTIVATED_HP_FULL);
return false;
}
}
@@ -98,7 +97,7 @@ public class Relax extends L2Effect
{
if (getSkill().isToggle())
{
- getEffected().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
+ getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
return false;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Signet.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Signet.java
index f4b2db6e0c74b998b3cb6a96a5672eab9f2f969a..de0f69f303e9484e3a7ce463e17c0aaabc6dc56e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Signet.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Signet.java
@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2EffectPointInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.Env;
import com.l2jserver.gameserver.skills.l2skills.L2SkillSignet;
import com.l2jserver.gameserver.skills.l2skills.L2SkillSignetCasttime;
@@ -83,7 +82,7 @@ public class Signet extends L2Effect
if (mpConsume > getEffector().getCurrentMp())
{
- getEffector().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
+ getEffector().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetAntiSummon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetAntiSummon.java
index c1b879c4a6d27ef5e82213d4991a1b3fc33f8826..3e59f385071f2ca0563920f2bf7f74b4832186c9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetAntiSummon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetAntiSummon.java
@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2EffectPointInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.Env;
import com.l2jserver.gameserver.templates.effects.EffectTemplate;
import com.l2jserver.gameserver.templates.skills.L2EffectType;
@@ -92,7 +91,7 @@ public class SignetAntiSummon extends L2Effect
{
if (mpConsume > getEffector().getCurrentMp())
{
- getEffector().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
+ getEffector().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetMDam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetMDam.java
index 7212ba93a7aacaa35ab902e7c4e2fccf27fdd986..23c781678853f2546f111f914caaf5b35aea079a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetMDam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetMDam.java
@@ -33,7 +33,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillLaunched;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.Env;
import com.l2jserver.gameserver.skills.Formulas;
import com.l2jserver.gameserver.skills.l2skills.L2SkillSignetCasttime;
@@ -150,7 +149,7 @@ public class SignetMDam extends L2Effect
if (mpConsume > caster.getCurrentMp())
{
- caster.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
+ caster.sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java
index dcbf03b72e13d29d3cb6e1367a02b46966c53f85..e0d29926ddefa21b20f1f2636dd6828bd119499e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java
@@ -17,7 +17,6 @@ package handlers.effecthandlers;
import com.l2jserver.gameserver.model.CharEffectList;
import com.l2jserver.gameserver.model.L2Effect;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.Env;
import com.l2jserver.gameserver.templates.effects.EffectTemplate;
import com.l2jserver.gameserver.templates.skills.L2EffectType;
@@ -95,7 +94,7 @@ public class SilentMove extends L2Effect
if (manaDam > getEffected().getCurrentMp())
{
- getEffected().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
+ getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Spoil.java
index 70ce3a8ca112cf413c11396cd0d35a6953e461c9..7e74749dff11de05dac8d339b72ad0ff152060eb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Spoil.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Spoil.java
@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.model.L2Effect;
import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.Env;
import com.l2jserver.gameserver.skills.Formulas;
import com.l2jserver.gameserver.templates.effects.EffectTemplate;
@@ -71,7 +70,7 @@ public class Spoil extends L2Effect
if (target.isSpoil())
{
- getEffector().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_SPOILED));
+ getEffector().sendPacket(SystemMessageId.ALREADY_SPOILED);
return false;
}
@@ -85,7 +84,7 @@ public class Spoil extends L2Effect
{
target.setSpoil(true);
target.setIsSpoiledBy(getEffector().getObjectId());
- getEffector().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SPOIL_SUCCESS));
+ getEffector().sendPacket(SystemMessageId.SPOIL_SUCCESS);
}
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, getEffector());
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java
index ad904da542a559fcee9546544bca2ee2401cd120..e522ddb66430977feef2ca0d031c38539c72d372 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java
@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.instancemanager.TransformationManager;
import com.l2jserver.gameserver.model.L2Effect;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.Env;
import com.l2jserver.gameserver.templates.effects.EffectTemplate;
import com.l2jserver.gameserver.templates.skills.L2EffectType;
@@ -70,7 +69,7 @@ public class Transformation extends L2Effect
if (trg.getTransformation() != null)
{
- trg.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN));
+ trg.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java
index 557f973d2e66d78e3a01799a876f922dad050435..3a54c0f3ffce0c012795fe479924dc2780ed9fb2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java
@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Broadcast;
/**
@@ -45,7 +44,7 @@ public class BeastSoulShot implements IItemHandler
if (playable instanceof L2Summon)
{
activeOwner = ((L2Summon) playable).getOwner();
- activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PET_CANNOT_USE_ITEM));
+ activeOwner.sendPacket(SystemMessageId.PET_CANNOT_USE_ITEM);
return;
}
else if (playable instanceof L2PcInstance)
@@ -57,13 +56,13 @@ public class BeastSoulShot implements IItemHandler
if (activePet == null)
{
- activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PETS_ARE_NOT_AVAILABLE_AT_THIS_TIME));
+ activeOwner.sendPacket(SystemMessageId.PETS_ARE_NOT_AVAILABLE_AT_THIS_TIME);
return;
}
if (activePet.isDead())
{
- activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET));
+ activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET);
return;
}
@@ -75,7 +74,7 @@ public class BeastSoulShot implements IItemHandler
{
// Not enough Soulshots to use.
if (!activeOwner.disableAutoShot(itemId))
- activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_ENOUGH_SOULSHOTS_FOR_PET));
+ activeOwner.sendPacket(SystemMessageId.NOT_ENOUGH_SOULSHOTS_FOR_PET);
return;
}
@@ -105,12 +104,12 @@ public class BeastSoulShot implements IItemHandler
if (!activeOwner.destroyItemWithoutTrace("Consume", item.getObjectId(), shotConsumption, null, false))
{
if (!activeOwner.disableAutoShot(itemId))
- activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_ENOUGH_SOULSHOTS_FOR_PET));
+ activeOwner.sendPacket(SystemMessageId.NOT_ENOUGH_SOULSHOTS_FOR_PET);
return;
}
// Pet uses the power of spirit.
- activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PET_USE_SPIRITSHOT));
+ activeOwner.sendPacket(SystemMessageId.PET_USE_SPIRITSHOT);
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(activePet, activePet, itemId == 6645 ? 2033 : 22036, 1, 0, 0), 360000/*600*/);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java
index 3d6b76cf6ec6126ff003c0c384567326959549f7..fee83cd52de586bf727759ff5cc8d6804f507a61 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java
@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2FeedableBeastInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
public class BeastSpice implements IItemHandler
{
@@ -39,7 +38,7 @@ public class BeastSpice implements IItemHandler
if (!(activeChar.getTarget() instanceof L2FeedableBeastInstance))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java
index feaddf233ca4ad81cd00e7ff35e169f3b3ef992a..608777eb77f4f3e87093dc764166e53445765fa9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java
@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Broadcast;
/**
@@ -45,7 +44,7 @@ public class BeastSpiritShot implements IItemHandler
if (playable instanceof L2Summon)
{
- activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PET_CANNOT_USE_ITEM));
+ activeOwner.sendPacket(SystemMessageId.PET_CANNOT_USE_ITEM);
return;
}
@@ -53,13 +52,13 @@ public class BeastSpiritShot implements IItemHandler
if (activePet == null)
{
- activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PETS_ARE_NOT_AVAILABLE_AT_THIS_TIME));
+ activeOwner.sendPacket(SystemMessageId.PETS_ARE_NOT_AVAILABLE_AT_THIS_TIME);
return;
}
if (activePet.isDead())
{
- activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET));
+ activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET);
return;
}
@@ -72,7 +71,7 @@ public class BeastSpiritShot implements IItemHandler
{
// Not enough SpiritShots to use.
if (!activeOwner.disableAutoShot(itemId))
- activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_ENOUGH_SPIRITHOTS_FOR_PET));
+ activeOwner.sendPacket(SystemMessageId.NOT_ENOUGH_SPIRITHOTS_FOR_PET);
return;
}
@@ -108,12 +107,12 @@ public class BeastSpiritShot implements IItemHandler
if (!activeOwner.destroyItemWithoutTrace("Consume", item.getObjectId(), shotConsumption, null, false))
{
if (!activeOwner.disableAutoShot(itemId))
- activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_ENOUGH_SPIRITHOTS_FOR_PET));
+ activeOwner.sendPacket(SystemMessageId.NOT_ENOUGH_SPIRITHOTS_FOR_PET);
return;
}
// Pet uses the power of spirit.
- activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PET_USE_SPIRITSHOT));
+ activeOwner.sendPacket(SystemMessageId.PET_USE_SPIRITSHOT);
int skillId = 0;
switch (itemId)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java
index f8c059c6b7f8fcd898ff97290ecb86e6904f6a23..ee28fbce3432cf81341dddb7f77d35c7426f0d66 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java
@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.item.L2Weapon;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Broadcast;
/**
@@ -51,7 +50,7 @@ public class BlessedSpiritShot implements IItemHandler
if (weaponInst == null || weaponItem == null || weaponItem.getSpiritShotCount() == 0)
{
if (!activeChar.getAutoSoulShot().contains(itemId))
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_USE_SPIRITSHOTS));
+ activeChar.sendPacket(SystemMessageId.CANNOT_USE_SPIRITSHOTS);
return;
}
@@ -97,7 +96,7 @@ public class BlessedSpiritShot implements IItemHandler
if (!gradeCheck)
{
if (!activeChar.getAutoSoulShot().contains(itemId))
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SPIRITSHOTS_GRADE_MISMATCH));
+ activeChar.sendPacket(SystemMessageId.SPIRITSHOTS_GRADE_MISMATCH);
return;
}
@@ -107,7 +106,7 @@ public class BlessedSpiritShot implements IItemHandler
if (!activeChar.destroyItemWithoutTrace("Consume", item.getObjectId(), weaponItem.getSpiritShotCount(), null, false))
{
if (!activeChar.disableAutoShot(itemId))
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_ENOUGH_SPIRITSHOTS));
+ activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_SPIRITSHOTS);
return;
}
@@ -115,7 +114,7 @@ public class BlessedSpiritShot implements IItemHandler
weaponInst.setChargedSpiritshot(L2ItemInstance.CHARGED_BLESSED_SPIRITSHOT);
// Send message to client
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ENABLED_SPIRITSHOT));
+ activeChar.sendPacket(SystemMessageId.ENABLED_SPIRITSHOT);
int skillId = 0;
switch (itemId)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java
index f25314c6db9158f06acf21cbc96c0f59e215f1a4..8f4e7afff25a222365009d1a003230896602bee5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java
@@ -18,7 +18,6 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
public class Elixir extends ItemSkills
{
@@ -31,7 +30,7 @@ public class Elixir extends ItemSkills
{
if (!(playable instanceof L2PcInstance))
{
- playable.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ITEM_NOT_FOR_PETS));
+ playable.sendPacket(SystemMessageId.ITEM_NOT_FOR_PETS);
return;
}
super.useItem(playable, item, forceUse);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java
index cb166b012d04cdeca613383bfe7449f51dd1825d..2e72c4be8d6c595958bbaaa1f300de6369421fc6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java
@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExChooseInventoryAttributeItem;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
public class EnchantAttribute implements IItemHandler
{
@@ -35,7 +34,7 @@ public class EnchantAttribute implements IItemHandler
if (activeChar.isEnchanting())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ENCHANTMENT_ALREADY_IN_PROGRESS));
+ activeChar.sendPacket(SystemMessageId.ENCHANTMENT_ALREADY_IN_PROGRESS);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java
index 29dae88faabf0838743f698ad4d1668001354afb..1975e8dfa6f1c95f833dd35a3dd615cb5f5e14cb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java
@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ChooseInventoryItem;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
public class EnchantScrolls implements IItemHandler
{
@@ -39,7 +38,7 @@ public class EnchantScrolls implements IItemHandler
if (activeChar.isEnchanting())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ENCHANTMENT_ALREADY_IN_PROGRESS));
+ activeChar.sendPacket(SystemMessageId.ENCHANTMENT_ALREADY_IN_PROGRESS);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java
index 4d0bd33aa02375e0f05ee5ef6a8c4d8faf7d0d79..8efed471fd55dd9f96c64075a70e870aff81a2b7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java
@@ -40,7 +40,9 @@ public class EnergyStarStone extends ItemSkills
|| !(ship instanceof L2ControllableAirShipInstance)
|| ship.getFuel() >= ship.getMaxFuel())
{
- playable.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED).addItemName(item));
+ final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+ sm.addItemName(item);
+ playable.sendPacket(sm);
playable.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java
index 47a2e861c4f95cb916a1539d3d53f79e2bfb6649..d86054168c6995b7ebd8d8b03ed57b60ee6fca00 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.model.item.type.L2WeaponType;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Broadcast;
/**
@@ -66,7 +65,7 @@ public class FishShots implements IItemHandler
|| (grade == L2Item.CRYSTAL_A && FishshotId != 6539) || (FishshotId != 6540 && grade == L2Item.CRYSTAL_S ))
{
//1479 - This fishing shot is not fit for the fishing pole crystal.
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.WRONG_FISHINGSHOT_GRADE));
+ activeChar.sendPacket(SystemMessageId.WRONG_FISHINGSHOT_GRADE);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java
index 4b042058bb167844b7711cca0339d294e0c17dc4..d73177caf44c76b324363b75fa4db6011e7e50d9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* @author l3x
@@ -50,7 +49,7 @@ public class Harvester implements IItemHandler
if (!(_activeChar.getTarget() instanceof L2MonsterInstance))
{
- _activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ _activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
_activeChar.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java
index 5920c4d103d45a9ef9c53612cc16c7049cbebc00..fbfea9e44e5728c6e7420e5bd2da72c874b8bd5e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java
@@ -18,7 +18,6 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* Item skills not allowed on olympiad
@@ -35,7 +34,7 @@ public class ItemSkills extends ItemSkillsTemplate
final L2PcInstance activeChar = playable.getActingPlayer();
if (activeChar != null && activeChar.isInOlympiadMode())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT));
+ activeChar.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 280238f9f558fea7dd56f5022a1a56a52dc60fd3..50e38e4d8efc01fc337d9c5ed037f09d8a3fe546 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -63,7 +63,7 @@ public class ItemSkillsTemplate implements IItemHandler
// pets can use items only when they are tradeable
if (isPet && !item.isTradeable())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ITEM_NOT_FOR_PETS));
+ activeChar.sendPacket(SystemMessageId.ITEM_NOT_FOR_PETS);
return;
}
@@ -102,7 +102,7 @@ public class ItemSkillsTemplate implements IItemHandler
{
if (!playable.destroyItem("Consume", item.getObjectId(), itemSkill.getItemConsume(), null, false))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_ENOUGH_ITEMS));
+ activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
return;
}
}
@@ -161,7 +161,7 @@ public class ItemSkillsTemplate implements IItemHandler
{
if (!playable.destroyItem("Consume", item.getObjectId(), itemSkill.getItemConsume(), null, false))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_ENOUGH_ITEMS));
+ activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
return;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java
index 7108e00ca5dda0530b0bd8978adcccd9314ad668..b4549f5bd31c9c748c47a51c7b523c87f16d0961 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java
@@ -18,7 +18,6 @@ import com.l2jserver.Config;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
public class ManaPotion extends ItemSkills
{
@@ -31,7 +30,7 @@ public class ManaPotion extends ItemSkills
{
if (!Config.L2JMOD_ENABLE_MANA_POTIONS_SUPPORT)
{
- playable.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOTHING_HAPPENED));
+ playable.sendPacket(SystemMessageId.NOTHING_HAPPENED);
return;
}
super.useItem(playable, item, forceUse);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java
index 2cbee31bb0f4f1852b0a766b0ac0a15eea8c5b61..ae9758880f1d490cc6525c851bc12617e4329ec4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* @author chris
@@ -47,7 +46,7 @@ public class PaganKeys implements IItemHandler
if (!(target instanceof L2DoorInstance))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
activeChar.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java
index 6f079abe7a309f16e7b15c37e84b4fbf149549c9..98fb845d78f076541777cf6e64b6568211031fb8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java
@@ -85,7 +85,7 @@ public class PetFood implements IItemHandler
((L2PetInstance) activeChar).broadcastStatusUpdate();
if (((L2PetInstance) activeChar).getCurrentFed() < (((L2PetInstance) activeChar).getPetData().getHungry_limit() / 100f * ((L2PetInstance) activeChar).getPetLevelData().getPetMaxFeed()))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_ATE_A_LITTLE_BUT_IS_STILL_HUNGRY));
+ activeChar.sendPacket(SystemMessageId.YOUR_PET_ATE_A_LITTLE_BUT_IS_STILL_HUNGRY);
}
return true;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java
index d46db2bf182c8741cba5a68650d32a7b5fb9ca98..897039abefc047b4517a3e8daaa42c3534dab4c6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java
@@ -47,7 +47,7 @@ public class RollingDice implements IItemHandler
if (activeChar.isInOlympiadMode())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT));
+ activeChar.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT);
return;
}
@@ -56,7 +56,7 @@ public class RollingDice implements IItemHandler
int number = rollDice(activeChar);
if (number == 0)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_MAY_NOT_THROW_THE_DICE_AT_THIS_TIME_TRY_AGAIN_LATER));
+ activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_THROW_THE_DICE_AT_THIS_TIME_TRY_AGAIN_LATER);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java
index 763620f5e634dbd4e4d012e9077e0d9414fd2f90..d02c5b598f0abde80fad2b6b6c5aad3779c3c5e1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java
@@ -56,7 +56,7 @@ public class ScrollOfResurrection implements IItemHandler
if (activeChar.isSitting())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANT_MOVE_SITTING));
+ activeChar.sendPacket(SystemMessageId.CANT_MOVE_SITTING);
return;
}
if (activeChar.isMovementDisabled())
@@ -96,7 +96,7 @@ public class ScrollOfResurrection implements IItemHandler
if (castle != null && castle.getSiege().getIsInProgress())
{
condGood = false;
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_BE_RESURRECTED_DURING_SIEGE));
+ activeChar.sendPacket(SystemMessageId.CANNOT_BE_RESURRECTED_DURING_SIEGE);
}
if (targetPet != null)
@@ -106,9 +106,9 @@ public class ScrollOfResurrection implements IItemHandler
if (targetPet.getOwner().isReviveRequested())
{
if (targetPet.getOwner().isRevivingPet())
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED)); // Resurrection is already been proposed.
+ activeChar.sendPacket(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed.
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_RES_PET2)); // A pet cannot be resurrected while it's owner is in the process of resurrecting.
+ activeChar.sendPacket(SystemMessageId.CANNOT_RES_PET2); // A pet cannot be resurrected while it's owner is in the process of resurrecting.
condGood = false;
}
}
@@ -123,9 +123,9 @@ public class ScrollOfResurrection implements IItemHandler
if (targetPlayer.isReviveRequested())
{
if (targetPlayer.isRevivingPet())
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.MASTER_CANNOT_RES)); // While a pet is attempting to resurrect, it cannot help in resurrecting its master.
+ activeChar.sendPacket(SystemMessageId.MASTER_CANNOT_RES); // While a pet is attempting to resurrect, it cannot help in resurrecting its master.
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED)); // Resurrection is already been proposed.
+ activeChar.sendPacket(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed.
condGood = false;
}
else if (petScroll)
@@ -182,7 +182,7 @@ public class ScrollOfResurrection implements IItemHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
}
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java
index 97643ded6e5423f44d2477411f0b7839eda89947..7a1d96aedd9e2bb8b157d26329ff77088c80a9dc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java
@@ -29,7 +29,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.SkillHolder;
/**
@@ -52,13 +51,13 @@ public class Seed implements IItemHandler
final L2Object tgt = playable.getTarget();
if (!(tgt instanceof L2Npc))
{
- playable.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ playable.sendPacket(SystemMessageId.INCORRECT_TARGET);
playable.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!(tgt instanceof L2MonsterInstance) || tgt instanceof L2ChestInstance || ((L2Character)tgt).isRaid())
{
- playable.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_TARGET_IS_UNAVAILABLE_FOR_SEEDING));
+ playable.sendPacket(SystemMessageId.THE_TARGET_IS_UNAVAILABLE_FOR_SEEDING);
playable.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -66,7 +65,7 @@ public class Seed implements IItemHandler
final L2MonsterInstance target = (L2MonsterInstance)tgt;
if (target.isDead())
{
- playable.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ playable.sendPacket(SystemMessageId.INCORRECT_TARGET);
playable.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -93,7 +92,7 @@ public class Seed implements IItemHandler
}
else
- playable.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THIS_SEED_MAY_NOT_BE_SOWN_HERE));
+ playable.sendPacket(SystemMessageId.THIS_SEED_MAY_NOT_BE_SOWN_HERE);
}
/**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java
index 4768e809d1b4a9e5ff1f93d609eb83ff31893fce..4205e1d22b63fc5598977eeb424798d1e9882408 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java
@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.item.L2Weapon;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Broadcast;
/**
@@ -51,7 +50,7 @@ public class SpiritShot implements IItemHandler
if (weaponInst == null || weaponItem.getSpiritShotCount() == 0)
{
if (!activeChar.getAutoSoulShot().contains(itemId))
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_USE_SPIRITSHOTS));
+ activeChar.sendPacket(SystemMessageId.CANNOT_USE_SPIRITSHOTS);
return;
}
@@ -96,7 +95,7 @@ public class SpiritShot implements IItemHandler
if (!gradeCheck)
{
if (!activeChar.getAutoSoulShot().contains(itemId))
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SPIRITSHOTS_GRADE_MISMATCH));
+ activeChar.sendPacket(SystemMessageId.SPIRITSHOTS_GRADE_MISMATCH);
return;
}
@@ -105,7 +104,7 @@ public class SpiritShot implements IItemHandler
if (!activeChar.destroyItemWithoutTrace("Consume", item.getObjectId(), weaponItem.getSpiritShotCount(), null, false))
{
if (!activeChar.disableAutoShot(itemId))
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_ENOUGH_SPIRITSHOTS));
+ activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_SPIRITSHOTS);
return;
}
@@ -151,7 +150,7 @@ public class SpiritShot implements IItemHandler
}
// Send message to client
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ENABLED_SPIRITSHOT));
+ activeChar.sendPacket(SystemMessageId.ENABLED_SPIRITSHOT);
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, skillId, 1, 0, 0), 360000);
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
index 5db0b47edbdb1a3c4496850c1925b5d84d0f9865..427d824f6cdcc866d752871795ddf56c3ad83cac 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
@@ -68,7 +68,7 @@ public class SummonItems implements IItemHandler
if (activeChar.isSitting())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANT_MOVE_SITTING));
+ activeChar.sendPacket(SystemMessageId.CANT_MOVE_SITTING);
return;
}
@@ -80,7 +80,7 @@ public class SummonItems implements IItemHandler
if (activeChar.isInOlympiadMode())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT));
+ activeChar.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT);
return;
}
if (activeChar.isAllSkillsDisabled() || activeChar.isCastingNow())
@@ -90,13 +90,13 @@ public class SummonItems implements IItemHandler
if ((activeChar.getPet() != null || activeChar.isMounted()) && sitem.isPetSummon())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_ALREADY_HAVE_A_PET));
+ activeChar.sendPacket(SystemMessageId.YOU_ALREADY_HAVE_A_PET);
return;
}
if (activeChar.isAttackingNow())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_CANNOT_SUMMON_IN_COMBAT));
+ activeChar.sendPacket(SystemMessageId.YOU_CANNOT_SUMMON_IN_COMBAT);
return;
}
@@ -144,7 +144,7 @@ public class SummonItems implements IItemHandler
}
catch (Exception e)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_CANT_FOUND));
+ activeChar.sendPacket(SystemMessageId.TARGET_CANT_FOUND);
}
break;
case 1: // pet summons
@@ -153,7 +153,7 @@ public class SummonItems implements IItemHandler
Broadcast.toSelfAndKnownPlayers(activeChar, new MagicSkillUse(activeChar, 2046, 1, 5000, 0));
activeChar.setTarget(oldTarget);
activeChar.sendPacket(new SetupGauge(0, 5000));
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SUMMON_A_PET));
+ activeChar.sendPacket(SystemMessageId.SUMMON_A_PET);
activeChar.setIsCastingNow(true);
ThreadPoolManager.getInstance().scheduleGeneral(new PetSummonFinalizer(activeChar, npcTemplate, item), 5000);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java
index e13c16a059f6ea11393e3d3ee928ae5e33fdc19b..a381a099f46dd85a58c638c335a764973e20f4ac 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java
@@ -38,14 +38,14 @@ public class TeleportBookmark implements IItemHandler
if(player.getBookMarkSlot() >= 9)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_NUMBER_OF_MY_TELEPORTS_SLOTS_HAS_REACHED_ITS_MAXIMUM_LIMIT));
+ player.sendPacket(SystemMessageId.YOUR_NUMBER_OF_MY_TELEPORTS_SLOTS_HAS_REACHED_ITS_MAXIMUM_LIMIT);
return;
}
player.destroyItem("Consume", item.getObjectId(), 1, null, false);
player.setBookMarkSlot(player.getBookMarkSlot()+3);
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_NUMBER_OF_MY_TELEPORTS_SLOTS_HAS_BEEN_INCREASED));
+ player.sendPacket(SystemMessageId.THE_NUMBER_OF_MY_TELEPORTS_SLOTS_HAS_BEEN_INCREASED);
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
sm.addItemName(item.getItemId());
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java
index b9cefe2356fae5f3434b971dea667ea55005e968..f25e292d9e22fdd31088add7a469975d91929344 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java
@@ -32,7 +32,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.Env;
import com.l2jserver.gameserver.skills.Formulas;
import com.l2jserver.gameserver.templates.skills.L2SkillType;
@@ -243,7 +242,7 @@ public class Continuous implements ISkillHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ATTACK_FAILED));
+ activeChar.sendPacket(SystemMessageId.ATTACK_FAILED);
}
// Possibility of a lethal strike
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
index f49b6dce05fa1c4045c8665057b23dcfa6659fc0..5d0a33867b77ba5a80b6bf1888b30deb917782e1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.L2Skill;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.skills.L2SkillType;
/**
@@ -51,7 +50,7 @@ public class Craft implements ISkillHandler
if (player.getPrivateStoreType() != 0)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_CREATED_WHILE_ENGAGED_IN_TRADING));
+ player.sendPacket(SystemMessageId.CANNOT_CREATED_WHILE_ENGAGED_IN_TRADING);
return;
}
RecipeController.getInstance().requestBookOpen(player, (skill.getSkillType() == L2SkillType.DWARVEN_CRAFT) ? true : false);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java
index ea82164051f41443090982059ba91f81e7fb0497..6dce452458531d1d0b1d2536487f009455bbd4a4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java
@@ -263,7 +263,7 @@ public class Disablers implements ISkillHandler
}
}
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
break;
}
case AGGDAMAGE:
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java
index a0c384aab944894217870464f22dd75930e0f2f1..6df1db4d95d77a5ea6aeced04ef718fe8ca9fd14 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java
@@ -106,14 +106,16 @@ public class Extractable implements ISkillHandler
//FIXME: Remove this once skill reuse will be global for main/subclass.
if (player.isSubClassActive() && (skill.getReuseDelay() > 0) && !Util.contains(protectedSkillIds, skill.getId()))
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.MAIN_CLASS_SKILL_ONLY));
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED).addSkillName(skill));
+ player.sendPacket(SystemMessageId.MAIN_CLASS_SKILL_ONLY);
+ SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+ sm.addSkillName(skill);
+ player.sendPacket(sm);
return;
}
if (createItemID[0] <= 0)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOTHING_INSIDE_THAT));
+ player.sendPacket(SystemMessageId.NOTHING_INSIDE_THAT);
return;
}
else
@@ -128,7 +130,7 @@ public class Extractable implements ISkillHandler
if (ItemTable.getInstance().createDummyItem(createItemID[i]) == null)
{
_log.warning("Extractable Item Skill Id:" + skill.getId() + " createItemID " + createItemID[i] + " doesn't have a template!");
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOTHING_INSIDE_THAT));
+ player.sendPacket(SystemMessageId.NOTHING_INSIDE_THAT);
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java
index bf7d268f0916453633586e2050de526671844757..07178bb19d2ce4caeaec62a7a62d1dd675364722 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.model.item.L2Weapon;
import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.skills.L2SkillType;
public class FishingSkill implements ISkillHandler
@@ -52,12 +51,12 @@ public class FishingSkill implements ISkillHandler
if (skill.getSkillType() == L2SkillType.PUMPING)
{
//Pumping skill is available only while fishing
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CAN_USE_PUMPING_ONLY_WHILE_FISHING));
+ player.sendPacket(SystemMessageId.CAN_USE_PUMPING_ONLY_WHILE_FISHING);
}
else if (skill.getSkillType() == L2SkillType.REELING)
{
//Reeling skill is available only while fishing
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CAN_USE_REELING_ONLY_WHILE_FISHING));
+ player.sendPacket(SystemMessageId.CAN_USE_REELING_ONLY_WHILE_FISHING);
}
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
@@ -74,7 +73,7 @@ public class FishingSkill implements ISkillHandler
int dmg = (int) (skill.getPower() * gradebonus * SS);
if (player.getSkillLevel(1315) <= skill.getLevel() - 2) //1315 - Fish Expertise
{//Penalty
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.REELING_PUMPING_3_LEVELS_HIGHER_THAN_FISHING_PENALTY));
+ player.sendPacket(SystemMessageId.REELING_PUMPING_3_LEVELS_HIGHER_THAN_FISHING_PENALTY);
pen = 50;
int penatlydmg = dmg - pen;
if (player.isGM())
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java
index 1de8a71c8568de424dc0de9624cbdfb2ef9382d3..c3a2b63e2a898fbd9c38d991b939780dfda7eda3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java
@@ -59,13 +59,12 @@ public class GiveReco implements ISkillHandler
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_OBTAINED_S1_RECOMMENDATIONS);
sm.addNumber(power);
-
target.sendPacket(sm);
target.sendPacket(new UserInfo(target));
target.sendPacket(new ExVoteSystemInfo(target));
}
else
- target.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOTHING_HAPPENED));
+ target.sendPacket(SystemMessageId.NOTHING_HAPPENED);
}
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java
index ef0c3855029a652e2bb16d68f0ba55e4dd417b7e..cfd38db7f82aa8dec7622352d18efe286636bff7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java
@@ -127,10 +127,10 @@ public class Harvest implements ISkillHandler
}
}
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_HARVEST_HAS_FAILED));
+ activeChar.sendPacket(SystemMessageId.THE_HARVEST_HAS_FAILED);
}
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_HARVEST_FAILED_BECAUSE_THE_SEED_WAS_NOT_SOWN));
+ activeChar.sendPacket(SystemMessageId.THE_HARVEST_FAILED_BECAUSE_THE_SEED_WAS_NOT_SOWN);
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java
index 4bf461b22344646bffd891e256f1f2a4c79fad0e..3396b479649a7c6c3fecdff54bed2fc520326d77 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java
@@ -91,7 +91,7 @@ public class Manadam implements ISkillHandler
boolean acted = Formulas.calcMagicAffected(activeChar, target, skill);
if (target.isInvul() || !acted)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.MISSED_TARGET));
+ activeChar.sendPacket(SystemMessageId.MISSED_TARGET);
}
else
{
@@ -115,7 +115,7 @@ public class Manadam implements ISkillHandler
if (!skill.isStaticDamage() && Formulas.calcMCrit(activeChar.getMCriticalHit(target, skill)))
{
damage *= 3.;
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CRITICAL_HIT_MAGIC));
+ activeChar.sendPacket(SystemMessageId.CRITICAL_HIT_MAGIC);
}
double mp = (damage > target.getCurrentMp() ? target.getCurrentMp() : damage);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java
index 26ca79c7635061ea77791fa12fb0d6b862d8f687..6ea3cba1131b213807ef82f0486feb9eae42b4f0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java
@@ -64,7 +64,7 @@ public class NornilsPower implements ISkillHandler
}
}
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOTHING_HAPPENED));
+ activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
}
public L2SkillType[] getSkillIds()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java
index 89380bc9ed360051ed5989e77a7641c25149c814..b165fedc39452fc95fd41697eccbbca542c76206 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java
@@ -199,7 +199,7 @@ public class Pdam implements ISkillHandler
}
}
else // No damage
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ATTACK_FAILED));
+ activeChar.sendPacket(SystemMessageId.ATTACK_FAILED);
}
else
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java
index df95aea7730e8fbb118b925dbbcb24acb493d143..ab31aaf80a343f2529af999b29821776fab40bf9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java
@@ -53,7 +53,7 @@ public class Spoil implements ISkillHandler
if (target.isSpoil())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_SPOILED));
+ activeChar.sendPacket(SystemMessageId.ALREADY_SPOILED);
continue;
}
@@ -67,7 +67,7 @@ public class Spoil implements ISkillHandler
{
target.setSpoil(true);
target.setIsSpoiledBy(activeChar.getObjectId());
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SPOIL_SUCCESS));
+ activeChar.sendPacket(SystemMessageId.SPOIL_SUCCESS);
}
else
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java
index 848ca10b9952d4fc8c61dd9c93113773abf27253..6fe0a1b23374ede2cb19607a98e3499a834eacc8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java
@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.model.L2Skill;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.skills.L2SkillType;
/**
@@ -53,7 +52,7 @@ public class TransformDispel implements ISkillHandler
if (pc.isTransformed() || pc.isInStance())
{
if (pc.isFlyingMounted() && !pc.isInsideZone(L2Character.ZONE_LANDING))
- pc.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.BOARD_OR_CANCEL_NOT_POSSIBLE_HERE));
+ pc.sendPacket(SystemMessageId.BOARD_OR_CANCEL_NOT_POSSIBLE_HERE);
else
pc.stopTransformation(true);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java
index 22e9fe8bc3b74fc7b0721db6c7726315f5f5e82a..f4e4c3f97d252f4c06f34f996db543beecd6ff1b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java
@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.Quest.TrapAction;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.skills.L2SkillType;
public class Trap implements ISkillHandler
@@ -77,7 +76,7 @@ public class Trap implements ISkillHandler
if (!trap.canSee(activeChar))
{
if (activeChar instanceof L2PcInstance)
- ((L2PcInstance) activeChar).sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+ activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
continue;
}
@@ -90,7 +89,7 @@ public class Trap implements ISkillHandler
trap.unSummon();
if (activeChar instanceof L2PcInstance)
- ((L2PcInstance) activeChar).sendPacket(SystemMessage.getSystemMessage(SystemMessageId.A_TRAP_DEVICE_HAS_BEEN_STOPPED));
+ activeChar.sendPacket(SystemMessageId.A_TRAP_DEVICE_HAS_BEEN_STOPPED);
}
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java
index c165ddbbc14cef9367b32031e04ced541d6923de..fb89705831449302a47825245817323561e040be 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java
@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
import com.l2jserver.gameserver.model.entity.Instance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.skills.L2SkillType;
import com.l2jserver.util.Rnd;
@@ -85,7 +84,7 @@ public class Unlock implements ISkillHandler
if ((!door.isUnlockable() && skill.getSkillType() != L2SkillType.UNLOCK_SPECIAL)
|| door.getFort() != null)
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.UNABLE_TO_UNLOCK_DOOR));
+ activeChar.sendPacket(SystemMessageId.UNABLE_TO_UNLOCK_DOOR);
activeChar.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -97,7 +96,7 @@ public class Unlock implements ISkillHandler
door.onOpen();
}
else
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_UNLOCK_DOOR));
+ activeChar.sendPacket(SystemMessageId.FAILED_TO_UNLOCK_DOOR);
}
else if (target instanceof L2ChestInstance)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java
index eda839dcc35c3e79246aeecf3a29ec802f6a4bdc..5b861600110d9c4e4e9a8ef83f8fee7ffb586b41 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java
@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.util.Util;
@@ -41,7 +40,7 @@ public class TargetArea implements ITargetTypeHandler
List<L2Character> targetList = new FastList<L2Character>();
if (((target == null || target == activeChar || target.isAlikeDead()) && skill.getCastRange() >= 0) || (!(target instanceof L2Attackable || target instanceof L2Playable)))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return _emptyTargetList;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java
index 9d2d98d72e7b0785a22b5c6ec729c011d74ddbba..9f8cce5645fed9920c45b819d876141b1746fd56 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java
@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.util.Util;
@@ -41,7 +40,7 @@ public class TargetAreaCorpseMob implements ITargetTypeHandler
List<L2Character> targetList = new FastList<L2Character>();
if ((!(target instanceof L2Attackable)) || !target.isDead())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return _emptyTargetList;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java
index c6e861f410ae7c447fff5b183b5c7434ff5e8abf..e13e2d1347b0fd961a9456871206775d8d4f7385 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java
@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.util.Util;
@@ -41,7 +40,7 @@ public class TargetBehindArea implements ITargetTypeHandler
List<L2Character> targetList = new FastList<L2Character>();
if (((target == null || target == activeChar || target.isAlikeDead()) && skill.getCastRange() >= 0) || (!(target instanceof L2Attackable || target instanceof L2Playable)))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return _emptyTargetList;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java
index d299e45b2403f3f2f2800d6ec7cc3eb4d0ffdb3c..7e0e55993600827b18d990ae5024c758abc62a99 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java
@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.skills.L2TargetType;
/**
@@ -41,7 +40,7 @@ public class TargetCorpseMob implements ITargetTypeHandler
final boolean isSummon = target instanceof L2SummonInstance;
if (!(isSummon || target instanceof L2Attackable) || !target.isDead())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return _emptyTargetList;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
index 728dfc662873540d600cc8a10f345ed6645b67a2..7e7eba49eec10d72c7851b5513015f8202c0ebe3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.skills.L2SkillType;
import com.l2jserver.gameserver.templates.skills.L2TargetType;
@@ -70,7 +69,7 @@ public class TargetCorpsePlayer implements ITargetTypeHandler
if (targetPlayer.isInsideZone(L2Character.ZONE_SIEGE) && !targetPlayer.isInSiege())
{
condGood = false;
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_BE_RESURRECTED_DURING_SIEGE));
+ activeChar.sendPacket(SystemMessageId.CANNOT_BE_RESURRECTED_DURING_SIEGE);
}
if (targetPlayer.isFestivalParticipant()) // Check to see if the current player target is in a festival.
@@ -81,9 +80,9 @@ public class TargetCorpsePlayer implements ITargetTypeHandler
if (targetPlayer.isReviveRequested())
{
if (targetPlayer.isRevivingPet())
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.MASTER_CANNOT_RES)); // While a pet is attempting to resurrect, it cannot help in resurrecting its master.
+ player.sendPacket(SystemMessageId.MASTER_CANNOT_RES); // While a pet is attempting to resurrect, it cannot help in resurrecting its master.
else
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED)); // Resurrection is already been proposed.
+ player.sendPacket(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed.
condGood = false;
}
}
@@ -94,9 +93,9 @@ public class TargetCorpsePlayer implements ITargetTypeHandler
if (targetPet.getOwner().isReviveRequested())
{
if (targetPet.getOwner().isRevivingPet())
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED)); // Resurrection is already been proposed.
+ player.sendPacket(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed.
else
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_RES_PET2)); // A pet cannot be resurrected while it's owner is in the process of resurrecting.
+ player.sendPacket(SystemMessageId.CANNOT_RES_PET2); // A pet cannot be resurrected while it's owner is in the process of resurrecting.
condGood = false;
}
}
@@ -115,7 +114,7 @@ public class TargetCorpsePlayer implements ITargetTypeHandler
}
}
}
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return _emptyTargetList;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java
index 7e1f6ae13f561232042b56bcf20e38d28a880274..fe7328d7039c0b57ecf271e99346e93556d56c36 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java
@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.util.Util;
@@ -41,7 +40,7 @@ public class TargetFrontArea implements ITargetTypeHandler
List<L2Character> targetList = new FastList<L2Character>();
if (((target == null || target == activeChar || target.isAlikeDead()) && skill.getCastRange() >= 0) || (!(target instanceof L2Attackable || target instanceof L2Playable)))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return _emptyTargetList;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOne.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOne.java
index 3f95650a84c85da230ef6f6decf9237060a3075d..3ede6c762551b7b801d3306f55d8000a5b17028a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOne.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOne.java
@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.skills.L2TargetType;
/**
@@ -56,7 +55,7 @@ public class TargetOne implements ITargetTypeHandler
// Check for null target or any other invalid target
if (target == null || target.isDead() || (target == activeChar && !canTargetSelf))
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return _emptyTargetList;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java
index d80062c9ca4b9f57a6308b66658a2c486b8179c2..2443796533451c91ef8672aa3db717ced4515a56 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java
@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.skills.L2TargetType;
/**
@@ -57,7 +56,7 @@ public class TargetPartyMember implements ITargetTypeHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return _emptyTargetList;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java
index 61f9b13c2b5882b1ca3cb75b992cfe23049c1095..ba29b857d5ff62996249da3ceb1faeee84607738 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java
@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.model.L2Skill;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.skills.L2TargetType;
/**
@@ -61,7 +60,7 @@ public class TargetPartyOther implements ITargetTypeHandler
}
else
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return _emptyTargetList;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java
index 575f275a211b7e2ceca0c25a7efd269ac06222ab..ede6462b6e0c08a89bdcd949d96090ab9d1735e7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java
@@ -49,7 +49,7 @@ public class ChannelLeave implements IUserCommandHandler
L2Party party = activeChar.getParty();
channel.removeParty(party);
- party.getLeader().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.LEFT_COMMAND_CHANNEL));
+ party.getLeader().sendPacket(SystemMessageId.LEFT_COMMAND_CHANNEL);
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_PARTY_LEFT_COMMAND_CHANNEL);
sm.addString(party.getLeader().getName());
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java
index 06cbe61885965378b57b37c54cffd5159d5fc817..d42b2ed5c2dc52665924f887cd73fcd227de19af 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java
@@ -67,7 +67,7 @@ public class ClanWarsList implements IUserCommandHandler
if (id == 88)
{
// Attack List
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLANS_YOU_DECLARED_WAR_ON));
+ activeChar.sendPacket(SystemMessageId.CLANS_YOU_DECLARED_WAR_ON);
statement = con.prepareStatement("select clan_name,clan_id,ally_id,ally_name from clan_data,clan_wars where clan1=? and clan_id=clan2 and clan2 not in (select clan1 from clan_wars where clan2=?)");
statement.setInt(1, clan.getClanId());
statement.setInt(2, clan.getClanId());
@@ -75,7 +75,7 @@ public class ClanWarsList implements IUserCommandHandler
else if (id == 89)
{
// Under Attack List
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLANS_THAT_HAVE_DECLARED_WAR_ON_YOU));
+ activeChar.sendPacket(SystemMessageId.CLANS_THAT_HAVE_DECLARED_WAR_ON_YOU);
statement = con.prepareStatement("select clan_name,clan_id,ally_id,ally_name from clan_data,clan_wars where clan2=? and clan_id=clan1 and clan1 not in (select clan2 from clan_wars where clan1=?)");
statement.setInt(1, clan.getClanId());
statement.setInt(2, clan.getClanId());
@@ -84,7 +84,7 @@ public class ClanWarsList implements IUserCommandHandler
// ID = 90
{
// War List
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.WAR_LIST));
+ activeChar.sendPacket(SystemMessageId.WAR_LIST);
statement = con.prepareStatement("select clan_name,clan_id,ally_id,ally_name from clan_data,clan_wars where clan1=? and clan_id=clan2 and clan2 in (select clan1 from clan_wars where clan2=?)");
statement.setInt(1, clan.getClanId());
statement.setInt(2, clan.getClanId());
@@ -114,7 +114,7 @@ public class ClanWarsList implements IUserCommandHandler
activeChar.sendPacket(sm);
}
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FRIEND_LIST_FOOTER));
+ activeChar.sendPacket(SystemMessageId.FRIEND_LIST_FOOTER);
rset.close();
statement.close();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java
index 00be9d901a1021a65cea6a1e20b1984d3df28ed4..50c6e19623a3744511008cb6b4900f2168d57f63 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java
@@ -68,7 +68,7 @@ public class InstanceZone implements IUserCommandHandler
if (firstMessage)
{
firstMessage = false;
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INSTANCE_ZONE_TIME_LIMIT));
+ activeChar.sendPacket(SystemMessageId.INSTANCE_ZONE_TIME_LIMIT);
}
int hours = (int) (remainingTime / 3600);
int minutes = (int) ((remainingTime%3600) / 60);
@@ -82,7 +82,7 @@ public class InstanceZone implements IUserCommandHandler
InstanceManager.getInstance().deleteInstanceTime(activeChar.getObjectId(), instanceId);
}
if (firstMessage)
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NO_INSTANCEZONE_TIME_LIMIT));
+ activeChar.sendPacket(SystemMessageId.NO_INSTANCEZONE_TIME_LIMIT);
return true;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java
index 5c9764969c16960c57a53ad5896c7819b9280caa..e01fa83abbdaa46bba438ece40bae17815a31047 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java
@@ -42,8 +42,8 @@ public class PartyInfo implements IUserCommandHandler
if (!activeChar.isInParty())
{
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PARTY_INFORMATION));
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FRIEND_LIST_FOOTER));
+ activeChar.sendPacket(SystemMessageId.PARTY_INFORMATION);
+ activeChar.sendPacket(SystemMessageId.FRIEND_LIST_FOOTER);
return false;
}
@@ -52,24 +52,24 @@ public class PartyInfo implements IUserCommandHandler
int lootDistribution = playerParty.getLootDistribution();
String partyLeader = playerParty.getPartyMembers().get(0).getName();
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PARTY_INFORMATION));
+ activeChar.sendPacket(SystemMessageId.PARTY_INFORMATION);
switch (lootDistribution)
{
case L2Party.ITEM_LOOTER:
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.LOOTING_FINDERS_KEEPERS));
+ activeChar.sendPacket(SystemMessageId.LOOTING_FINDERS_KEEPERS);
break;
case L2Party.ITEM_ORDER:
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.LOOTING_BY_TURN));
+ activeChar.sendPacket(SystemMessageId.LOOTING_BY_TURN);
break;
case L2Party.ITEM_ORDER_SPOIL:
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.LOOTING_BY_TURN_INCLUDE_SPOIL));
+ activeChar.sendPacket(SystemMessageId.LOOTING_BY_TURN_INCLUDE_SPOIL);
break;
case L2Party.ITEM_RANDOM:
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.LOOTING_RANDOM));
+ activeChar.sendPacket(SystemMessageId.LOOTING_RANDOM);
break;
case L2Party.ITEM_RANDOM_SPOIL:
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.LOOTING_RANDOM_INCLUDE_SPOIL));
+ activeChar.sendPacket(SystemMessageId.LOOTING_RANDOM_INCLUDE_SPOIL);
break;
}
@@ -79,7 +79,7 @@ public class PartyInfo implements IUserCommandHandler
activeChar.sendMessage("Members: " + memberCount + "/9");
- activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FRIEND_LIST_FOOTER));
+ activeChar.sendPacket(SystemMessageId.FRIEND_LIST_FOOTER);
return true;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java
index 23bee5f6258846c4574baf6fbd65b96a066849e5..a28046ba92079e2fbbb0176bdbed3f012b7debcf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java
@@ -43,7 +43,6 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.MinionList;
import com.l2jserver.gameserver.util.Util;
import com.l2jserver.util.Rnd;
@@ -528,7 +527,7 @@ public class TowerOfNaia extends Quest
{
if (player.getParty() == null)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CAN_OPERATE_MACHINE_WHEN_IN_PARTY));
+ player.sendPacket(SystemMessageId.CAN_OPERATE_MACHINE_WHEN_IN_PARTY);
return null;
}
return "manager.htm";
@@ -709,7 +708,7 @@ public class TowerOfNaia extends Quest
}
else
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CAN_OPERATE_MACHINE_WHEN_IN_PARTY));
+ player.sendPacket(SystemMessageId.CAN_OPERATE_MACHINE_WHEN_IN_PARTY);
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
index 279c229f2cc4a1b1caee4911fb5a49cd8f04fcb8..232404367498621f416805c62552039a231f96a6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
@@ -46,7 +46,6 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.MinionList;
import com.l2jserver.gameserver.util.Util;
import com.l2jserver.util.Rnd;
@@ -1000,7 +999,7 @@ public class TullyWorkshop extends Quest
{
if (party.getPartyLeaderOID() != player.getObjectId())
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+ player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
}
else
{
@@ -1104,7 +1103,7 @@ public class TullyWorkshop extends Quest
{
if (party.getPartyLeaderOID() != player.getObjectId())
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+ player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
return null;
}
@@ -1135,7 +1134,7 @@ public class TullyWorkshop extends Quest
{
if (party.getPartyLeaderOID() != player.getObjectId())
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+ player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
}
else if (!Util.checkIfInRange(3000, player, npc, true))
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
index 70e84c9ad24e29420fa4a0d852ae1df07ad84b7f..dc79ef90de433f020be7926e1ac63cccb13acecb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
@@ -355,12 +355,12 @@ public class CrystalCaverns extends Quest
L2Party party = player.getParty();
if (party == null)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_IN_PARTY_CANT_ENTER));
+ player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
return false;
}
if (party.getLeader() != player)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+ player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
return false;
}
for (L2PcInstance partyMember : party.getPartyMembers())
@@ -406,12 +406,12 @@ public class CrystalCaverns extends Quest
L2Party party = player.getParty();
if (party == null)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_IN_PARTY_CANT_ENTER));
+ player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
return false;
}
if (party.getLeader() != player)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+ player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
return false;
}
for (L2PcInstance partyMember : party.getPartyMembers())
@@ -440,12 +440,12 @@ public class CrystalCaverns extends Quest
L2Party party = player.getParty();
if (party == null)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_IN_PARTY_CANT_ENTER));
+ player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
return false;
}
if (party.getLeader() != player)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+ player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
return false;
}
for (L2PcInstance partyMember : party.getPartyMembers())
@@ -536,7 +536,7 @@ public class CrystalCaverns extends Quest
{
if (!(world instanceof CCWorld))
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+ player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
return 0;
}
teleto.instanceId = world.instanceId;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 6e25cbc0d7452c7320781a589b5f93499ebc336d..57372c56ef6058ac2ba6874a1dc4a392132ab530 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -231,17 +231,17 @@ public class DarkCloudMansion extends Quest
L2Party party = player.getParty();
if (party == null)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_IN_PARTY_CANT_ENTER));
+ player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
return false;
}
if (party.getLeader() != player)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+ player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
return false;
}
if (party.getMemberCount() > 2)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER));
+ player.sendPacket(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER);
return false;
}
for (L2PcInstance partyMember : party.getPartyMembers())
@@ -284,7 +284,7 @@ public class DarkCloudMansion extends Quest
{
if (!(world instanceof DMCWorld))
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+ player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
return 0;
}
teleto.instanceId = world.instanceId;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DemonPrinceFloor/DemonPrinceFloor.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DemonPrinceFloor/DemonPrinceFloor.java
index 25fe75027c1ddb7864a5b7582db617b08af2b6da..a05a1680338b91e1169c5681f4bf011973a25243 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DemonPrinceFloor/DemonPrinceFloor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DemonPrinceFloor/DemonPrinceFloor.java
@@ -152,7 +152,7 @@ public class DemonPrinceFloor extends Quest
if (player.getObjectId() != party.getPartyLeaderOID())
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+ player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
index 6a1af83ce98a4a25dcab34915f355cb1c06d4059..1a2b16168767c73c18c390bbdf93f0631808d728 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
@@ -420,18 +420,18 @@ public class FinalEmperialTomb extends Quest
L2Party party = player.getParty();
if (party == null)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_IN_PARTY_CANT_ENTER));
+ player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
return false;
}
L2CommandChannel channel = player.getParty().getCommandChannel();
if (channel == null)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_IN_COMMAND_CHANNEL_CANT_ENTER));
+ player.sendPacket(SystemMessageId.NOT_IN_COMMAND_CHANNEL_CANT_ENTER);
return false;
}
else if (channel.getChannelLeader() != player)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+ player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
return false;
}
else if (player.getInventory().getItemByItemId(8073) == null)
@@ -443,7 +443,7 @@ public class FinalEmperialTomb extends Quest
}
else if (channel.getMemberCount() < MIN_PLAYERS || channel.getMemberCount() > MAX_PLAYERS)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER));
+ player.sendPacket(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER);
return false;
}
for (L2PcInstance channelMember : channel.getMembers())
@@ -490,7 +490,7 @@ public class FinalEmperialTomb extends Quest
{
if (!(world instanceof FETWorld))
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+ player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
return 0;
}
teleportPlayer(player, coords, world.instanceId);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java
index e25da4be84c53c81d93ad12af7c2c4b19650e1ec..5c463855adc9771fe033ae914dbaac95ebe70a9a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java
@@ -392,7 +392,7 @@ public class HellboundTown extends Quest
if (player.getObjectId() != party.getPartyLeaderOID())
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+ player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
return false;
}
@@ -441,7 +441,7 @@ public class HellboundTown extends Quest
{
if (!(world instanceof TownWorld))
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+ player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
return 0;
}
else
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index 4410c40bb04ae44c99b982f2e1d88c7411e2e5d3..015635918cfa9de4db4595d48b7ba8c58fe0f91e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -439,19 +439,19 @@ public class Kamaloka extends Quest
// player must be in party
if (party == null)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_IN_PARTY_CANT_ENTER));
+ player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
return false;
}
// ...and be party leader
if (party.getLeader() != player)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+ player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
return false;
}
// party must not exceed max size for selected instance
if (party.getMemberCount() > MAX_PARTY_SIZE[index])
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER));
+ player.sendPacket(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER);
return false;
}
@@ -579,7 +579,7 @@ public class Kamaloka extends Quest
if (!(world instanceof KamaWorld)
|| world.templateId != templateId)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+ player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
return;
}
// check for level difference again on reenter
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index f1473dbdb1ad79d98dca727570694a18bf42a4a4..e71b0fa6ed7177bcb5ed61f40e8579979ac905c9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -234,7 +234,7 @@ public class NornilsGarden extends Quest
{
if (!(world instanceof NornilsWorld) || world.templateId != INSTANCE_ID)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+ player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
return null;
}
// check for level difference again on reenter
@@ -393,13 +393,13 @@ public class NornilsGarden extends Quest
// player must be in party
if (party == null)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_IN_PARTY_CANT_ENTER));
+ player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
return "32330-05.html";
}
// ...and be party leader
if (party.getLeader() != player)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+ player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
return "32330-08.html";
}
boolean _kamael = false;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
index 95106fe9fdabb264c23934e4357e547ee8859750..c2c151f758342b9373aa8dddfe18ff6e4c821f69 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
@@ -38,7 +38,6 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.model.zone.L2ZoneType;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.util.Rnd;
public class PailakaDevilsLegacy extends Quest
@@ -184,7 +183,7 @@ public class PailakaDevilsLegacy extends Quest
{
if (world.templateId != INSTANCE_ID)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+ player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
return;
}
Instance inst = InstanceManager.getInstance().getInstance(world.instanceId);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaSongOfIceAndFire.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaSongOfIceAndFire.java
index 06ea57ad20b471e9b147450f894137cc7d0a85dd..b75d5e75584f7ad9a1dcf7eac71948fef1c118d6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaSongOfIceAndFire.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaSongOfIceAndFire.java
@@ -28,7 +28,6 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.model.zone.L2ZoneType;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.util.Rnd;
public class PailakaSongOfIceAndFire extends Quest
@@ -155,7 +154,7 @@ public class PailakaSongOfIceAndFire extends Quest
{
if (world.templateId != INSTANCE_ID)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+ player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
return;
}
Instance inst = InstanceManager.getInstance().getInstance(world.instanceId);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
index ad277cba755e12afad0b09cac5ef0203f5585304..009350a8c53a00d974ff539a5f433978490c97a0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
@@ -361,23 +361,23 @@ public class Stage1 extends Quest
final L2Party party = player.getParty();
if (party == null)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_IN_PARTY_CANT_ENTER));
+ player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
return false;
}
final L2CommandChannel channel = player.getParty().getCommandChannel();
if (channel == null)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_IN_COMMAND_CHANNEL_CANT_ENTER));
+ player.sendPacket(SystemMessageId.NOT_IN_COMMAND_CHANNEL_CANT_ENTER);
return false;
}
else if (channel.getChannelLeader() != player)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+ player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
return false;
}
else if (channel.getMemberCount() < MIN_PLAYERS || channel.getMemberCount() > MAX_PLAYERS)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER));
+ player.sendPacket(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER);
return false;
}
for (L2PcInstance partyMember : channel.getMembers())
@@ -424,7 +424,7 @@ public class Stage1 extends Quest
{
if (!(world instanceof SOD1World))
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+ player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
return 0;
}
teleportPlayer(player, coords, world.instanceId);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
index c42cec984e9851f3dffa4b13c8b15b61fc89f33c..01e7696bd86665ad990cb58280c61392394565b9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
@@ -139,12 +139,12 @@ public class HallOfSuffering extends Quest
L2Party party = player.getParty();
if (party == null)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_IN_PARTY_CANT_ENTER));
+ player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
return false;
}
if (party.getLeader() != player)
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+ player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
return false;
}
for (L2PcInstance partyMember : party.getPartyMembers())
@@ -191,7 +191,7 @@ public class HallOfSuffering extends Quest
{
if (!(world instanceof HSWorld))
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+ player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
return 0;
}
teleportPlayer(player, coords, world.instanceId);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java
index dd2eee8d3aa2af0064fbda76dfcb9829c71097b5..5ea16082f204b22a5cad19ed55b7a5b4aad769f3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java
@@ -538,14 +538,14 @@ public class Q350_EnhanceYourWeapon extends Quest
// If the crystal level is way too high for this mob, say that we can't increase it
if (!_npcLevelingInfos.get(mob.getNpcId()).containsKey(sc.getLevel()))
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SOUL_CRYSTAL_ABSORBING_REFUSED));
+ player.sendPacket(SystemMessageId.SOUL_CRYSTAL_ABSORBING_REFUSED);
return;
}
if (Rnd.get(100) <= _npcLevelingInfos.get(mob.getNpcId()).get(sc.getLevel()).getChance())
exchangeCrystal(player, mob, sc.getItemId(), sc.getLeveledItemId(), false);
else
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SOUL_CRYSTAL_ABSORBING_FAILED));
+ player.sendPacket(SystemMessageId.SOUL_CRYSTAL_ABSORBING_FAILED);
}
private void exchangeCrystal(L2PcInstance player, L2Attackable mob, int takeid, int giveid, boolean broke)
@@ -564,10 +564,10 @@ public class Q350_EnhanceYourWeapon extends Quest
// Send a sound event and text message to the player
if (broke)
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SOUL_CRYSTAL_BROKE));
+ player.sendPacket(SystemMessageId.SOUL_CRYSTAL_BROKE);
else
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SOUL_CRYSTAL_ABSORBING_SUCCEEDED));
+ player.sendPacket(SystemMessageId.SOUL_CRYSTAL_ABSORBING_SUCCEEDED);
// Send system message
SystemMessage sms = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
index a68d60962fba48938d05593e635e635b02dae37f..9703cd1caaefef69ccc677e6e0c8df0207c5accc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
@@ -30,7 +30,6 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.SkillHolder;
import com.l2jserver.gameserver.util.Util;
import com.l2jserver.util.Rnd;
@@ -127,7 +126,7 @@ public final class Q511_AwlUnderFoot extends Quest
{
if (!(world instanceof FAUWorld))
{
- player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+ player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
return "";
}
teleportPlayer(player, coords, world.instanceId);