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

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:

	PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java
This commit is contained in:
boy0001 2015-06-11 03:23:42 +10:00
commit 1815fb09b3
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -416,7 +416,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
final Set<Player> recipients = event.getRecipients();
recipients.clear();
for (final Player p : Bukkit.getOnlinePlayers()) {
if (plot.equals(MainUtil.getPlot(BukkitUtil.getLocation(p)))) {
if (p.hasPermission("plots.admin.command.chat") || plot.equals(MainUtil.getPlot(BukkitUtil.getLocation(p)))) {
recipients.add(p);
}
}

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

@ -272,7 +272,7 @@ public class MainUtil {
z = bot.getZ() + plotworld.DEFAULT_HOME.z;
}
final int y = Math.max(getHeighestBlock(plot.world, x, z), manager.getSignLoc(PlotSquared.getPlotWorld(plot.world), plot).getY());
return new Location(plot.world, x, y, z);
return new Location(plot.world, x, y + 1, z);
}
final Location top = getPlotTopLoc(plot.world, plot.id);
final Location bot = getPlotBottomLoc(plot.world, plot.id);
@ -280,7 +280,7 @@ public class MainUtil {
final int z = bot.getZ();
PlotManager manager = PlotSquared.getPlotManager(plot.world);
final int y = Math.max(getHeighestBlock(plot.world, x, z), manager.getSignLoc(PlotSquared.getPlotWorld(plot.world), plot).getY());
return new Location(plot.world, x, y, z);
return new Location(plot.world, x, y + 1, z);
}
public static boolean teleportPlayer(final PlotPlayer player, final Location from, final Plot plot) {

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

@ -96,14 +96,14 @@ public class BukkitChunkManager extends ChunkManager {
@Override
public void regenerateChunk(String world, ChunkLoc loc) {
World bukkitWorld = Bukkit.getWorld(world);
bukkitWorld.regenerateChunk(loc.x, loc.z);
Chunk chunk = bukkitWorld.getChunkAt(loc.x, loc.z);
for (final Entity entity : chunk.getEntities()) {
if (entity instanceof Player) {
final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(entity.getLocation()));
World worldObj = Bukkit.getWorld(world);
worldObj.regenerateChunk(loc.x, loc.z);
for (final Player player : worldObj.getPlayers()) {
org.bukkit.Location locObj = player.getLocation();
if (locObj.getBlockX() >> 4 == loc.x && locObj.getBlockZ() >> 4 == loc.z && !locObj.getBlock().isEmpty()) {
final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(locObj));
if (plot != null) {
final PlotPlayer pp = BukkitUtil.getPlayer((Player) entity);
final PlotPlayer pp = BukkitUtil.getPlayer(player);
pp.teleport(MainUtil.getDefaultHome(plot));
}
}