EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 21:26:45 +01:00
Code Issues Projects Releases Wiki Activity

Possible fix for greeting spam

Browse Source
This commit is contained in:
Jesse Boyd 2016-08-15 09:30:39 +10:00
parent ef3380dc0a
commit f07ac646f3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
View File

@ -1187,14 +1187,13 @@ public class PlayerEvents extends PlotListener implements Listener {
} }
lb = new BukkitLazyBlock(blockId, block); lb = new BukkitLazyBlock(blockId, block);
ItemStack hand = player.getItemInHand(); ItemStack hand = player.getItemInHand();
if (eventType != null) { if (eventType != null && (eventType != PlayerBlockEventType.INTERACT_BLOCK || !player.isSneaking())) {
break; break;
} }
Material type = (hand == null) ? null : hand.getType(); Material type = (hand == null) ? null : hand.getType();
int id = (type == null) ? 0 : type.getId(); int id = (type == null) ? 0 : type.getId();
if (id == 0) { if (id == 0) {
eventType = PlayerBlockEventType.INTERACT_BLOCK; eventType = PlayerBlockEventType.INTERACT_BLOCK;
lb = new BukkitLazyBlock(0, block);
break; break;
} }
if (id < 198) { if (id < 198) {
@ -1689,7 +1688,7 @@ public class PlayerEvents extends PlotListener implements Listener {
if (area == null) { if (area == null) {
return; return;
} }
Plot now = area.getPlotAbs(loc); Plot now = area.getPlot(loc);
Plot lastPlot = pp.getMeta("lastplot"); Plot lastPlot = pp.getMeta("lastplot");
if (now == null) { if (now == null) {
if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport) { if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport) {
@ -1762,7 +1761,7 @@ public class PlayerEvents extends PlotListener implements Listener {
if (area == null) { if (area == null) {
return; return;
} }
Plot now = area.getPlotAbs(loc); Plot now = area.getPlot(loc);
Plot lastPlot = pp.getMeta("lastplot"); Plot lastPlot = pp.getMeta("lastplot");
if (now == null) { if (now == null) {
if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport) { if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport) {