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

Use the sendMessage method when possible.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-11-23 02:31:09 +00:00
parent 085894e99a
commit 8e40c9bb53
5 changed files with 44 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java
View File

@ -48,7 +48,6 @@ import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUser; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUser;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.TeleportToLocation; import org.l2jmobius.gameserver.network.serverpackets.TeleportToLocation;
import org.l2jmobius.gameserver.templates.Npc; import org.l2jmobius.gameserver.templates.Npc;
@ -72,7 +71,6 @@ public class AdminCommands extends Thread
public void handleCommands(ClientThread client, String command) public void handleCommands(ClientThread client, String command)
{ {
SystemMessage sm;
StringTokenizer st; StringTokenizer st;
NpcInstance target; NpcInstance target;
String id; String id;
@ -214,9 +212,7 @@ public class AdminCommands extends Thread
} }
catch (StringIndexOutOfBoundsException e) catch (StringIndexOutOfBoundsException e)
{ {
sm = new SystemMessage(614); activeChar.sendMessage("Wrong or no Co-ordinates given.");
sm.addString("Wrong or no Co-ordinates given.");
activeChar.sendPacket(sm);
showMainPage(client); showMainPage(client);
} }
} }
@ -263,9 +259,7 @@ public class AdminCommands extends Thread
} }
catch (StringIndexOutOfBoundsException e) catch (StringIndexOutOfBoundsException e)
{ {
sm = new SystemMessage(614); activeChar.sendMessage("You didnt enter a character name to find.");
sm.addString("You didnt enter a character name to find.");
activeChar.sendPacket(sm);
listCharacters(client, 0); listCharacters(client, 0);
} }
} }
@ -278,9 +272,7 @@ public class AdminCommands extends Thread
} }
catch (StringIndexOutOfBoundsException e) catch (StringIndexOutOfBoundsException e)
{ {
sm = new SystemMessage(614); activeChar.sendMessage("Error while adding Exp-Sp.");
sm.addString("Error while adding Exp-Sp.");
activeChar.sendPacket(sm);
listCharacters(client, 0); listCharacters(client, 0);
} }
} }
@ -293,9 +285,7 @@ public class AdminCommands extends Thread
} }
catch (StringIndexOutOfBoundsException e) catch (StringIndexOutOfBoundsException e)
{ {
sm = new SystemMessage(614); activeChar.sendMessage("Error while adding skill.");
sm.addString("Error while adding skill.");
activeChar.sendPacket(sm);
listCharacters(client, 0); listCharacters(client, 0);
} }
} }
@ -309,9 +299,7 @@ public class AdminCommands extends Thread
} }
catch (StringIndexOutOfBoundsException e) catch (StringIndexOutOfBoundsException e)
{ {
sm = new SystemMessage(614); activeChar.sendMessage("Error while removing skill.");
sm.addString("Error while removing skill.");
activeChar.sendPacket(sm);
listCharacters(client, 0); listCharacters(client, 0);
} }
} }
@ -324,9 +312,7 @@ public class AdminCommands extends Thread
} }
catch (StringIndexOutOfBoundsException e) catch (StringIndexOutOfBoundsException e)
{ {
sm = new SystemMessage(614); activeChar.sendMessage("Error while modifying character.");
sm.addString("Error while modifying character.");
activeChar.sendPacket(sm);
listCharacters(client, 0); listCharacters(client, 0);
} }
} }
@ -339,9 +325,7 @@ public class AdminCommands extends Thread
} }
catch (StringIndexOutOfBoundsException e) catch (StringIndexOutOfBoundsException e)
{ {
sm = new SystemMessage(614); activeChar.sendMessage("Wrong or no Co-ordinates given.");
sm.addString("Wrong or no Co-ordinates given.");
activeChar.sendPacket(sm);
showTeleportCharWindow(client); showTeleportCharWindow(client);
} }
} }
@ -385,9 +369,7 @@ public class AdminCommands extends Thread
} }
catch (StringIndexOutOfBoundsException e) catch (StringIndexOutOfBoundsException e)
{ {
sm = new SystemMessage(614); activeChar.sendMessage("You didnt enter the seconds untill server shutdowns.");
sm.addString("You didnt enter the seconds untill server shutdowns.");
activeChar.sendPacket(sm);
serverShutdown(client, 0); serverShutdown(client, 0);
} }
} }
@ -426,9 +408,7 @@ public class AdminCommands extends Thread
} }
catch (StringIndexOutOfBoundsException e) catch (StringIndexOutOfBoundsException e)
{ {
sm = new SystemMessage(614); activeChar.sendMessage("Error while creating item.");
sm.addString("Error while creating item.");
activeChar.sendPacket(sm);
} }
} }
} }
@ -486,10 +466,10 @@ public class AdminCommands extends Thread
activeChar.sendPacket(adminReply); activeChar.sendPacket(adminReply);
} }
private void teleportTo(ClientThread client, String Cords) private void teleportTo(ClientThread client, String coords)
{ {
PlayerInstance activeChar = client.getActiveChar(); PlayerInstance activeChar = client.getActiveChar();
StringTokenizer st = new StringTokenizer(Cords); StringTokenizer st = new StringTokenizer(coords);
String x1 = st.nextToken(); String x1 = st.nextToken();
int x = Integer.parseInt(x1); int x = Integer.parseInt(x1);
String y1 = st.nextToken(); String y1 = st.nextToken();
@ -501,9 +481,7 @@ public class AdminCommands extends Thread
activeChar.setX(x); activeChar.setX(x);
activeChar.setY(y); activeChar.setY(y);
activeChar.setZ(z); activeChar.setZ(z);
SystemMessage sm = new SystemMessage(614); activeChar.sendMessage("You have been teleported to " + coords);
sm.addString("You have been teleported to " + Cords);
activeChar.sendPacket(sm);
showMainPage(client); showMainPage(client);
} }
@ -517,9 +495,7 @@ public class AdminCommands extends Thread
} }
ItemList il = new ItemList(activeChar, true); ItemList il = new ItemList(activeChar, true);
activeChar.sendPacket(il); activeChar.sendPacket(il);
SystemMessage sm = new SystemMessage(614); activeChar.sendMessage("You have spawned " + num + " item(s) number " + id + " in your inventory.");
sm.addString("You have spawned " + num + " item(s) number " + id + " in your inventory.");
activeChar.sendPacket(sm);
NpcHtmlMessage adminReply = new NpcHtmlMessage(5); NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
StringBuffer replyMSG = new StringBuffer("<html><title>Item Creation Complete(I Hope)</title>"); StringBuffer replyMSG = new StringBuffer("<html><title>Item Creation Complete(I Hope)</title>");
replyMSG.append("<body>"); replyMSG.append("<body>");
@ -672,13 +648,9 @@ public class AdminCommands extends Thread
String sp = st.nextToken(); String sp = st.nextToken();
int expval = Integer.parseInt(exp); int expval = Integer.parseInt(exp);
int spval = Integer.parseInt(sp); int spval = Integer.parseInt(sp);
SystemMessage sm = new SystemMessage(614); player.sendMessage("Admin is adding you " + expval + " xp and " + spval + " sp.");
sm.addString("Admin is adding you " + expval + " xp and " + spval + " sp.");
player.sendPacket(sm);
player.addExpAndSp(expval, spval); player.addExpAndSp(expval, spval);
SystemMessage smA = new SystemMessage(614); activeChar.sendMessage("Added " + expval + " xp and " + spval + " sp to " + player.getName() + ".");
smA.addString("Added " + expval + " xp and " + spval + " sp to " + player.getName() + ".");
activeChar.sendPacket(smA);
showCharacterList(client, _characterToManipulate); showCharacterList(client, _characterToManipulate);
} }
} }
@ -712,9 +684,7 @@ public class AdminCommands extends Thread
int pvpflagval = Integer.parseInt(pvpflag); int pvpflagval = Integer.parseInt(pvpflag);
int pvpkillsval = Integer.parseInt(pvpkills); int pvpkillsval = Integer.parseInt(pvpkills);
int classidval = Integer.parseInt(classid); int classidval = Integer.parseInt(classid);
SystemMessage sm = new SystemMessage(614); player.sendMessage("Admin has changed your stats. Hp: " + hpval + " HpMax: " + hpmaxval + " Mp: " + mpval + " MpMax: " + mpmaxval + " MaxLoad: " + loadval + " Karma: " + karmaval + " Pvp: " + pvpflagval + " / " + pvpkillsval + " ClassId: " + classidval);
sm.addString("Admin has changed your stats. Hp: " + hpval + " HpMax: " + hpmaxval + " Mp: " + mpval + " MpMax: " + mpmaxval + " MaxLoad: " + loadval + " Karma: " + karmaval + " Pvp: " + pvpflagval + " / " + pvpkillsval + " ClassId: " + classidval);
player.sendPacket(sm);
player.setCurrentHp(hpval); player.setCurrentHp(hpval);
player.setCurrentMp(mpval); player.setCurrentMp(mpval);
player.setMaxHp(hpmaxval); player.setMaxHp(hpmaxval);
@ -732,9 +702,7 @@ public class AdminCommands extends Thread
su.addAttribute(StatusUpdate.KARMA, karmaval); su.addAttribute(StatusUpdate.KARMA, karmaval);
su.addAttribute(StatusUpdate.PVP_FLAG, pvpflagval); su.addAttribute(StatusUpdate.PVP_FLAG, pvpflagval);
player.sendPacket(su); player.sendPacket(su);
SystemMessage smA = new SystemMessage(614); activeChar.sendMessage("Changed stats of " + player.getName() + ". " + " Hp: " + hpval + " HpMax: " + hpmaxval + " Mp: " + mpval + " MpMax: " + mpmaxval + " MaxLoad: " + loadval + " Karma: " + karmaval + " Pvp: " + pvpflagval + " / " + pvpkillsval + " ClassId: " + classidval);
smA.addString("Changed stats of " + player.getName() + ". " + " Hp: " + hpval + " HpMax: " + hpmaxval + " Mp: " + mpval + " MpMax: " + mpmaxval + " MaxLoad: " + loadval + " Karma: " + karmaval + " Pvp: " + pvpflagval + " / " + pvpkillsval + " ClassId: " + classidval);
activeChar.sendPacket(smA);
showCharacterList(client, _characterToManipulate); showCharacterList(client, _characterToManipulate);
} }
} }
@ -795,15 +763,11 @@ public class AdminCommands extends Thread
PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate); PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate);
if (player.getName().equals(activeChar.getName())) if (player.getName().equals(activeChar.getName()))
{ {
SystemMessage sm = new SystemMessage(614); activeChar.sendMessage("You cannot logout your character.");
sm.addString("You cannot logout your character.");
activeChar.sendPacket(sm);
} }
else else
{ {
SystemMessage sm = new SystemMessage(614); activeChar.sendMessage("Character " + player.getName() + " disconnected from server.");
sm.addString("Character " + player.getName() + " disconnected from server.");
activeChar.sendPacket(sm);
LeaveWorld ql = new LeaveWorld(); LeaveWorld ql = new LeaveWorld();
player.sendPacket(ql); player.sendPacket(ql);
try try
@ -893,9 +857,7 @@ public class AdminCommands extends Thread
PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate); PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate);
if (player.getName().equals(activeChar.getName())) if (player.getName().equals(activeChar.getName()))
{ {
SystemMessage sm = new SystemMessage(614); player.sendMessage("You cannot teleport your character.");
sm.addString("You cannot teleport your character.");
player.sendPacket(sm);
} }
else else
{ {
@ -906,17 +868,13 @@ public class AdminCommands extends Thread
int y = Integer.parseInt(y1); int y = Integer.parseInt(y1);
String z1 = st.nextToken(); String z1 = st.nextToken();
int z = Integer.parseInt(z1); int z = Integer.parseInt(z1);
SystemMessage sm = new SystemMessage(614); player.sendMessage("Admin is teleporting you.");
sm.addString("Admin is teleporting you.");
player.sendPacket(sm);
TeleportToLocation tele = new TeleportToLocation(player, x, y, z); TeleportToLocation tele = new TeleportToLocation(player, x, y, z);
player.sendPacket(tele); player.sendPacket(tele);
player.setX(x); player.setX(x);
player.setY(y); player.setY(y);
player.setZ(z); player.setZ(z);
SystemMessage smA = new SystemMessage(614); activeChar.sendMessage("Character " + player.getName() + " teleported to " + x + " " + y + " " + z);
smA.addString("Character " + player.getName() + " teleported to " + x + " " + y + " " + z);
activeChar.sendPacket(smA);
} }
showMainPage(client); showMainPage(client);
} }
@ -927,9 +885,7 @@ public class AdminCommands extends Thread
PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate); PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate);
if (player.getName().equals(activeChar.getName())) if (player.getName().equals(activeChar.getName()))
{ {
SystemMessage sm = new SystemMessage(614); activeChar.sendMessage("You cannot self teleport.");
sm.addString("You cannot self teleport.");
activeChar.sendPacket(sm);
} }
else else
{ {
@ -941,9 +897,7 @@ public class AdminCommands extends Thread
activeChar.setX(x); activeChar.setX(x);
activeChar.setY(y); activeChar.setY(y);
activeChar.setZ(z); activeChar.setZ(z);
SystemMessage sm = new SystemMessage(614); activeChar.sendMessage("You have teleported to character " + player.getName() + ".");
sm.addString("You have teleported to character " + player.getName() + ".");
activeChar.sendPacket(sm);
} }
showMainPage(client); showMainPage(client);
} }
@ -984,15 +938,11 @@ public class AdminCommands extends Thread
spawn.setRespawnDelay(15); spawn.setRespawnDelay(15);
SpawnTable.getInstance().addNewSpawn(spawn); SpawnTable.getInstance().addNewSpawn(spawn);
spawn.init(); spawn.init();
SystemMessage sm = new SystemMessage(614); activeChar.sendMessage("Created " + template1.getName() + " on " + targetPlayer.getName() + ".");
sm.addString("Created " + template1.getName() + " on " + targetPlayer.getName() + ".");
activeChar.sendPacket(sm);
} }
catch (Exception e) catch (Exception e)
{ {
SystemMessage sm = new SystemMessage(614); activeChar.sendMessage("Target player is offline.");
sm.addString("Target player is offline.");
activeChar.sendPacket(sm);
} }
showHelpPage(client, "spawns.htm"); showHelpPage(client, "spawns.htm");
} }
@ -1223,9 +1173,7 @@ public class AdminCommands extends Thread
PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate); PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate);
if (player.getName().equals(activeChar.getName())) if (player.getName().equals(activeChar.getName()))
{ {
SystemMessage sm = new SystemMessage(614); player.sendMessage("There is no point in doing it on your character...");
sm.addString("There is no point in doing it on your character...");
player.sendPacket(sm);
} }
else else
{ {
@ -1239,9 +1187,7 @@ public class AdminCommands extends Thread
{ {
activeChar.addSkill(skill); activeChar.addSkill(skill);
} }
SystemMessage smA = new SystemMessage(614); activeChar.sendMessage("You now have all the skills of " + player.getName() + ".");
smA.addString("You now have all the skills of " + player.getName() + ".");
activeChar.sendPacket(smA);
} }
showSkillsPage(client); showSkillsPage(client);
} }
@ -1252,9 +1198,7 @@ public class AdminCommands extends Thread
PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate); PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate);
if (adminSkills == null) if (adminSkills == null)
{ {
SystemMessage smA = new SystemMessage(614); activeChar.sendMessage("You must first get the skills of someone to do this.");
smA.addString("You must first get the skills of someone to do this.");
activeChar.sendPacket(smA);
} }
else else
{ {
@ -1275,12 +1219,8 @@ public class AdminCommands extends Thread
{ {
activeChar.addSkill(skill); activeChar.addSkill(skill);
} }
SystemMessage sm = new SystemMessage(614); player.sendMessage("[GM]" + activeChar.getName() + " has updated your skills.");
sm.addString("[GM]" + activeChar.getName() + " has updated your skills."); activeChar.sendMessage("You now have all your skills back.");
player.sendPacket(sm);
SystemMessage smA = new SystemMessage(614);
smA.addString("You now have all your skills back.");
activeChar.sendPacket(smA);
adminSkills = null; adminSkills = null;
} }
showSkillsPage(client); showSkillsPage(client);
@ -1304,18 +1244,13 @@ public class AdminCommands extends Thread
Skill skill = SkillTable.getInstance().getInfo(idval, levelval); Skill skill = SkillTable.getInstance().getInfo(idval, levelval);
if (skill != null) if (skill != null)
{ {
SystemMessage sm = new SystemMessage(614); player.sendMessage("Admin gave you the skill " + skill.getName() + ".");
sm.addString("Admin gave you the skill " + skill.getName() + ".");
player.sendPacket(sm);
player.addSkill(skill); player.addSkill(skill);
SystemMessage smA = new SystemMessage(614); activeChar.sendMessage("You gave the skill " + skill.getName() + " to " + player.getName() + ".");
smA.addString("You gave the skill " + skill.getName() + " to " + player.getName() + ".");
activeChar.sendPacket(smA);
} }
else else
{ {
SystemMessage smA = new SystemMessage(614); activeChar.sendMessage("Error: there is no such skill.");
smA.addString("Error: there is no such skill.");
} }
showSkillsPage(client); showSkillsPage(client);
} }
@ -1328,18 +1263,13 @@ public class AdminCommands extends Thread
Skill skill = SkillTable.getInstance().getInfo(idval, player.getSkillLevel(idval)); Skill skill = SkillTable.getInstance().getInfo(idval, player.getSkillLevel(idval));
if (skill != null) if (skill != null)
{ {
SystemMessage sm = new SystemMessage(614); player.sendMessage("Admin removed the skill " + skill.getName() + ".");
sm.addString("Admin removed the skill " + skill.getName() + ".");
player.sendPacket(sm);
player.removeSkill(skill); player.removeSkill(skill);
SystemMessage smA = new SystemMessage(614); activeChar.sendMessage("You removed the skill " + skill.getName() + " from " + player.getName() + ".");
smA.addString("You removed the skill " + skill.getName() + " from " + player.getName() + ".");
activeChar.sendPacket(smA);
} }
else else
{ {
SystemMessage smA = new SystemMessage(614); activeChar.sendMessage("Error: there is no such skill.");
smA.addString("Error: there is no such skill.");
} }
removeSkillsPage(client); removeSkillsPage(client);
} }

12
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/GmListManager.java
View File

@ -22,7 +22,6 @@ import java.util.List;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.serverpackets.ServerBasePacket; import org.l2jmobius.gameserver.network.serverpackets.ServerBasePacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class GmListManager public class GmListManager
{ {
@ -56,19 +55,14 @@ public class GmListManager
{ {
if (_gmList.isEmpty()) if (_gmList.isEmpty())
{ {
SystemMessage sm = new SystemMessage(614); player.sendMessage("No GM online.");
sm.addString("No GM online");
} }
else else
{ {
SystemMessage sm = new SystemMessage(614); player.sendMessage(_gmList.size() + " GM's online:");
sm.addString("" + _gmList.size() + " GM's online:");
player.sendPacket(sm);
for (int i = 0; i < _gmList.size(); ++i) for (int i = 0; i < _gmList.size(); ++i)
{ {
sm = new SystemMessage(614); player.sendMessage(_gmList.get(i).getName());
sm.addString(_gmList.get(i).getName());
player.sendPacket(sm);
} }
} }
} }

4
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1499,9 +1499,7 @@ public class PlayerInstance extends Creature
if (SkillHandler.getInstance().getSkillHandler(skill.getId()) == null) if (SkillHandler.getInstance().getSkillHandler(skill.getId()) == null)
{ {
SystemMessage sm = new SystemMessage(614); sendMessage("This skill is not implemented yet.");
sm.addString("This skill is not implemented yet.");
sendPacket(sm);
return; return;
} }
if (getCurrentMp() < skill.getMpConsume()) if (getCurrentMp() < skill.getMpConsume())

4
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
View File

@ -42,9 +42,7 @@ public class RequestGiveNickName extends ClientBasePacket
{ {
SystemMessage sm = new SystemMessage(271); SystemMessage sm = new SystemMessage(271);
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
sm = new SystemMessage(614); activeChar.sendMessage("But you can do it freely for now ;)");
sm.addString("But you can do it freely");
sm.addString("for now ;)");
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
} }
if ((member = World.getInstance().getPlayer(target)).getClanId() == activeChar.getClanId()) if ((member = World.getInstance().getPlayer(target)).getClanId() == activeChar.getClanId())

11
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
View File

@ -23,7 +23,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.ClientThread;
import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class SendBypassBuildCmd extends ClientBasePacket public class SendBypassBuildCmd extends ClientBasePacket
{ {
@ -74,18 +73,12 @@ public class SendBypassBuildCmd extends ClientBasePacket
if (activeChar.isInvul()) if (activeChar.isInvul())
{ {
activeChar.setIsInvul(false); activeChar.setIsInvul(false);
String text = "Your status is set back to mortal."; activeChar.sendMessage("Your status is set back to mortal.");
SystemMessage sm = new SystemMessage(614);
sm.addString(text);
activeChar.sendPacket(sm);
} }
else else
{ {
activeChar.setIsInvul(true); activeChar.setIsInvul(true);
String text = "You are now Invulnerable"; activeChar.sendMessage("You are now Invulnerable.");
SystemMessage sm = new SystemMessage(614);
sm.addString(text);
activeChar.sendPacket(sm);
} }
} }
} }