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

Proper usage of sendMessage method.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-31 00:15:30 +00:00
parent 845dea2551
commit 037da2abc7
36 changed files with 137 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/RecipeController.java
View File

@@ -27,6 +27,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.datatables.xml.RecipeData; import org.l2jmobius.gameserver.datatables.xml.RecipeData;
import org.l2jmobius.gameserver.model.Inventory; import org.l2jmobius.gameserver.model.Inventory;
import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.ManufactureItem;
@@ -153,10 +154,7 @@ public class RecipeController
// check if already busy (possible in alt mode only) // check if already busy (possible in alt mode only)
if (Config.ALT_GAME_CREATION && ((maker = _activeMakers.get(player)) != null)) if (Config.ALT_GAME_CREATION && ((maker = _activeMakers.get(player)) != null))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("You are busy creating " + ItemTable.getInstance().getTemplate(recipeList.getItemId()).getName());
sm.addString("You are busy creating ");
sm.addItemName(recipeList.getItemId());
player.sendPacket(sm);
return; return;
} }

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDelete.java
View File

@@ -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.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.model.spawn.Spawn;
import org.l2jmobius.gameserver.network.SystemMessageId; 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 * 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); BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
sm.addString("Deleted " + target.getName() + " from " + target.getObjectId() + ".");
activeChar.sendPacket(sm);
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
sm.addString("Incorrect target.");
activeChar.sendPacket(sm);
} }
} }
} }

11
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDisconnect.java
View File

@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; 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 * 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()) if (player.getObjectId() == activeChar.getObjectId())
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); BuilderUtil.sendSysMessage(activeChar, "You cannot logout your character.");
sm.addString("You cannot logout your character.");
activeChar.sendPacket(sm);
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server.");
sm.addString("Character " + player.getName() + " disconnected from server.");
activeChar.sendPacket(sm);
// Logout Character // Logout Character
player.sendPacket(new LeaveWorld()); player.sendPacket(new LeaveWorld());

23
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java
View File

@@ -38,7 +38,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.StopMove; import org.l2jmobius.gameserver.network.serverpackets.StopMove;
import org.l2jmobius.gameserver.network.serverpackets.SunRise; import org.l2jmobius.gameserver.network.serverpackets.SunRise;
import org.l2jmobius.gameserver.network.serverpackets.SunSet; 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.network.serverpackets.UserInfo;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
@@ -398,9 +397,7 @@ public class AdminEffects implements IAdminCommandHandler
if (teamVal != 0) if (teamVal != 0)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); BuilderUtil.sendSysMessage(player, "You have joined team " + teamVal);
sm.addString("You have joined team " + teamVal);
player.sendPacket(sm);
} }
player.broadcastUserInfo(); player.broadcastUserInfo();
@@ -433,9 +430,7 @@ public class AdminEffects implements IAdminCommandHandler
if (teamVal != 0) if (teamVal != 0)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); BuilderUtil.sendSysMessage(player, "You have joined team " + teamVal);
sm.addString("You have joined team " + teamVal);
player.sendPacket(sm);
} }
player.broadcastUserInfo(); player.broadcastUserInfo();
@@ -461,7 +456,7 @@ public class AdminEffects implements IAdminCommandHandler
{ {
if (performSocial(social, player, activeChar)) 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 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) catch (NumberFormatException nbe)
{ {
@@ -498,7 +493,7 @@ public class AdminEffects implements IAdminCommandHandler
if (performSocial(social, obj, activeChar)) 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 else
{ {
@@ -555,7 +550,7 @@ public class AdminEffects implements IAdminCommandHandler
{ {
if (performAbnormal(abnormal, player)) 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 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) catch (NumberFormatException nbe)
{ {
@@ -596,7 +591,7 @@ public class AdminEffects implements IAdminCommandHandler
if (performAbnormal(abnormal, obj)) 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 else
{ {
@@ -646,7 +641,7 @@ public class AdminEffects implements IAdminCommandHandler
final Creature target = (Creature) obj; final Creature target = (Creature) obj;
target.broadcastPacket(new MagicSkillUse(target, activeChar, skill, level, hittime, 0)); 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.");
} }
} }

5
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminHeal.java
View File

@@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@@ -52,9 +51,7 @@ public class AdminHeal implements IAdminCommandHandler
} }
catch (StringIndexOutOfBoundsException e) catch (StringIndexOutOfBoundsException e)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); BuilderUtil.sendSysMessage(activeChar, "Incorrect target/radius specified.");
sm.addString("Incorrect target/radius specified.");
activeChar.sendPacket(sm);
} }
} }
return true; return true;

17
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMenu.java
View File

@@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@@ -187,19 +186,15 @@ public class AdminMenu implements IAdminCommandHandler
st.nextToken(); st.nextToken();
final String player = st.nextToken(); final String player = st.nextToken();
final PlayerInstance plyr = World.getInstance().getPlayer(player); final PlayerInstance plyr = World.getInstance().getPlayer(player);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
if (plyr != null) if (plyr != null)
{ {
plyr.logout(); plyr.logout();
sm.addString("You kicked " + plyr.getName() + " from the game."); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game.");
} }
else 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); showMainPage(activeChar);
@@ -346,19 +341,15 @@ public class AdminMenu implements IAdminCommandHandler
if (result.next()) if (result.next())
{ {
final String accName = result.getString(1); final String accName = result.getString(1);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
if (accName.length() > 0) if (accName.length() > 0)
{ {
LoginServerThread.getInstance().sendAccessLevel(accName, banLevel); 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 else
{ {
sm.addString("Couldn't find player: " + player + "."); BuilderUtil.sendSysMessage(activeChar, "Couldn't find player: " + player + ".");
} }
activeChar.sendPacket(sm);
} }
else else
{ {

13
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminRideWyvern.java
View File

@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers;
import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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.Ride;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.BuilderUtil;
public class AdminRideWyvern implements IAdminCommandHandler public class AdminRideWyvern implements IAdminCommandHandler
{ {
@@ -41,10 +40,7 @@ public class AdminRideWyvern implements IAdminCommandHandler
{ {
if (activeChar.isMounted() || (activeChar.getPet() != null)) if (activeChar.isMounted() || (activeChar.getPet() != null))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); BuilderUtil.sendSysMessage(activeChar, "Already Have a Pet or Mounted.");
sm.addString("Already Have a Pet or Mounted.");
activeChar.sendPacket(sm);
return false; return false;
} }
@@ -63,10 +59,7 @@ public class AdminRideWyvern implements IAdminCommandHandler
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); BuilderUtil.sendSysMessage(activeChar, "Command '" + command + "' not recognized");
sm.addString("Command '" + command + "' not recognized");
activeChar.sendPacket(sm);
return false; return false;
} }

11
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTarget.java
View File

@@ -20,8 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.BuilderUtil;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/** /**
* This class handles following admin commands: - target name = sets player with respective name as target * 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 else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); BuilderUtil.sendSysMessage(activeChar, "Player " + targetName + " not found");
sm.addString("Player " + targetName + " not found");
activeChar.sendPacket(sm);
} }
} }
catch (IndexOutOfBoundsException e) catch (IndexOutOfBoundsException e)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); BuilderUtil.sendSysMessage(activeChar, "Please specify correct name.");
sm.addString("Please specify correct name.");
activeChar.sendPacket(sm);
} }
} }
} }

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java
View File

@@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.model.spawn.Spawn;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@@ -506,10 +505,7 @@ public class AdminTeleport implements IAdminCommandHandler
{ {
activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
activeChar.teleToLocation(x, y, z, false); activeChar.teleToLocation(x, y, z, false);
BuilderUtil.sendSysMessage(activeChar, "You have been teleported to " + x + " " + y + " " + z);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
sm.addString("You have been teleported to " + x + " " + y + " " + z);
activeChar.sendPacket(sm);
} }
private void showTeleportWindow(PlayerInstance activeChar) private void showTeleportWindow(PlayerInstance activeChar)
@@ -631,9 +627,7 @@ public class AdminTeleport implements IAdminCommandHandler
SpawnTable.getInstance().addNewSpawn(spawn, !custom_boss_spawn); SpawnTable.getInstance().addNewSpawn(spawn, !custom_boss_spawn);
spawn.init(); spawn.init();
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); BuilderUtil.sendSysMessage(activeChar, "Created " + template1.getName() + " on " + target.getObjectId() + ".");
sm.addString("Created " + template1.getName() + " on " + target.getObjectId() + ".");
activeChar.sendPacket(sm);
} }
catch (Exception e) catch (Exception e)
{ {

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java
View File

@@ -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.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.spawn.Spawn; 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 public class ChristmasTree implements IItemHandler
{ {
@@ -83,15 +81,11 @@ public class ChristmasTree implements IItemHandler
player.destroyItem("Consume", item.getObjectId(), 1, null, false); player.destroyItem("Consume", item.getObjectId(), 1, null, false);
player.sendPacket(new SystemMessage(SystemMessageId.S1_S2));
ThreadPool.schedule(new DeSpawn(result), 3600000); ThreadPool.schedule(new DeSpawn(result), 3600000);
} }
catch (Exception e) catch (Exception e)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("Target is not ingame.");
sm.addString("Target is not ingame.");
player.sendPacket(sm);
} }
} }

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java
View File

@@ -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.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.spawn.Spawn; 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 public class JackpotSeed implements IItemHandler
{ {
@@ -74,15 +72,11 @@ public class JackpotSeed implements IItemHandler
World.getInstance().storeObject(gourd); World.getInstance().storeObject(gourd);
gourd.setOwner(player.getName()); gourd.setOwner(player.getName());
player.destroyItem("Consume", item.getObjectId(), 1, null, false); player.destroyItem("Consume", item.getObjectId(), 1, null, false);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("Created " + template1.getName() + " at x: " + spawn.getX() + " y: " + spawn.getY() + " z: " + spawn.getZ());
sm.addString("Created " + template1.getName() + " at x: " + spawn.getX() + " y: " + spawn.getY() + " z: " + spawn.getZ());
player.sendPacket(sm);
} }
catch (Exception e) catch (Exception e)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("Target is not ingame.");
sm.addString("Target is not ingame.");
player.sendPacket(sm);
} }
} }

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/BalanceLife.java
View File

@@ -24,9 +24,7 @@ import org.l2jmobius.gameserver.model.Skill.SkillType;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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.StatusUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/** /**
* @author earendil * @author earendil
@@ -125,9 +123,7 @@ public class BalanceLife implements ISkillHandler
su.addAttribute(StatusUpdate.CUR_HP, (int) target.getCurrentHp()); su.addAttribute(StatusUpdate.CUR_HP, (int) target.getCurrentHp());
target.sendPacket(su); target.sendPacket(su);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); target.sendMessage("HP of the party has been balanced.");
sm.addString("HP of the party has been balanced.");
target.sendPacket(sm);
} }
} }

40
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java
View File

@@ -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.Castle;
import org.l2jmobius.gameserver.model.entity.siege.Fort; import org.l2jmobius.gameserver.model.entity.siege.Fort;
import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/** /**
* @author _drunk_ * @author _drunk_
@@ -145,41 +143,40 @@ public class SiegeFlag implements ISkillHandler
return false; return false;
} }
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
final PlayerInstance player = (PlayerInstance) creature; final PlayerInstance player = (PlayerInstance) creature;
String message = "";
if ((castle == null) || (castle.getCastleId() <= 0)) 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()) 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) 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()) 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()) 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)) else if (player.isInsideZone(ZoneId.NO_HQ))
{ {
sm.addString("You cannot place flag here."); message = "You cannot place flag here.";
} }
else else
{ {
return true; return true;
} }
if (!isCheckOnly) if (!isCheckOnly && !message.isEmpty())
{ {
player.sendPacket(sm); player.sendMessage(message);
} }
return false; return false;
} }
@@ -191,41 +188,40 @@ public class SiegeFlag implements ISkillHandler
return false; return false;
} }
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
final PlayerInstance player = (PlayerInstance) creature; final PlayerInstance player = (PlayerInstance) creature;
String message = "";
if ((fort == null) || (fort.getFortId() <= 0)) 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()) 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) 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()) 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()) 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)) else if (player.isInsideZone(ZoneId.NO_HQ))
{ {
sm.addString("You cannot place flag here."); message = "You cannot place flag here.";
} }
else else
{ {
return true; return true;
} }
if (!isCheckOnly) if (!isCheckOnly && !message.isEmpty())
{ {
player.sendPacket(sm); player.sendMessage(message);
} }
return false; return false;

31
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java
View File

@@ -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.instance.ItemInstance;
import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.items.type.WeaponType;
import org.l2jmobius.gameserver.model.skills.Formulas; import org.l2jmobius.gameserver.model.skills.Formulas;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/** /**
@@ -185,33 +184,32 @@ public class StrSiegeAssault implements ISkillHandler
return false; return false;
} }
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
final PlayerInstance player = (PlayerInstance) creature; final PlayerInstance player = (PlayerInstance) creature;
String message = "";
if ((castle == null) || (castle.getCastleId() <= 0)) 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()) 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)) 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()) 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 else
{ {
return true; return true;
} }
if (!isCheckOnly) if (!isCheckOnly && !message.isEmpty())
{ {
player.sendPacket(sm); player.sendMessage(message);
} }
return false; return false;
@@ -224,33 +222,32 @@ public class StrSiegeAssault implements ISkillHandler
return false; return false;
} }
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
final PlayerInstance player = (PlayerInstance) creature; final PlayerInstance player = (PlayerInstance) creature;
String message = "";
if ((fort == null) || (fort.getFortId() <= 0)) 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()) 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)) 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()) 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 else
{ {
return true; return true;
} }
if (!isCheckOnly) if (!isCheckOnly && !message.isEmpty())
{ {
player.sendPacket(sm); player.sendMessage(message);
} }
return false; return false;

36
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeCastle.java
View File

@@ -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.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.entity.siege.Castle; import org.l2jmobius.gameserver.model.entity.siege.Castle;
import org.l2jmobius.gameserver.model.entity.siege.Fort; 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; import org.l2jmobius.gameserver.util.Util;
/** /**
@@ -127,28 +125,27 @@ public class TakeCastle implements ISkillHandler
return false; return false;
} }
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
final PlayerInstance player = (PlayerInstance) creature; final PlayerInstance player = (PlayerInstance) creature;
String message = "";
if ((castle == null) || (castle.getCastleId() <= 0)) 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()) 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()) 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)) 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) 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 else
{ {
@@ -159,9 +156,9 @@ public class TakeCastle implements ISkillHandler
return true; return true;
} }
if (!isCheckOnly) if (!isCheckOnly && !message.isEmpty())
{ {
player.sendPacket(sm); player.sendMessage(message);
} }
return false; return false;
@@ -179,28 +176,27 @@ public class TakeCastle implements ISkillHandler
return false; return false;
} }
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
final PlayerInstance player = (PlayerInstance) creature; final PlayerInstance player = (PlayerInstance) creature;
String message = "";
if ((fort == null) || (fort.getFortId() <= 0)) 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()) 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()) 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)) 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) 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 else
{ {
@@ -211,9 +207,9 @@ public class TakeCastle implements ISkillHandler
return true; return true;
} }
if (!isCheckOnly) if (!isCheckOnly && !message.isEmpty())
{ {
player.sendPacket(sm); player.sendMessage(message);
} }
return false; return false;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeFort.java
View File

@@ -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 * 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 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 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; } } * 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; } }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java
View File

@@ -67,9 +67,7 @@ public class Unlock implements ISkillHandler
{ {
door.openMe(); door.openMe();
door.onOpen(); door.onOpen();
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_S2); creature.sendMessage("Unlock the door!");
msg.addString("Unlock the door!");
creature.sendPacket(msg);
} }
else else
{ {

9
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java
View File

@@ -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.DM;
import org.l2jmobius.gameserver.model.entity.event.TvT; import org.l2jmobius.gameserver.model.entity.event.TvT;
import org.l2jmobius.gameserver.model.entity.event.VIP; 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.MagicSkillUse;
import org.l2jmobius.gameserver.network.serverpackets.SetupGauge; import org.l2jmobius.gameserver.network.serverpackets.SetupGauge;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Broadcast;
public class Escape implements IUserCommandHandler public class Escape implements IUserCommandHandler
@@ -122,18 +120,15 @@ public class Escape implements IUserCommandHandler
return false; return false;
} }
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
if (unstuckTimer < 60000) if (unstuckTimer < 60000)
{ {
sm.addString("You use Escape: " + (unstuckTimer / 1000) + " seconds."); player.sendMessage("You use Escape: " + (unstuckTimer / 1000) + " seconds.");
} }
else 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); player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
// SoE Animation section // SoE Animation section
player.setTarget(player); player.setTarget(player);

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/SetClanCmd.java
View File

@@ -18,8 +18,6 @@ package org.l2jmobius.gameserver.handler.voicedcommandhandlers;
import org.l2jmobius.gameserver.handler.IVoicedCommandHandler; import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 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())) if ((pc != null) && (((activeChar.getClan().getClanId() == pc.getClan().getClanId()) && (activeChar.getClanPrivileges() > n)) || activeChar.isClanLeader()))
{ {
pc.setClanPrivileges(n); pc.setClanPrivileges(n);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); activeChar.sendMessage("Your clan privileges have been set to " + n + " by " + activeChar.getName());
sm.addString("Your clan privileges have been set to " + n + " by " + activeChar.getName());
activeChar.sendPacket(sm);
} }
} }
return true; return true;

15
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
View File

@@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.entity.siege.Fort; import org.l2jmobius.gameserver.model.entity.siege.Fort;
import org.l2jmobius.gameserver.model.entity.siege.FortSiege; import org.l2jmobius.gameserver.model.entity.siege.FortSiege;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class FortSiegeManager public class FortSiegeManager
{ {
@@ -93,30 +91,29 @@ public class FortSiegeManager
return false; return false;
} }
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
final PlayerInstance player = (PlayerInstance) creature; final PlayerInstance player = (PlayerInstance) creature;
final Fort fort = FortManager.getInstance().getFort(player); final Fort fort = FortManager.getInstance().getFort(player);
String message = "";
if ((fort == null) || (fort.getFortId() <= 0)) 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()) 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)) 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 else
{ {
return true; return true;
} }
if (!isCheckOnly) if (!isCheckOnly && !message.isEmpty())
{ {
player.sendPacket(sm); player.sendMessage(message);
} }
return false; return false;

15
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java
View File

@@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.entity.siege.Castle; import org.l2jmobius.gameserver.model.entity.siege.Castle;
import org.l2jmobius.gameserver.model.entity.siege.Siege; import org.l2jmobius.gameserver.model.entity.siege.Siege;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class SiegeManager public class SiegeManager
{ {
@@ -95,30 +93,29 @@ public class SiegeManager
return false; return false;
} }
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
final PlayerInstance player = (PlayerInstance) creature; final PlayerInstance player = (PlayerInstance) creature;
final Castle castle = CastleManager.getInstance().getCastle(player); final Castle castle = CastleManager.getInstance().getCastle(player);
String message = "";
if ((castle == null) || (castle.getCastleId() <= 0)) 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()) 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)) 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 else
{ {
return true; return true;
} }
if (!isCheckOnly) if (!isCheckOnly && !message.isEmpty())
{ {
player.sendPacket(sm); player.sendMessage(message);
} }
return false; return false;

14
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java
View File

@@ -1387,9 +1387,7 @@ public abstract class Skill
final String msg = preCondition.getMessage(); final String msg = preCondition.getMessage();
if (msg != null) if (msg != null)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); creature.sendMessage(msg);
sm.addString(msg);
creature.sendPacket(sm);
} }
return false; return false;
@@ -2589,9 +2587,7 @@ public abstract class Skill
} }
case TARGET_ITEM: case TARGET_ITEM:
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); creature.sendMessage("Target type of skill is not currently handled.");
sm.addString("Target type of skill is not currently handled");
creature.sendPacket(sm);
return null; return null;
} }
case TARGET_UNDEAD: case TARGET_UNDEAD:
@@ -2789,12 +2785,10 @@ public abstract class Skill
} }
default: default:
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); creature.sendMessage("Target type of skill is not currently handled.");
sm.addString("Target type of skill is not currently handled");
creature.sendPacket(sm);
return null; return null;
} }
}// end switch }
} }
public WorldObject[] getTargetList(Creature creature) public WorldObject[] getTargetList(Creature creature)

17
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -614,6 +614,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
// default implementation // default implementation
} }
/**
* Send message.
* @param message the message
*/
public void sendMessage(String message)
{
// default implementation
}
/** The _in town war. */ /** The _in town war. */
private boolean _inTownWar; private boolean _inTownWar;
@@ -926,9 +935,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
final String mobtype = ((NpcInstance) target).getTemplate().getType(); final String mobtype = ((NpcInstance) target).getTemplate().getType();
if (!Config.LIST_ALLOWED_NPC_TYPES.contains(mobtype)) if (!Config.LIST_ALLOWED_NPC_TYPES.contains(mobtype))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); ((PlayerInstance) this).sendMessage("Npc Type " + mobtype + " has Protection - No Attack Allowed!");
sm.addString("Npc Type " + mobtype + " has Protection - No Attack Allowed!");
((PlayerInstance) this).sendPacket(sm);
((PlayerInstance) this).sendPacket(ActionFailed.STATIC_PACKET); ((PlayerInstance) this).sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -1666,9 +1673,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
final String mobtype = ((NpcInstance) target).getTemplate().getType(); final String mobtype = ((NpcInstance) target).getTemplate().getType();
if (!Config.LIST_ALLOWED_NPC_TYPES.contains(mobtype)) if (!Config.LIST_ALLOWED_NPC_TYPES.contains(mobtype))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); ((PlayerInstance) creature).sendMessage("Npc Type " + mobtype + " has Protection - No Attack Allowed!");
sm.addString("Npc Type " + mobtype + " has Protection - No Attack Allowed!");
((PlayerInstance) creature).sendPacket(sm);
((PlayerInstance) creature).sendPacket(ActionFailed.STATIC_PACKET); ((PlayerInstance) creature).sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

26
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java
View File

@@ -25,12 +25,10 @@ import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.entity.ClanHall; 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.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.Ride; import org.l2jmobius.gameserver.network.serverpackets.Ride;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
public class DoormanInstance extends FolkInstance public class DoormanInstance extends FolkInstance
@@ -119,15 +117,11 @@ public class DoormanInstance extends FolkInstance
{ {
if (player.isMounted()) if (player.isMounted())
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("You Already Have a Pet or Are Mounted.");
sm.addString("You Already Have a Pet or Are Mounted.");
player.sendPacket(sm);
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("Summon your Strider first.");
sm.addString("Summon your Strider first.");
player.sendPacket(sm);
} }
return; return;
} }
@@ -137,9 +131,7 @@ public class DoormanInstance extends FolkInstance
{ {
if (player.getPet().getLevel() < 55) if (player.getPet().getLevel() < 55)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("Your Strider Has not reached the required level.");
sm.addString("Your Strider Has not reached the required level.");
player.sendPacket(sm);
} }
else else
{ {
@@ -154,24 +146,18 @@ public class DoormanInstance extends FolkInstance
player.broadcastPacket(mount); player.broadcastPacket(mount);
player.setMountType(mount.getMountType()); player.setMountType(mount.getMountType());
player.addSkill(SkillTable.getInstance().getInfo(4289, 1)); player.addSkill(SkillTable.getInstance().getInfo(4289, 1));
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("The wyvern has been summoned successfully!");
sm.addString("The Wyvern has been summoned successfully!");
player.sendPacket(sm);
} }
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("You need 10 Crystals: B Grade.");
sm.addString("You need 10 Crystals: B Grade.");
player.sendPacket(sm);
} }
return; return;
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("Unsummon your pet.");
sm.addString("Unsummon your pet.");
player.sendPacket(sm);
return; return;
} }
} }

1
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -11753,6 +11753,7 @@ public class PlayerInstance extends Playable
* Send message. * Send message.
* @param message the message * @param message the message
*/ */
@Override
public void sendMessage(String message) public void sendMessage(String message)
{ {
sendPacket(SystemMessage.sendString(message)); sendPacket(SystemMessage.sendString(message));

5
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java
View File

@@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.model.zone.type.BossZone;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/** /**
* The Class TeleporterInstance. * 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 else if (!Config.ALT_GAME_KARMA_PLAYER_CAN_USE_GK && (player.getKarma() > 0)) // karma
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("Go away, you're not welcome here.");
sm.addString("Go away, you're not welcome here.");
player.sendPacket(sm);
return; return;
} }
else if (list.isForNoble() && !player.isNoble()) else if (list.isForNoble() && !player.isNoble())

26
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java
View File

@@ -22,12 +22,10 @@ import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.entity.ClanHall;
import org.l2jmobius.gameserver.model.zone.ZoneId; 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.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.Ride; import org.l2jmobius.gameserver.network.serverpackets.Ride;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
public class WyvernManagerInstance extends CastleChamberlainInstance public class WyvernManagerInstance extends CastleChamberlainInstance
@@ -59,15 +57,11 @@ public class WyvernManagerInstance extends CastleChamberlainInstance
{ {
if (player.isMounted()) if (player.isMounted())
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("You already have a pet or are mounted.");
sm.addString("You Already Have a Pet or Are Mounted.");
player.sendPacket(sm);
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("Summon your strider first.");
sm.addString("Summon your Strider first.");
player.sendPacket(sm);
} }
} }
else if ((player.getPet().getNpcId() == 12526) || (player.getPet().getNpcId() == 12527) || (player.getPet().getNpcId() == 12528)) 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) if (player.getPet().getLevel() < 55)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("Your strider has not reached the required level.");
sm.addString("Your strider has not reached the required level.");
player.sendPacket(sm);
} }
else else
{ {
@@ -93,23 +85,17 @@ public class WyvernManagerInstance extends CastleChamberlainInstance
player.broadcastPacket(mount); player.broadcastPacket(mount);
player.setMountType(mount.getMountType()); player.setMountType(mount.getMountType());
player.addSkill(SkillTable.getInstance().getInfo(4289, 1)); player.addSkill(SkillTable.getInstance().getInfo(4289, 1));
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("The wyvern has been summoned successfully!");
sm.addString("The Wyvern has been summoned successfully!");
player.sendPacket(sm);
} }
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("You need 10 Crystals: B Grade.");
sm.addString("You need 10 Crystals: B Grade.");
player.sendPacket(sm);
} }
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("Unsummon your pet.");
sm.addString("Unsummon your pet.");
player.sendPacket(sm);
} }
} }
else else

5
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java
View File

@@ -51,7 +51,6 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; 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.ManagedScript;
import org.l2jmobius.gameserver.scripting.ScriptEngineManager; import org.l2jmobius.gameserver.scripting.ScriptEngineManager;
@@ -812,9 +811,7 @@ public class Quest extends ManagedScript
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage(res);
sm.addString(res);
player.sendPacket(sm);
} }
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectRelax.java
View File

@@ -74,9 +74,7 @@ class EffectRelax extends Effect
if (((getEffected().getCurrentHp() + 1) > getEffected().getMaxHp()) && getSkill().isToggle()) if (((getEffected().getCurrentHp() + 1) > getEffected().getMaxHp()) && getSkill().isToggle())
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); getEffected().sendMessage("Fully rested. Effect of " + getSkill().getName() + " has been removed.");
sm.addString("Fully rested. Effect of " + getSkill().getName() + " has been removed.");
getEffected().sendPacket(sm);
retval = false; retval = false;
} }

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDefault.java
View File

@@ -20,9 +20,7 @@ import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class SkillDefault extends Skill public class SkillDefault extends Skill
{ {
@@ -36,8 +34,6 @@ public class SkillDefault extends Skill
public void useSkill(Creature caster, WorldObject[] targets) public void useSkill(Creature caster, WorldObject[] targets)
{ {
caster.sendPacket(ActionFailed.STATIC_PACKET); caster.sendPacket(ActionFailed.STATIC_PACKET);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); caster.sendMessage("Skill not implemented. Skill ID: " + getId() + " " + getSkillType());
sm.addString("Skill not implemented. Skill ID: " + getId() + " " + getSkillType());
caster.sendPacket(sm);
} }
} }

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java
View File

@@ -22,8 +22,6 @@ import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skills.Formulas; 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 public class SkillElemental extends Skill
{ {
@@ -102,9 +100,7 @@ public class SkillElemental extends Skill
} }
if (!charged) if (!charged)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); creature.sendMessage("Target is not charged by elements.");
sm.addString("Target is not charged by elements.");
creature.sendPacket(sm);
continue; continue;
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java
View File

@@ -64,9 +64,7 @@ public class RequestChangePetName extends GameClientPacket
} }
else if ((_name.length() < 3) || (_name.length() > 16)) else if ((_name.length() < 3) || (_name.length() > 16))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("Your pet's name can be up to 16 characters.");
sm.addString("Your pet's name can be up to 16 characters.");
player.sendPacket(sm);
return; return;
} }

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
View File

@@ -16,9 +16,6 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class RequestDeleteMacro extends GameClientPacket public class RequestDeleteMacro extends GameClientPacket
{ {
private int _id; private int _id;
@@ -44,8 +41,5 @@ public class RequestDeleteMacro extends GameClientPacket
} }
getClient().getPlayer().deleteMacro(_id); getClient().getPlayer().deleteMacro(_id);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
sm.addString("Delete macro id=" + _id);
sendPacket(sm);
} }
} }

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
View File

@@ -76,16 +76,12 @@ public class RequestGiveNickName extends GameClientPacket
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("Target needs to be online to get a title.");
sm.addString("Target needs to be online to get a title");
player.sendPacket(sm);
} }
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("Target does not belong to your clan.");
sm.addString("Target does not belong to your clan");
player.sendPacket(sm);
} }
} }
} }

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java
View File

@@ -21,9 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.model.quest.QuestState; 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.QuestList;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class RequestQuestAbort extends GameClientPacket public class RequestQuestAbort extends GameClientPacket
{ {
@@ -61,9 +59,7 @@ public class RequestQuestAbort extends GameClientPacket
if (qs != null) if (qs != null)
{ {
qs.exitQuest(true); qs.exitQuest(true);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); player.sendMessage("Quest aborted.");
sm.addString("Quest aborted.");
player.sendPacket(sm);
player.sendPacket(new QuestList(player)); player.sendPacket(new QuestList(player));
} }
} }

11
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUserCommand.java
View File

@@ -21,8 +21,6 @@ import java.util.logging.Logger;
import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.handler.IUserCommandHandler;
import org.l2jmobius.gameserver.handler.UserCommandHandler; import org.l2jmobius.gameserver.handler.UserCommandHandler;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 public class RequestUserCommand extends GameClientPacket
{ {
@@ -46,14 +44,7 @@ public class RequestUserCommand extends GameClientPacket
} }
final IUserCommandHandler handler = UserCommandHandler.getInstance().getUserCommandHandler(_command); final IUserCommandHandler handler = UserCommandHandler.getInstance().getUserCommandHandler(_command);
if (handler != null)
if (handler == null)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
sm.addString("user commandID " + _command + " not implemented yet");
player.sendPacket(sm);
}
else
{ {
handler.useUserCommand(_command, getClient().getPlayer()); handler.useUserCommand(_command, getClient().getPlayer());
} }