Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-12 10:24:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolves #100

Browse Source
This commit is contained in:
boy0001 2015-02-03 14:14:51 +11:00
parent 59541f78da
commit e50097a5da
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotPlusListener.java
View File

@ -46,6 +46,7 @@ import org.bukkit.event.player.PlayerPickupItemEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import com.intellectualcrafters.plot.PlotMain;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.events.PlayerEnterPlotEvent; import com.intellectualcrafters.plot.events.PlayerEnterPlotEvent;
import com.intellectualcrafters.plot.events.PlayerLeavePlotEvent; import com.intellectualcrafters.plot.events.PlayerLeavePlotEvent;
@ -186,16 +187,19 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
} }
if (booleanFlag(plot, "notify-enter", false)) { if (booleanFlag(plot, "notify-enter", false)) {
if (plot.hasOwner()) { if (plot.hasOwner()) {
final Player player = UUIDHandler.uuidWrapper.getPlayer(plot.getOwner()); final Player player = UUIDHandler.uuidWrapper.getPlayer(plot.getOwner());
if (player == null) { if (player == null) {
return; return;
} }
if (UUIDHandler.getUUID(player).equals(UUIDHandler.getUUID(event.getPlayer()))) { Player trespasser = event.getPlayer();
if (UUIDHandler.getUUID(player).equals(UUIDHandler.getUUID(trespasser))) {
return;
}
if (PlotMain.hasPermission(trespasser, "plots.flag.notify-enter.bypass")) {
return; return;
} }
if (player.isOnline()) { if (player.isOnline()) {
PlayerFunctions.sendMessage(player, C.NOTIFY_ENTER.s().replace("%player", event.getPlayer().getName()).replace("%plot", plot.getId().toString())); PlayerFunctions.sendMessage(player, C.NOTIFY_ENTER.s().replace("%player", trespasser.getName()).replace("%plot", plot.getId().toString()));
} }
} }
} }
@ -230,11 +234,15 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
if (player == null) { if (player == null) {
return; return;
} }
if (UUIDHandler.getUUID(player).equals(UUIDHandler.getUUID(event.getPlayer()))) { Player trespasser = event.getPlayer();
if (UUIDHandler.getUUID(player).equals(UUIDHandler.getUUID(trespasser))) {
return;
}
if (PlotMain.hasPermission(trespasser, "plots.flag.notify-enter.bypass")) {
return; return;
} }
if (player.isOnline()) { if (player.isOnline()) {
PlayerFunctions.sendMessage(player, C.NOTIFY_LEAVE.s().replace("%player", event.getPlayer().getName()).replace("%plot", plot.getId().toString())); PlayerFunctions.sendMessage(player, C.NOTIFY_LEAVE.s().replace("%player", trespasser.getName()).replace("%plot", plot.getId().toString()));
} }
} }
} }