Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-30 17:57:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #517 + possibly #519

Browse Source
This commit is contained in:
boy0001 2015-08-08 16:40:43 +10:00
parent d8e7c9805b
commit 64063463ec
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/intellectualcrafters/plot/object/PlotInventory.java
View File

@ -51,6 +51,9 @@ public class PlotInventory {
} }
public PlotItemStack getItem(int index) { public PlotItemStack getItem(int index) {
if (index < 0 || index >= items.length) {
return null;
}
return items[index]; return items[index];
} }

17
src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java
View File

@ -913,13 +913,16 @@ public class BukkitChunkManager extends ChunkManager {
final int tz = pos2.getZ(); final int tz = pos2.getZ();
for (final Entity entity : entities) { for (final Entity entity : entities) {
if (entity instanceof Player) { if (entity instanceof Player) {
final Player player = (Player) entity; org.bukkit.Location loc = entity.getLocation();
final PlotPlayer pp = BukkitUtil.getPlayer(player); if (loc.getX() >= bx && loc.getX() <= tx && loc.getZ() >= bz && loc.getZ() <= tz) {
Plot plot = pp.getCurrentPlot(); final Player player = (Player) entity;
if (plot != null) { final PlotPlayer pp = BukkitUtil.getPlayer(player);
final Location plotHome = MainUtil.getDefaultHome(plot); Plot plot = pp.getCurrentPlot();
if (pp.getLocation().getY() <= plotHome.getY()) { if (plot != null) {
pp.teleport(plotHome); final Location plotHome = MainUtil.getDefaultHome(plot);
if (pp.getLocation().getY() <= plotHome.getY()) {
pp.teleport(plotHome);
}
} }
} }
} }