TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-04-28 01:10:52 +00:00
Code Issues Projects Releases Wiki Activity

Use user object to send messages when possible.

Browse source
This commit is contained in:
KHobbits 2013-08-15 01:53:22 +01:00
parent ff41588c3b
commit ffae86dd42
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Essentials/src/com/earth2me/essentials/Essentials.java
View file

@ -303,7 +303,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
if (user.isVanished()) if (user.isVanished())
{ {
user.setVanished(false); user.setVanished(false);
p.sendMessage(_("unvanishedReload")); user.sendMessage(_("unvanishedReload"));
} }
} }
cleanupOpenInventories(); cleanupOpenInventories();
@ -715,7 +715,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
} }
for (String messageText : broadcast.getLines()) for (String messageText : broadcast.getLines())
{ {
player.sendMessage(messageText); user.sendMessage(messageText);
} }
} }
} }

2
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View file

@ -404,7 +404,7 @@ public class EssentialsPlayerListener implements Listener
final User spyer = ess.getUser(onlinePlayer); final User spyer = ess.getUser(onlinePlayer);
if (spyer.isSocialSpyEnabled() && !player.equals(onlinePlayer)) if (spyer.isSocialSpyEnabled() && !player.equals(onlinePlayer))
{ {
onlinePlayer.sendMessage(player.getDisplayName() + " : " + event.getMessage()); spyer.sendMessage(player.getDisplayName() + " : " + event.getMessage());
} }
} }
} }

2
Essentials/src/com/earth2me/essentials/User.java
View file

@ -568,7 +568,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
final User user = ess.getUser(player); final User user = ess.getUser(player);
if (user.isAuthorized("essentials.kick.notify")) if (user.isAuthorized("essentials.kick.notify"))
{ {
player.sendMessage(_("playerKicked", Console.NAME, getName(), kickReason)); user.sendMessage(_("playerKicked", Console.NAME, getName(), kickReason));
} }
} }
} }

5
Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
View file

@ -51,17 +51,18 @@ public class Commandlightning extends EssentialsCommand
final List<Player> matchedPlayers = server.matchPlayer(args[0]); final List<Player> matchedPlayers = server.matchPlayer(args[0]);
for (Player matchPlayer : matchedPlayers) for (Player matchPlayer : matchedPlayers)
{ {
User matchUser = ess.getUser(matchPlayer);
sender.sendMessage(_("lightningUse", matchPlayer.getDisplayName())); sender.sendMessage(_("lightningUse", matchPlayer.getDisplayName()));
final LightningStrike strike = matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation()); final LightningStrike strike = matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation());
if (!ess.getUser(matchPlayer).isGodModeEnabled()) if (!matchUser.isGodModeEnabled())
{ {
matchPlayer.damage(power, strike); matchPlayer.damage(power, strike);
} }
if (ess.getSettings().warnOnSmite()) if (ess.getSettings().warnOnSmite())
{ {
matchPlayer.sendMessage(_("lightningSmited")); matchUser.sendMessage(_("lightningSmited"));
} }
} }
} }

4
Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
View file

@ -80,9 +80,9 @@ public class Commandmsg extends EssentialsCommand
continue; continue;
} }
matchPlayer.sendMessage(_("msgFormat", senderName, translatedMe, message)); matchedUser.sendMessage(_("msgFormat", senderName, translatedMe, message));
replyTo.setReplyTo(matchPlayer); replyTo.setReplyTo(matchPlayer);
ess.getUser(matchPlayer).setReplyTo(sender); matchedUser.setReplyTo(sender);
} }
if (!foundUser) if (!foundUser)