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

Merge pull request #349 from MinelinkNetwork/master

Browse Source 
Only re-teleport players if stuck after chunk has regenerated
This commit is contained in:
Jesse Boyd 2015-06-10 12:04:11 +10:00
commit c21b714898
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java
View File

@ -98,10 +98,10 @@ public class BukkitChunkManager extends ChunkManager {
public void regenerateChunk(String world, ChunkLoc loc) { public void regenerateChunk(String world, ChunkLoc loc) {
World worldObj = Bukkit.getWorld(world); World worldObj = Bukkit.getWorld(world);
worldObj.regenerateChunk(loc.x, loc.z); worldObj.regenerateChunk(loc.x, loc.z);
for (final Player player : Bukkit.getOnlinePlayers()) { for (final Player player : worldObj.getPlayers()) {
Location playerLoc = BukkitUtil.getLocation(player.getLocation()); org.bukkit.Location locObj = player.getLocation();
if (playerLoc.getX() >> 4 == loc.x && playerLoc.getZ() >> 4 == loc.z) { if (locObj.getBlockX() >> 4 == loc.x && locObj.getBlockZ() >> 4 == loc.z && !locObj.getBlock().isEmpty()) {
final Plot plot = MainUtil.getPlot(playerLoc); final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(locObj));
if (plot != null) { if (plot != null) {
final PlotPlayer pp = BukkitUtil.getPlayer(player); final PlotPlayer pp = BukkitUtil.getPlayer(player);
pp.teleport(MainUtil.getDefaultHome(plot)); pp.teleport(MainUtil.getDefaultHome(plot));