From 16d191db2c3942dbace351f8e97e032073bece4c Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Thu, 23 Jun 2016 04:07:57 +1000 Subject: [PATCH 1/2] Fixes /plot kick * --- .../java/com/intellectualcrafters/plot/commands/Kick.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Kick.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Kick.java index 57743d03c..17020d063 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Kick.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Kick.java @@ -11,7 +11,6 @@ import com.intellectualcrafters.plot.util.UUIDHandler; import com.intellectualcrafters.plot.util.WorldUtil; import com.plotsquared.general.commands.Argument; import com.plotsquared.general.commands.CommandDeclaration; - import java.util.HashSet; import java.util.Set; import java.util.UUID; @@ -48,7 +47,12 @@ public class Kick extends SubCommand { Set players = new HashSet<>(); for (UUID uuid : uuids) { if (uuid == DBFunc.everyone) { - players.addAll(plot.getPlayersInPlot()); + for (PlotPlayer pp : plot.getPlayersInPlot()) { + if (pp == player || pp.hasPermission("plots.admin.entry.denied")) { + continue; + } + players.add(pp); + } break; } PlotPlayer pp = UUIDHandler.getPlayer(uuid); From e6387419f7767eea90de436af9a8114e69c7869c Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Thu, 23 Jun 2016 13:09:56 +1000 Subject: [PATCH 2/2] Potential fix for plot biome (untested) --- .../main/java/com/intellectualcrafters/plot/object/Plot.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java b/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java index 7d2d1a628..5d2fde8bf 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java @@ -1397,7 +1397,7 @@ public class Plot { * @return the name of the biome */ public String getBiome() { - Location loc = this.getBottomAbs(); + Location loc = this.getCenter(); return WorldUtil.IMP.getBiome(loc.getWorld(), loc.getX(), loc.getZ()); }