diff options
3 files changed, 14 insertions, 5 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java index c193561db..8e5e9cca8 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java @@ -51,7 +51,8 @@ public class EssentialsProtectBlockListener implements Listener return; } - if (prot.checkProtectionItems(ProtectConfig.alert_on_placement, id)) + if (!user.hasPermission("essentials.protect.alerts.notrigger") + && prot.checkProtectionItems(ProtectConfig.alert_on_placement, id)) { prot.getEssentialsConnect().alert(user, blockPlaced.getType().toString(), _("alertPlaced")); } @@ -249,7 +250,8 @@ public class EssentialsProtectBlockListener implements Listener } final Material type = block.getType(); - if (prot.checkProtectionItems(ProtectConfig.alert_on_break, typeId)) + if (!user.hasPermission("essentials.protect.alerts.notrigger") + && prot.checkProtectionItems(ProtectConfig.alert_on_break, typeId)) { prot.getEssentialsConnect().alert(user, type.toString(), _("alertBroke")); } diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java index 401bf345d..6e515e56d 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java @@ -83,6 +83,7 @@ public class EssentialsProtectPlayerListener implements Listener } } if (item != null + && !user.hasPermission("essentials.protect.alerts.notrigger") && prot.checkProtectionItems(ProtectConfig.alert_on_use, item.getTypeId())) { prot.getEssentialsConnect().alert(user, item.getType().toString(), _("alertUsed")); diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index 2814714a2..7ec9ee043 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -2,6 +2,7 @@ package com.earth2me.essentials.spawn; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.IEssentials; +import com.earth2me.essentials.OfflinePlayer; import com.earth2me.essentials.User; import java.util.logging.Level; import java.util.logging.Logger; @@ -27,7 +28,7 @@ public class EssentialsSpawnPlayerListener implements Listener } public void onPlayerRespawn(final PlayerRespawnEvent event) - { + { final User user = ess.getUser(event.getPlayer()); if (ess.getSettings().getRespawnAtHome()) @@ -58,7 +59,7 @@ public class EssentialsSpawnPlayerListener implements Listener { LOGGER.log(Level.FINE, "Old player join"); return; - } + } if (!"none".equalsIgnoreCase(ess.getSettings().getNewbieSpawn())) { ess.scheduleSyncDelayedTask(new NewPlayerTeleport(user), 1L); @@ -68,7 +69,7 @@ public class EssentialsSpawnPlayerListener implements Listener { ess.broadcastMessage(user, ess.getSettings().getAnnounceNewPlayerFormat(user)); } - + LOGGER.log(Level.FINE, "New player join"); } @@ -85,6 +86,11 @@ public class EssentialsSpawnPlayerListener implements Listener @Override public void run() { + if (user.getBase() instanceof OfflinePlayer) + { + return; + } + try { Location spawn = spawns.getSpawn(ess.getSettings().getNewbieSpawn()); |