Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Find command target in world instead of channel (#328)

Browse Source
This commit is contained in:
MedicOP
2019-01-15 02:33:25 +01:00
committed by Ronan Lana
parent 8158955365
commit c63fc7475c
13 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/command/commands/gm2/ApCommand.java
View File

@@ -48,7 +48,7 @@ public class ApCommand extends Command {
player.changeRemainingAp(newAp, false); player.changeRemainingAp(newAp, false);
} else { } else {
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) { if (victim != null) {
int newAp = Integer.parseInt(params[1]); int newAp = Integer.parseInt(params[1]);
if (newAp < 0) newAp = 0; if (newAp < 0) newAp = 0;
@@ -56,7 +56,7 @@ public class ApCommand extends Command {
victim.changeRemainingAp(newAp, false); victim.changeRemainingAp(newAp, false);
} else { } else {
player.message("Player '" + params[0] + "' could not be found on this channel."); player.message("Player '" + params[0] + "' could not be found.");
} }
} }
} }

4
src/client/command/commands/gm2/ClearSavedLocationsCommand.java
View File

@@ -38,9 +38,9 @@ public class ClearSavedLocationsCommand extends Command {
MapleCharacter player = c.getPlayer(), victim; MapleCharacter player = c.getPlayer(), victim;
if (params.length > 0) { if (params.length > 0) {
victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim == null) { if (victim == null) {
player.message("Player '" + params[0] + "' could not be found on this channel."); player.message("Player '" + params[0] + "' could not be found.");
return; return;
} }
} else { } else {

4
src/client/command/commands/gm2/JailCommand.java
View File

@@ -51,7 +51,7 @@ public class JailCommand extends Command {
} }
} }
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) { if (victim != null) {
victim.addJailExpirationTime(minutesJailed * 60 * 1000); victim.addJailExpirationTime(minutesJailed * 60 * 1000);
@@ -68,7 +68,7 @@ public class JailCommand extends Command {
} }
} else { } else {
player.message("Player '" + params[0] + "' could not be found on this channel."); player.message("Player '" + params[0] + "' could not be found.");
} }
} }
} }

4
src/client/command/commands/gm2/JobCommand.java
View File

@@ -46,7 +46,7 @@ public class JobCommand extends Command {
player.changeJob(MapleJob.getById(jobid)); player.changeJob(MapleJob.getById(jobid));
player.equipChanged(); player.equipChanged();
} else if (params.length == 2) { } else if (params.length == 2) {
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) { if (victim != null) {
int jobid = Integer.parseInt(params[1]); int jobid = Integer.parseInt(params[1]);
@@ -58,7 +58,7 @@ public class JobCommand extends Command {
victim.changeJob(MapleJob.getById(jobid)); victim.changeJob(MapleJob.getById(jobid));
player.equipChanged(); player.equipChanged();
} else { } else {
player.message("Player '" + params[0] + "' could not be found on this channel."); player.message("Player '" + params[0] + "' could not be found.");
} }
} else { } else {
player.message("Syntax: !job <job id> <opt: IGN of another person>"); player.message("Syntax: !job <job id> <opt: IGN of another person>");

4
src/client/command/commands/gm2/SpCommand.java
View File

@@ -48,7 +48,7 @@ public class SpCommand extends Command {
player.updateRemainingSp(newSp); player.updateRemainingSp(newSp);
} else { } else {
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) { if (victim != null) {
int newSp = Integer.parseInt(params[1]); int newSp = Integer.parseInt(params[1]);
if (newSp < 0) newSp = 0; if (newSp < 0) newSp = 0;
@@ -58,7 +58,7 @@ public class SpCommand extends Command {
player.dropMessage(5, "SP given."); player.dropMessage(5, "SP given.");
} else { } else {
player.message("Player '" + params[0] + "' could not be found on this channel."); player.message("Player '" + params[0] + "' could not be found.");
} }
} }
} }

4
src/client/command/commands/gm2/UnJailCommand.java
View File

@@ -40,7 +40,7 @@ public class UnJailCommand extends Command {
return; return;
} }
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) { if (victim != null) {
if (victim.getJailExpirationTimeLeft() <= 0) { if (victim.getJailExpirationTimeLeft() <= 0) {
player.message("This player is already free."); player.message("This player is already free.");
@@ -50,7 +50,7 @@ public class UnJailCommand extends Command {
victim.message("By lack of concrete proof you are now unjailed. Enjoy freedom!"); victim.message("By lack of concrete proof you are now unjailed. Enjoy freedom!");
player.message(victim.getName() + " was unjailed."); player.message(victim.getName() + " was unjailed.");
} else { } else {
player.message("Player '" + params[0] + "' could not be found on this channel."); player.message("Player '" + params[0] + "' could not be found.");
} }
} }
} }

4
src/client/command/commands/gm3/FameCommand.java
View File

@@ -41,13 +41,13 @@ public class FameCommand extends Command {
return; return;
} }
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) { if (victim != null) {
victim.setFame(Integer.parseInt(params[1])); victim.setFame(Integer.parseInt(params[1]));
victim.updateSingleStat(MapleStat.FAME, victim.getFame()); victim.updateSingleStat(MapleStat.FAME, victim.getFame());
player.message("FAME given."); player.message("FAME given.");
} else { } else {
player.message("Player '" + params[0] + "' could not be found on this channel."); player.message("Player '" + params[0] + "' could not be found.");
} }
} }
} }

4
src/client/command/commands/gm3/GiveMesosCommand.java
View File

@@ -66,12 +66,12 @@ public class GiveMesosCommand extends Command {
} }
} }
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(recv_); MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv_);
if (victim != null) { if (victim != null) {
victim.gainMeso((int) mesos_, true); victim.gainMeso((int) mesos_, true);
player.message("MESO given."); player.message("MESO given.");
} else { } else {
player.message("Player '" + recv_ + "' could not be found on this channel."); player.message("Player '" + recv_ + "' could not be found.");
} }
} }
} }

4
src/client/command/commands/gm3/GiveNxCommand.java
View File

@@ -50,12 +50,12 @@ public class GiveNxCommand extends Command {
value = Integer.parseInt(params[0]); value = Integer.parseInt(params[0]);
} }
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(recv); MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv);
if (victim != null) { if (victim != null) {
victim.getCashShop().gainCash(1, value); victim.getCashShop().gainCash(1, value);
player.message("NX given."); player.message("NX given.");
} else { } else {
player.message("Player '" + recv + "' could not be found on this channel."); player.message("Player '" + recv + "' could not be found.");
} }
} }
} }

4
src/client/command/commands/gm3/GiveVpCommand.java
View File

@@ -40,12 +40,12 @@ public class GiveVpCommand extends Command {
return; return;
} }
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) { if (victim != null) {
victim.getClient().addVotePoints(Integer.parseInt(params[1])); victim.getClient().addVotePoints(Integer.parseInt(params[1]));
player.message("VP given."); player.message("VP given.");
} else { } else {
player.message("Player '" + params[0] + "' could not be found on this channel."); player.message("Player '" + params[0] + "' could not be found.");
} }
} }
} }

4
src/client/command/commands/gm3/HealPersonCommand.java
View File

@@ -36,11 +36,11 @@ public class HealPersonCommand extends Command {
@Override @Override
public void execute(MapleClient c, String[] params) { public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer(); MapleCharacter player = c.getPlayer();
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) { if (victim != null) {
victim.healHpMp(); victim.healHpMp();
} else { } else {
player.message("Player '" + params[0] + "' could not be found on this channel."); player.message("Player '" + params[0] + "' could not be found.");
} }
} }
} }

4
src/client/command/commands/gm3/HurtCommand.java
View File

@@ -35,11 +35,11 @@ public class HurtCommand extends Command {
@Override @Override
public void execute(MapleClient c, String[] params) { public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer(); MapleCharacter player = c.getPlayer();
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) { if (victim != null) {
victim.updateHp(1); victim.updateHp(1);
} else { } else {
player.message("Player '" + params[0] + "' could not be found on this channel."); player.message("Player '" + params[0] + "' could not be found.");
} }
} }
} }

4
src/client/command/commands/gm3/KillCommand.java
View File

@@ -42,12 +42,12 @@ public class KillCommand extends Command {
return; return;
} }
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) { if (victim != null) {
victim.updateHpMp(0); victim.updateHpMp(0);
Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(5, player.getName() + " used !kill on " + victim.getName())); Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(5, player.getName() + " used !kill on " + victim.getName()));
} else { } else {
player.message("Player '" + params[0] + "' could not be found on this channel."); player.message("Player '" + params[0] + "' could not be found.");
} }
} }
} }