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

Merge remote-tracking branch 'origin/2.8' into 2.8

Browse Source
This commit is contained in:
Sauilitired 2015-02-20 11:53:41 +01:00
commit fa6b78f117
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
View File

@ -81,7 +81,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
// TODO restructure this // TODO restructure this
public static boolean teleportPlayer(final Player player, final Location from, final Plot plot) { public static boolean teleportPlayer(final Player player, final Location from, final Plot plot) {
final Plot bot = PlayerFunctions.getBottomPlot(player.getWorld().getName(), plot); final Plot bot = PlotHelper.getBottomPlot(player.getWorld().getName(), plot);
final PlayerTeleportToPlotEvent event = new PlayerTeleportToPlotEvent(player, from, bot); final PlayerTeleportToPlotEvent event = new PlayerTeleportToPlotEvent(player, from, bot);
Bukkit.getServer().getPluginManager().callEvent(event); Bukkit.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) { if (!event.isCancelled()) {
@ -253,7 +253,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
final Entity[] entities = chunk.getEntities(); final Entity[] entities = chunk.getEntities();
Entity entity; Entity entity;
for (int i = entities.length - 1; i >= 0; i--) { for (int i = entities.length - 1; i >= 0; i--) {
if (!((entity = entities[i]) instanceof Player) && !.isInPlot(entity.getLocation())) { if (!((entity = entities[i]) instanceof Player) && (PlotHelper.getPlot(BukkitUtil.getLocation(entity)) == null)) {
entity.remove(); entity.remove();
} }
} }

7
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
View File

@ -562,7 +562,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
return; return;
} }
Location loc = BukkitUtil.getLocation(event.getLocation()); Location loc = BukkitUtil.getLocation(event.getLocation());
final String world = loc.getWorld().getName(); final String world = loc.getWorld();
if (!isPlotWorld(world)) { if (!isPlotWorld(world)) {
return; return;
} }
@ -621,7 +621,9 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
e.setCancelled(true); e.setCancelled(true);
return; return;
} }
} else if (!plot.isAdded(p)) { } else {
UUID uuid = UUIDHandler.getUUID(p);
if (!plot.isAdded(uuid))
if (!BukkitMain.hasPermission(p, "plots.admin.build.other")) { if (!BukkitMain.hasPermission(p, "plots.admin.build.other")) {
if (isPlotArea(loc)) { if (isPlotArea(loc)) {
PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.build.other"); PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.build.other");
@ -631,6 +633,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
} }
} }
} }
}
} else { } else {
if (isPlotArea(loc)) { if (isPlotArea(loc)) {
e.setCancelled(true); e.setCancelled(true);