From c5fab8dcd9e4b33c21bcb36dd1e1ddb6f0863965 Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Wed, 7 Jan 2015 15:14:30 -0800 Subject: [PATCH] Tweaked lava buckets near players rule. Ignoring non-survival players because they can't be injured, and leaving the nearby player's name out to avoid outing any invisible players. --- src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index 6a92714..f1836dc 100644 --- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -31,6 +31,7 @@ import java.util.regex.Pattern; import org.bukkit.ChatColor; import org.bukkit.Chunk; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.OfflinePlayer; @@ -1175,9 +1176,9 @@ class PlayerEventHandler implements Listener { Player otherPlayer = players.get(i); Location location = otherPlayer.getLocation(); - if(!otherPlayer.equals(player) && block.getY() >= location.getBlockY() - 1 && location.distanceSquared(block.getLocation()) < minLavaDistance * minLavaDistance) + if(!otherPlayer.equals(player) && otherPlayer.getGameMode() == GameMode.SURVIVAL && block.getY() >= location.getBlockY() - 1 && location.distanceSquared(block.getLocation()) < minLavaDistance * minLavaDistance) { - GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoLavaNearOtherPlayer, otherPlayer.getName()); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoLavaNearOtherPlayer, "another player"); bucketEvent.setCancelled(true); return; }