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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
MattBDev 2016-06-22 23:10:15 -04:00
commit 532fd09800
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/src/main/java/com/intellectualcrafters/plot/commands/Kick.java
View File

@ -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<PlotPlayer> 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);

2
Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
View File

@ -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());
}