From 037da2abc7f23cb4b5281bf6ac9b5fa749480f40 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 31 Jan 2020 00:15:30 +0000 Subject: [PATCH] Proper usage of sendMessage method. --- .../gameserver/RecipeController.java | 6 +-- .../admincommandhandlers/AdminDelete.java | 10 ++--- .../admincommandhandlers/AdminDisconnect.java | 11 ++--- .../admincommandhandlers/AdminEffects.java | 23 +++++------ .../admincommandhandlers/AdminHeal.java | 5 +-- .../admincommandhandlers/AdminMenu.java | 17 ++------ .../admincommandhandlers/AdminRideWyvern.java | 13 ++---- .../admincommandhandlers/AdminTarget.java | 11 ++--- .../admincommandhandlers/AdminTeleport.java | 10 +---- .../handler/itemhandlers/ChristmasTree.java | 8 +--- .../handler/itemhandlers/JackpotSeed.java | 10 +---- .../handler/skillhandlers/BalanceLife.java | 6 +-- .../handler/skillhandlers/SiegeFlag.java | 40 +++++++++---------- .../skillhandlers/StrSiegeAssault.java | 31 +++++++------- .../handler/skillhandlers/TakeCastle.java | 36 ++++++++--------- .../handler/skillhandlers/TakeFort.java | 2 +- .../handler/skillhandlers/Unlock.java | 4 +- .../handler/usercommandhandlers/Escape.java | 9 +---- .../voicedcommandhandlers/SetClanCmd.java | 6 +-- .../instancemanager/FortSiegeManager.java | 15 +++---- .../instancemanager/SiegeManager.java | 15 +++---- .../org/l2jmobius/gameserver/model/Skill.java | 14 ++----- .../gameserver/model/actor/Creature.java | 17 +++++--- .../model/actor/instance/DoormanInstance.java | 26 +++--------- .../model/actor/instance/PlayerInstance.java | 1 + .../actor/instance/TeleporterInstance.java | 5 +-- .../actor/instance/WyvernManagerInstance.java | 26 +++--------- .../gameserver/model/quest/Quest.java | 5 +-- .../model/skills/effects/EffectRelax.java | 4 +- .../model/skills/handlers/SkillDefault.java | 6 +-- .../model/skills/handlers/SkillElemental.java | 6 +-- .../clientpackets/RequestChangePetName.java | 4 +- .../clientpackets/RequestDeleteMacro.java | 6 --- .../clientpackets/RequestGiveNickName.java | 8 +--- .../clientpackets/RequestQuestAbort.java | 6 +-- .../clientpackets/RequestUserCommand.java | 11 +---- 36 files changed, 137 insertions(+), 296 deletions(-) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/RecipeController.java index 13f0a6d229..f5b175482a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/RecipeController.java @@ -27,6 +27,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.xml.RecipeData; import org.l2jmobius.gameserver.model.Inventory; import org.l2jmobius.gameserver.model.ManufactureItem; @@ -153,10 +154,7 @@ public class RecipeController // check if already busy (possible in alt mode only) if (Config.ALT_GAME_CREATION && ((maker = _activeMakers.get(player)) != null)) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("You are busy creating "); - sm.addItemName(recipeList.getItemId()); - player.sendPacket(sm); + player.sendMessage("You are busy creating " + ItemTable.getInstance().getTemplate(recipeList.getItemId()).getName()); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDelete.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDelete.java index a6f37db763..76396c519d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDelete.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDelete.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.BuilderUtil; /** * This class handles following admin commands: - delete = deletes target @@ -86,15 +86,11 @@ public class AdminDelete implements IAdminCommandHandler } } - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Deleted " + target.getName() + " from " + target.getObjectId() + "."); - activeChar.sendPacket(sm); + BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + "."); } else { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Incorrect target."); - activeChar.sendPacket(sm); + activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDisconnect.java index 844584eef2..9206690c9a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDisconnect.java @@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.BuilderUtil; /** * This class handles following admin commands: - character_disconnect = disconnects target player @@ -66,15 +65,11 @@ public class AdminDisconnect implements IAdminCommandHandler if (player.getObjectId() == activeChar.getObjectId()) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("You cannot logout your character."); - activeChar.sendPacket(sm); + BuilderUtil.sendSysMessage(activeChar, "You cannot logout your character."); } else { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Character " + player.getName() + " disconnected from server."); - activeChar.sendPacket(sm); + BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); // Logout Character player.sendPacket(new LeaveWorld()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java index fba18bba66..37e5e88121 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java @@ -38,7 +38,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.StopMove; import org.l2jmobius.gameserver.network.serverpackets.SunRise; import org.l2jmobius.gameserver.network.serverpackets.SunSet; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.util.BuilderUtil; @@ -398,9 +397,7 @@ public class AdminEffects implements IAdminCommandHandler if (teamVal != 0) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("You have joined team " + teamVal); - player.sendPacket(sm); + BuilderUtil.sendSysMessage(player, "You have joined team " + teamVal); } player.broadcastUserInfo(); @@ -433,9 +430,7 @@ public class AdminEffects implements IAdminCommandHandler if (teamVal != 0) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("You have joined team " + teamVal); - player.sendPacket(sm); + BuilderUtil.sendSysMessage(player, "You have joined team " + teamVal); } player.broadcastUserInfo(); @@ -461,7 +456,7 @@ public class AdminEffects implements IAdminCommandHandler { if (performSocial(social, player, activeChar)) { - activeChar.sendMessage(player.getName() + " was affected by your request."); + BuilderUtil.sendSysMessage(activeChar, player.getName() + " was affected by your request."); } } else @@ -478,7 +473,7 @@ public class AdminEffects implements IAdminCommandHandler } } - activeChar.sendMessage(radius + " units radius affected by your request."); + BuilderUtil.sendSysMessage(activeChar, radius + " units radius affected by your request."); } catch (NumberFormatException nbe) { @@ -498,7 +493,7 @@ public class AdminEffects implements IAdminCommandHandler if (performSocial(social, obj, activeChar)) { - activeChar.sendMessage(obj.getName() + " was affected by your request."); + BuilderUtil.sendSysMessage(activeChar, obj.getName() + " was affected by your request."); } else { @@ -555,7 +550,7 @@ public class AdminEffects implements IAdminCommandHandler { if (performAbnormal(abnormal, player)) { - activeChar.sendMessage(player.getName() + "'s abnormal status was affected by your request."); + BuilderUtil.sendSysMessage(activeChar, player.getName() + "'s abnormal status was affected by your request."); } else { @@ -576,7 +571,7 @@ public class AdminEffects implements IAdminCommandHandler } } - activeChar.sendMessage(radius + " units radius affected by your request."); + BuilderUtil.sendSysMessage(activeChar, radius + " units radius affected by your request."); } catch (NumberFormatException nbe) { @@ -596,7 +591,7 @@ public class AdminEffects implements IAdminCommandHandler if (performAbnormal(abnormal, obj)) { - activeChar.sendMessage(obj.getName() + "'s abnormal status was affected by your request."); + BuilderUtil.sendSysMessage(activeChar, obj.getName() + "'s abnormal status was affected by your request."); } else { @@ -646,7 +641,7 @@ public class AdminEffects implements IAdminCommandHandler final Creature target = (Creature) obj; target.broadcastPacket(new MagicSkillUse(target, activeChar, skill, level, hittime, 0)); - activeChar.sendMessage(obj.getName() + " performs MSU " + skill + "/" + level + " by your request."); + BuilderUtil.sendSysMessage(activeChar, obj.getName() + " performs MSU " + skill + "/" + level + " by your request."); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminHeal.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminHeal.java index 36fd1ea59b..77fa0d9df8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminHeal.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -52,9 +51,7 @@ public class AdminHeal implements IAdminCommandHandler } catch (StringIndexOutOfBoundsException e) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Incorrect target/radius specified."); - activeChar.sendPacket(sm); + BuilderUtil.sendSysMessage(activeChar, "Incorrect target/radius specified."); } } return true; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMenu.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMenu.java index 42c658fda2..d5f84dc350 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMenu.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -187,19 +186,15 @@ public class AdminMenu implements IAdminCommandHandler st.nextToken(); final String player = st.nextToken(); final PlayerInstance plyr = World.getInstance().getPlayer(player); - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - if (plyr != null) { plyr.logout(); - sm.addString("You kicked " + plyr.getName() + " from the game."); + BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } else { - sm.addString("Player " + player + " was not found in the game."); + BuilderUtil.sendSysMessage(activeChar, "Player " + player + " was not found in the game."); } - - activeChar.sendPacket(sm); } showMainPage(activeChar); @@ -346,19 +341,15 @@ public class AdminMenu implements IAdminCommandHandler if (result.next()) { final String accName = result.getString(1); - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - if (accName.length() > 0) { LoginServerThread.getInstance().sendAccessLevel(accName, banLevel); - sm.addString("Account Access Level for " + player + " set to " + banLevel + "."); + BuilderUtil.sendSysMessage(activeChar, "Account Access Level for " + player + " set to " + banLevel + "."); } else { - sm.addString("Couldn't find player: " + player + "."); + BuilderUtil.sendSysMessage(activeChar, "Couldn't find player: " + player + "."); } - - activeChar.sendPacket(sm); } else { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminRideWyvern.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminRideWyvern.java index 1fd5a9728c..d1310539ef 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminRideWyvern.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminRideWyvern.java @@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Ride; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminRideWyvern implements IAdminCommandHandler { @@ -41,10 +40,7 @@ public class AdminRideWyvern implements IAdminCommandHandler { if (activeChar.isMounted() || (activeChar.getPet() != null)) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Already Have a Pet or Mounted."); - activeChar.sendPacket(sm); - + BuilderUtil.sendSysMessage(activeChar, "Already Have a Pet or Mounted."); return false; } @@ -63,10 +59,7 @@ public class AdminRideWyvern implements IAdminCommandHandler } else { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Command '" + command + "' not recognized"); - activeChar.sendPacket(sm); - + BuilderUtil.sendSysMessage(activeChar, "Command '" + command + "' not recognized"); return false; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTarget.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTarget.java index 5f9b247a2d..0158c61dbb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTarget.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTarget.java @@ -20,8 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.BuilderUtil; /** * This class handles following admin commands: - target name = sets player with respective name as target @@ -64,16 +63,12 @@ public class AdminTarget implements IAdminCommandHandler } else { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Player " + targetName + " not found"); - activeChar.sendPacket(sm); + BuilderUtil.sendSysMessage(activeChar, "Player " + targetName + " not found"); } } catch (IndexOutOfBoundsException e) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Please specify correct name."); - activeChar.sendPacket(sm); + BuilderUtil.sendSysMessage(activeChar, "Please specify correct name."); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java index 779dc950b9..03b95be52f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java @@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -506,10 +505,7 @@ public class AdminTeleport implements IAdminCommandHandler { activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); activeChar.teleToLocation(x, y, z, false); - - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("You have been teleported to " + x + " " + y + " " + z); - activeChar.sendPacket(sm); + BuilderUtil.sendSysMessage(activeChar, "You have been teleported to " + x + " " + y + " " + z); } private void showTeleportWindow(PlayerInstance activeChar) @@ -631,9 +627,7 @@ public class AdminTeleport implements IAdminCommandHandler SpawnTable.getInstance().addNewSpawn(spawn, !custom_boss_spawn); spawn.init(); - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Created " + template1.getName() + " on " + target.getObjectId() + "."); - activeChar.sendPacket(sm); + BuilderUtil.sendSysMessage(activeChar, "Created " + template1.getName() + " on " + target.getObjectId() + "."); } catch (Exception e) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java index f0ad9160f9..c1964d33ee 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.spawn.Spawn; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class ChristmasTree implements IItemHandler { @@ -83,15 +81,11 @@ public class ChristmasTree implements IItemHandler player.destroyItem("Consume", item.getObjectId(), 1, null, false); - player.sendPacket(new SystemMessage(SystemMessageId.S1_S2)); - ThreadPool.schedule(new DeSpawn(result), 3600000); } catch (Exception e) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Target is not ingame."); - player.sendPacket(sm); + player.sendMessage("Target is not ingame."); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java index c35266e72d..12dd987987 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.spawn.Spawn; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class JackpotSeed implements IItemHandler { @@ -74,15 +72,11 @@ public class JackpotSeed implements IItemHandler World.getInstance().storeObject(gourd); gourd.setOwner(player.getName()); player.destroyItem("Consume", item.getObjectId(), 1, null, false); - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Created " + template1.getName() + " at x: " + spawn.getX() + " y: " + spawn.getY() + " z: " + spawn.getZ()); - player.sendPacket(sm); + player.sendMessage("Created " + template1.getName() + " at x: " + spawn.getX() + " y: " + spawn.getY() + " z: " + spawn.getZ()); } catch (Exception e) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Target is not ingame."); - player.sendPacket(sm); + player.sendMessage("Target is not ingame."); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/BalanceLife.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/BalanceLife.java index 6954b96619..0b1ac33543 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/BalanceLife.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/BalanceLife.java @@ -24,9 +24,7 @@ import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** * @author earendil @@ -125,9 +123,7 @@ public class BalanceLife implements ISkillHandler su.addAttribute(StatusUpdate.CUR_HP, (int) target.getCurrentHp()); target.sendPacket(su); - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("HP of the party has been balanced."); - target.sendPacket(sm); + target.sendMessage("HP of the party has been balanced."); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java index 66d7732784..832447b9c2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java @@ -32,8 +32,6 @@ import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; import org.l2jmobius.gameserver.model.entity.siege.Castle; import org.l2jmobius.gameserver.model.entity.siege.Fort; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** * @author _drunk_ @@ -145,41 +143,40 @@ public class SiegeFlag implements ISkillHandler return false; } - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); final PlayerInstance player = (PlayerInstance) creature; - + String message = ""; if ((castle == null) || (castle.getCastleId() <= 0)) { - sm.addString("You must be on castle ground to place a flag"); + message = "You must be on castle ground to place a flag."; } else if (!castle.getSiege().isInProgress()) { - sm.addString("You can only place a flag during a siege."); + message = "You can only place a flag during a siege."; } else if (castle.getSiege().getAttackerClan(player.getClan()) == null) { - sm.addString("You must be an attacker to place a flag"); + message = "You must be an attacker to place a flag."; } else if ((player.getClan() == null) || !player.isClanLeader()) { - sm.addString("You must be a clan leader to place a flag"); + message = "You must be a clan leader to place a flag."; } else if (castle.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= SiegeManager.getInstance().getFlagMaxCount()) { - sm.addString("You have already placed the maximum number of flags possible"); + message = "You have already placed the maximum number of flags possible."; } else if (player.isInsideZone(ZoneId.NO_HQ)) { - sm.addString("You cannot place flag here."); + message = "You cannot place flag here."; } else { return true; } - if (!isCheckOnly) + if (!isCheckOnly && !message.isEmpty()) { - player.sendPacket(sm); + player.sendMessage(message); } return false; } @@ -191,41 +188,40 @@ public class SiegeFlag implements ISkillHandler return false; } - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); final PlayerInstance player = (PlayerInstance) creature; - + String message = ""; if ((fort == null) || (fort.getFortId() <= 0)) { - sm.addString("You must be on fort ground to place a flag"); + message = "You must be on fort ground to place a flag."; } else if (!fort.getSiege().isInProgress()) { - sm.addString("You can only place a flag during a siege."); + message = "You can only place a flag during a siege."; } else if (fort.getSiege().getAttackerClan(player.getClan()) == null) { - sm.addString("You must be an attacker to place a flag"); + message = "You must be an attacker to place a flag."; } else if ((player.getClan() == null) || !player.isClanLeader()) { - sm.addString("You must be a clan leader to place a flag"); + message = "You must be a clan leader to place a flag."; } else if (fort.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= FortSiegeManager.getInstance().getFlagMaxCount()) { - sm.addString("You have already placed the maximum number of flags possible"); + message = "You have already placed the maximum number of flags possible."; } else if (player.isInsideZone(ZoneId.NO_HQ)) { - sm.addString("You cannot place flag here."); + message = "You cannot place flag here."; } else { return true; } - if (!isCheckOnly) + if (!isCheckOnly && !message.isEmpty()) { - player.sendPacket(sm); + player.sendMessage(message); } return false; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java index 8ccd6ca64e..954532b3b2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.entity.siege.Fort; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Formulas; -import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** @@ -185,33 +184,32 @@ public class StrSiegeAssault implements ISkillHandler return false; } - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); final PlayerInstance player = (PlayerInstance) creature; - + String message = ""; if ((castle == null) || (castle.getCastleId() <= 0)) { - sm.addString("You must be on castle ground to use strider siege assault"); + message = "You must be on castle ground to use strider siege assault"; } else if (!castle.getSiege().isInProgress()) { - sm.addString("You can only use strider siege assault during a siege."); + message = "You can only use strider siege assault during a siege."; } else if (!(player.getTarget() instanceof DoorInstance)) { - sm.addString("You can only use strider siege assault on doors and walls."); + message = "You can only use strider siege assault on doors and walls."; } else if (!creature.isRiding()) { - sm.addString("You can only use strider siege assault when on strider."); + message = "You can only use strider siege assault when on strider."; } else { return true; } - if (!isCheckOnly) + if (!isCheckOnly && !message.isEmpty()) { - player.sendPacket(sm); + player.sendMessage(message); } return false; @@ -224,33 +222,32 @@ public class StrSiegeAssault implements ISkillHandler return false; } - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); final PlayerInstance player = (PlayerInstance) creature; - + String message = ""; if ((fort == null) || (fort.getFortId() <= 0)) { - sm.addString("You must be on fort ground to use strider siege assault"); + message = "You must be on fort ground to use strider siege assault."; } else if (!fort.getSiege().isInProgress()) { - sm.addString("You can only use strider siege assault during a siege."); + message = "You can only use strider siege assault during a siege."; } else if (!(player.getTarget() instanceof DoorInstance)) { - sm.addString("You can only use strider siege assault on doors and walls."); + message = "You can only use strider siege assault on doors and walls."; } else if (!creature.isRiding()) { - sm.addString("You can only use strider siege assault when on strider."); + message = "You can only use strider siege assault when on strider."; } else { return true; } - if (!isCheckOnly) + if (!isCheckOnly && !message.isEmpty()) { - player.sendPacket(sm); + player.sendMessage(message); } return false; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeCastle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeCastle.java index 02125c2628..ffe997e45c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeCastle.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeCastle.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.siege.Castle; import org.l2jmobius.gameserver.model.entity.siege.Fort; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Util; /** @@ -127,28 +125,27 @@ public class TakeCastle implements ISkillHandler return false; } - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); final PlayerInstance player = (PlayerInstance) creature; - + String message = ""; if ((castle == null) || (castle.getCastleId() <= 0)) { - sm.addString("You must be on castle ground to use this skill"); + message = "You must be on castle ground to use this skill."; } else if ((player.getTarget() == null) || !player.getTarget().isArtefact()) { - sm.addString("You can only use this skill on an artifact"); + message = "You can only use this skill on an artifact."; } else if (!castle.getSiege().isInProgress()) { - sm.addString("You can only use this skill during a siege."); + message = "You can only use this skill during a siege."; } else if (!Util.checkIfInRange(200, player, player.getTarget(), true) || (Math.abs(player.getZ() - player.getTarget().getZ()) > 40)) { - sm.addString("You are not in range of the artifact."); + message = "You are not in range of the artifact."; } else if (castle.getSiege().getAttackerClan(player.getClan()) == null) { - sm.addString("You must be an attacker to use this skill"); + message = "You must be an attacker to use this skill."; } else { @@ -159,9 +156,9 @@ public class TakeCastle implements ISkillHandler return true; } - if (!isCheckOnly) + if (!isCheckOnly && !message.isEmpty()) { - player.sendPacket(sm); + player.sendMessage(message); } return false; @@ -179,28 +176,27 @@ public class TakeCastle implements ISkillHandler return false; } - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); final PlayerInstance player = (PlayerInstance) creature; - + String message = ""; if ((fort == null) || (fort.getFortId() <= 0)) { - sm.addString("You must be on fort ground to use this skill"); + message = "You must be on fort ground to use this skill."; } else if ((player.getTarget() == null) && !player.getTarget().isArtefact()) { - sm.addString("You can only use this skill on an flagpole"); + message = "You can only use this skill on an flagpole."; } else if (!fort.getSiege().isInProgress()) { - sm.addString("You can only use this skill during a siege."); + message = "You can only use this skill during a siege."; } else if (!Util.checkIfInRange(200, player, player.getTarget(), true)) { - sm.addString("You are not in range of the flagpole."); + message = "You are not in range of the flagpole."; } else if (fort.getSiege().getAttackerClan(player.getClan()) == null) { - sm.addString("You must be an attacker to use this skill"); + message = "You must be an attacker to use this skill."; } else { @@ -211,9 +207,9 @@ public class TakeCastle implements ISkillHandler return true; } - if (!isCheckOnly) + if (!isCheckOnly && !message.isEmpty()) { - player.sendPacket(sm); + player.sendMessage(message); } return false; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeFort.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeFort.java index a82bb4ef55..4de4de6c1f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeFort.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeFort.java @@ -31,7 +31,7 @@ package org.l2jmobius.gameserver.handler.skillhandlers; */ /* * public static boolean checkIfOkToCastFlagDisplay(Creature creature, boolean isCheckOnly) { return checkIfOkToCastFlagDisplay(activeChar, FortManager.getInstance().getFort(activeChar), isCheckOnly); } public static boolean checkIfOkToCastFlagDisplay(Creature creature, Fort fort, boolean - * isCheckOnly) { if (activeChar == null || !(activeChar instanceof PlayerInstance)) return false; SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); PlayerInstance player = (PlayerInstance)activeChar; if (fort == null || fort.getFortId() <= 0) + * isCheckOnly) { if (activeChar == null || !(activeChar instanceof PlayerInstance)) return false; SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2ss); PlayerInstance player = (PlayerInstance)activeChar; if (fort == null || fort.getFortId() <= 0) * sm.addString("You must be on fort ground to use this skill"); else if (player.getTarget() == null && !(player.getTarget() instanceof ArtefactInstance)) sm.addString("You can only use this skill on an flagpole"); else if (!fort.getSiege().isInProgress()) * sm.addString("You can only use this skill during a siege."); else if (!Util.checkIfInRange(200, player, player.getTarget(), true)) sm.addString("You are not in range of the flagpole."); else if (fort.getSiege().getAttackerClan(player.getClan()) == null) * sm.addString("You must be an attacker to use this skill"); else { if (!isCheckOnly) fort.getSiege().announceToPlayer("Clan " + player.getClan().getName() + " has begun to raise flag.", true); return true; } if (!isCheckOnly) { player.sendPacket(sm); } return false; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java index f337a28efa..076e2b2888 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java @@ -67,9 +67,7 @@ public class Unlock implements ISkillHandler { door.openMe(); door.onOpen(); - final SystemMessage msg = new SystemMessage(SystemMessageId.S1_S2); - msg.addString("Unlock the door!"); - creature.sendPacket(msg); + creature.sendMessage("Unlock the door!"); } else { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java index efb20406ea..3563b4455a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java @@ -28,10 +28,8 @@ import org.l2jmobius.gameserver.model.entity.event.CTF; import org.l2jmobius.gameserver.model.entity.event.DM; import org.l2jmobius.gameserver.model.entity.event.TvT; import org.l2jmobius.gameserver.model.entity.event.VIP; -import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.SetupGauge; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; public class Escape implements IUserCommandHandler @@ -122,18 +120,15 @@ public class Escape implements IUserCommandHandler return false; } - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); if (unstuckTimer < 60000) { - sm.addString("You use Escape: " + (unstuckTimer / 1000) + " seconds."); + player.sendMessage("You use Escape: " + (unstuckTimer / 1000) + " seconds."); } else { - sm.addString("You use Escape: " + (unstuckTimer / 60000) + " minutes."); + player.sendMessage("You use Escape: " + (unstuckTimer / 60000) + " minutes."); } - player.sendPacket(sm); - player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); // SoE Animation section player.setTarget(player); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/SetClanCmd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/SetClanCmd.java index 8ff477aaaf..a90daed1f1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/SetClanCmd.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/SetClanCmd.java @@ -18,8 +18,6 @@ package org.l2jmobius.gameserver.handler.voicedcommandhandlers; import org.l2jmobius.gameserver.handler.IVoicedCommandHandler; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class SetClanCmd implements IVoicedCommandHandler { @@ -40,9 +38,7 @@ public class SetClanCmd implements IVoicedCommandHandler if ((pc != null) && (((activeChar.getClan().getClanId() == pc.getClan().getClanId()) && (activeChar.getClanPrivileges() > n)) || activeChar.isClanLeader())) { pc.setClanPrivileges(n); - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Your clan privileges have been set to " + n + " by " + activeChar.getName()); - activeChar.sendPacket(sm); + activeChar.sendMessage("Your clan privileges have been set to " + n + " by " + activeChar.getName()); } } return true; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index 3dfed9a235..64ae78c79c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.siege.Fort; import org.l2jmobius.gameserver.model.entity.siege.FortSiege; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class FortSiegeManager { @@ -93,30 +91,29 @@ public class FortSiegeManager return false; } - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); final PlayerInstance player = (PlayerInstance) creature; final Fort fort = FortManager.getInstance().getFort(player); - + String message = ""; if ((fort == null) || (fort.getFortId() <= 0)) { - sm.addString("You must be on fort ground to summon this"); + message = "You must be on fort ground to summon this."; } else if (!fort.getSiege().isInProgress()) { - sm.addString("You can only summon this during a siege."); + message = "You can only summon this during a siege."; } else if ((player.getClanId() != 0) && (fort.getSiege().getAttackerClan(player.getClanId()) == null)) { - sm.addString("You can only summon this as a registered attacker."); + message = "You can only summon this as a registered attacker."; } else { return true; } - if (!isCheckOnly) + if (!isCheckOnly && !message.isEmpty()) { - player.sendPacket(sm); + player.sendMessage(message); } return false; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java index 164bb049bf..006212293c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.siege.Castle; import org.l2jmobius.gameserver.model.entity.siege.Siege; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class SiegeManager { @@ -95,30 +93,29 @@ public class SiegeManager return false; } - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); final PlayerInstance player = (PlayerInstance) creature; final Castle castle = CastleManager.getInstance().getCastle(player); - + String message = ""; if ((castle == null) || (castle.getCastleId() <= 0)) { - sm.addString("You must be on castle ground to summon this"); + message = "You must be on castle ground to summon this."; } else if (!castle.getSiege().isInProgress()) { - sm.addString("You can only summon this during a siege."); + message = "You can only summon this during a siege."; } else if ((player.getClanId() != 0) && (castle.getSiege().getAttackerClan(player.getClanId()) == null)) { - sm.addString("You can only summon this as a registered attacker."); + message = "You can only summon this as a registered attacker."; } else { return true; } - if (!isCheckOnly) + if (!isCheckOnly && !message.isEmpty()) { - player.sendPacket(sm); + player.sendMessage(message); } return false; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java index 3f005dc1e0..11e3a40aba 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java @@ -1387,9 +1387,7 @@ public abstract class Skill final String msg = preCondition.getMessage(); if (msg != null) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString(msg); - creature.sendPacket(sm); + creature.sendMessage(msg); } return false; @@ -2589,9 +2587,7 @@ public abstract class Skill } case TARGET_ITEM: { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Target type of skill is not currently handled"); - creature.sendPacket(sm); + creature.sendMessage("Target type of skill is not currently handled."); return null; } case TARGET_UNDEAD: @@ -2789,12 +2785,10 @@ public abstract class Skill } default: { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Target type of skill is not currently handled"); - creature.sendPacket(sm); + creature.sendMessage("Target type of skill is not currently handled."); return null; } - }// end switch + } } public WorldObject[] getTargetList(Creature creature) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 1718cdf495..da8c70df42 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -614,6 +614,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder // default implementation } + /** + * Send message. + * @param message the message + */ + public void sendMessage(String message) + { + // default implementation + } + /** The _in town war. */ private boolean _inTownWar; @@ -926,9 +935,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder final String mobtype = ((NpcInstance) target).getTemplate().getType(); if (!Config.LIST_ALLOWED_NPC_TYPES.contains(mobtype)) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Npc Type " + mobtype + " has Protection - No Attack Allowed!"); - ((PlayerInstance) this).sendPacket(sm); + ((PlayerInstance) this).sendMessage("Npc Type " + mobtype + " has Protection - No Attack Allowed!"); ((PlayerInstance) this).sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -1666,9 +1673,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder final String mobtype = ((NpcInstance) target).getTemplate().getType(); if (!Config.LIST_ALLOWED_NPC_TYPES.contains(mobtype)) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Npc Type " + mobtype + " has Protection - No Attack Allowed!"); - ((PlayerInstance) creature).sendPacket(sm); + ((PlayerInstance) creature).sendMessage("Npc Type " + mobtype + " has Protection - No Attack Allowed!"); ((PlayerInstance) creature).sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java index c2320d51e4..7c6ccbe80a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java @@ -25,12 +25,10 @@ import org.l2jmobius.gameserver.instancemanager.ClanHallManager; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.Ride; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; public class DoormanInstance extends FolkInstance @@ -119,15 +117,11 @@ public class DoormanInstance extends FolkInstance { if (player.isMounted()) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("You Already Have a Pet or Are Mounted."); - player.sendPacket(sm); + player.sendMessage("You Already Have a Pet or Are Mounted."); } else { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Summon your Strider first."); - player.sendPacket(sm); + player.sendMessage("Summon your Strider first."); } return; } @@ -137,9 +131,7 @@ public class DoormanInstance extends FolkInstance { if (player.getPet().getLevel() < 55) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Your Strider Has not reached the required level."); - player.sendPacket(sm); + player.sendMessage("Your Strider Has not reached the required level."); } else { @@ -154,24 +146,18 @@ public class DoormanInstance extends FolkInstance player.broadcastPacket(mount); player.setMountType(mount.getMountType()); player.addSkill(SkillTable.getInstance().getInfo(4289, 1)); - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("The Wyvern has been summoned successfully!"); - player.sendPacket(sm); + player.sendMessage("The wyvern has been summoned successfully!"); } } else { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("You need 10 Crystals: B Grade."); - player.sendPacket(sm); + player.sendMessage("You need 10 Crystals: B Grade."); } return; } else { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Unsummon your pet."); - player.sendPacket(sm); + player.sendMessage("Unsummon your pet."); return; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 98be8dc662..ba26b02ba7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -11753,6 +11753,7 @@ public class PlayerInstance extends Playable * Send message. * @param message the message */ + @Override public void sendMessage(String message) { sendPacket(SystemMessage.sendString(message)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index 96e37871d3..3995bcc23d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.model.zone.type.BossZone; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** * The Class TeleporterInstance. @@ -235,9 +234,7 @@ public class TeleporterInstance extends FolkInstance } else if (!Config.ALT_GAME_KARMA_PLAYER_CAN_USE_GK && (player.getKarma() > 0)) // karma { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Go away, you're not welcome here."); - player.sendPacket(sm); + player.sendMessage("Go away, you're not welcome here."); return; } else if (list.isForNoble() && !player.isNoble()) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java index 049f5b575d..3fc6c28712 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java @@ -22,12 +22,10 @@ import org.l2jmobius.gameserver.instancemanager.ClanHallManager; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.Ride; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; public class WyvernManagerInstance extends CastleChamberlainInstance @@ -59,15 +57,11 @@ public class WyvernManagerInstance extends CastleChamberlainInstance { if (player.isMounted()) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("You Already Have a Pet or Are Mounted."); - player.sendPacket(sm); + player.sendMessage("You already have a pet or are mounted."); } else { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Summon your Strider first."); - player.sendPacket(sm); + player.sendMessage("Summon your strider first."); } } else if ((player.getPet().getNpcId() == 12526) || (player.getPet().getNpcId() == 12527) || (player.getPet().getNpcId() == 12528)) @@ -76,9 +70,7 @@ public class WyvernManagerInstance extends CastleChamberlainInstance { if (player.getPet().getLevel() < 55) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Your strider has not reached the required level."); - player.sendPacket(sm); + player.sendMessage("Your strider has not reached the required level."); } else { @@ -93,23 +85,17 @@ public class WyvernManagerInstance extends CastleChamberlainInstance player.broadcastPacket(mount); player.setMountType(mount.getMountType()); player.addSkill(SkillTable.getInstance().getInfo(4289, 1)); - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("The Wyvern has been summoned successfully!"); - player.sendPacket(sm); + player.sendMessage("The wyvern has been summoned successfully!"); } } else { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("You need 10 Crystals: B Grade."); - player.sendPacket(sm); + player.sendMessage("You need 10 Crystals: B Grade."); } } else { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Unsummon your pet."); - player.sendPacket(sm); + player.sendMessage("Unsummon your pet."); } } else diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java index 0651adb4bc..1a138dcddd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -51,7 +51,6 @@ import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.scripting.ManagedScript; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -812,9 +811,7 @@ public class Quest extends ManagedScript } else { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString(res); - player.sendPacket(sm); + player.sendMessage(res); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectRelax.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectRelax.java index 1834c458ea..bd30c23b8a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectRelax.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectRelax.java @@ -74,9 +74,7 @@ class EffectRelax extends Effect if (((getEffected().getCurrentHp() + 1) > getEffected().getMaxHp()) && getSkill().isToggle()) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Fully rested. Effect of " + getSkill().getName() + " has been removed."); - getEffected().sendPacket(sm); + getEffected().sendMessage("Fully rested. Effect of " + getSkill().getName() + " has been removed."); retval = false; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDefault.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDefault.java index 3aaae84336..f7627adb57 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDefault.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDefault.java @@ -20,9 +20,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class SkillDefault extends Skill { @@ -36,8 +34,6 @@ public class SkillDefault extends Skill public void useSkill(Creature caster, WorldObject[] targets) { caster.sendPacket(ActionFailed.STATIC_PACKET); - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Skill not implemented. Skill ID: " + getId() + " " + getSkillType()); - caster.sendPacket(sm); + caster.sendMessage("Skill not implemented. Skill ID: " + getId() + " " + getSkillType()); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java index 063c8eba43..bbefb7b68a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java @@ -22,8 +22,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Formulas; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class SkillElemental extends Skill { @@ -102,9 +100,7 @@ public class SkillElemental extends Skill } if (!charged) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Target is not charged by elements."); - creature.sendPacket(sm); + creature.sendMessage("Target is not charged by elements."); continue; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java index b8ea4c7555..c29de0e61a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java @@ -64,9 +64,7 @@ public class RequestChangePetName extends GameClientPacket } else if ((_name.length() < 3) || (_name.length() > 16)) { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Your pet's name can be up to 16 characters."); - player.sendPacket(sm); + player.sendMessage("Your pet's name can be up to 16 characters."); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java index fa9291d783..feeab946df 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java @@ -16,9 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; - public class RequestDeleteMacro extends GameClientPacket { private int _id; @@ -44,8 +41,5 @@ public class RequestDeleteMacro extends GameClientPacket } getClient().getPlayer().deleteMacro(_id); - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Delete macro id=" + _id); - sendPacket(sm); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java index 3c13f7bd0d..0d497fadf2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java @@ -76,16 +76,12 @@ public class RequestGiveNickName extends GameClientPacket } else { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Target needs to be online to get a title"); - player.sendPacket(sm); + player.sendMessage("Target needs to be online to get a title."); } } else { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Target does not belong to your clan"); - player.sendPacket(sm); + player.sendMessage("Target does not belong to your clan."); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java index 5b469fe2c2..f7e06aa4bb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java @@ -21,9 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; -import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.QuestList; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class RequestQuestAbort extends GameClientPacket { @@ -61,9 +59,7 @@ public class RequestQuestAbort extends GameClientPacket if (qs != null) { qs.exitQuest(true); - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("Quest aborted."); - player.sendPacket(sm); + player.sendMessage("Quest aborted."); player.sendPacket(new QuestList(player)); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUserCommand.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUserCommand.java index f8ccb34346..af455ceb8a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUserCommand.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUserCommand.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.handler.UserCommandHandler; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class RequestUserCommand extends GameClientPacket { @@ -46,14 +44,7 @@ public class RequestUserCommand extends GameClientPacket } final IUserCommandHandler handler = UserCommandHandler.getInstance().getUserCommandHandler(_command); - - if (handler == null) - { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); - sm.addString("user commandID " + _command + " not implemented yet"); - player.sendPacket(sm); - } - else + if (handler != null) { handler.useUserCommand(_command, getClient().getPlayer()); }