From 58eedef7732c27de67d9e8873d02fb1f1584dd8c Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Mon, 12 Oct 2015 16:15:59 -0700 Subject: [PATCH] Allowed ignoring offline players. --- .../GriefPrevention/GriefPrevention.java | 7 +--- .../GriefPrevention/PlayerEventHandler.java | 37 ++++++++++--------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java index d6362fb..b7d2b6d 100644 --- a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java +++ b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java @@ -2141,17 +2141,12 @@ public class GriefPrevention extends JavaPlugin if(args.length < 1) return false; //validate target player - Player targetPlayer = this.getServer().getPlayer(args[0]); + OfflinePlayer targetPlayer = this.resolvePlayerByName(args[0]); if(targetPlayer == null) { GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound2); return true; } - else if(targetPlayer.hasPermission("griefprevention.notignorable")) - { - GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotIgnorable); - return true; - } this.setIgnoreStatus(player, targetPlayer, IgnoreMode.StandardIgnore); diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index 4f42f0c..5d9229b 100644 --- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -178,25 +178,28 @@ class PlayerEventHandler implements Listener makeSocialLogEntry(player.getName(), message); //based on ignore lists, remove some of the audience - Set recipientsToRemove = new HashSet(); - PlayerData playerData = this.dataStore.getPlayerData(player.getUniqueId()); - for(Player recipient : recipients) + if(!player.hasPermission("griefprevention.notignorable")) { - if(playerData.ignoredPlayers.containsKey(recipient.getUniqueId())) - { - recipientsToRemove.add(recipient); - } - else - { - PlayerData targetPlayerData = this.dataStore.getPlayerData(recipient.getUniqueId()); - if(targetPlayerData.ignoredPlayers.containsKey(player.getUniqueId())) - { - recipientsToRemove.add(recipient); - } - } + Set recipientsToRemove = new HashSet(); + PlayerData playerData = this.dataStore.getPlayerData(player.getUniqueId()); + for(Player recipient : recipients) + { + if(playerData.ignoredPlayers.containsKey(recipient.getUniqueId())) + { + recipientsToRemove.add(recipient); + } + else + { + PlayerData targetPlayerData = this.dataStore.getPlayerData(recipient.getUniqueId()); + if(targetPlayerData.ignoredPlayers.containsKey(player.getUniqueId())) + { + recipientsToRemove.add(recipient); + } + } + } + + recipients.removeAll(recipientsToRemove); } - - recipients.removeAll(recipientsToRemove); } }