Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-07-24 15:25:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changes to world border

Browse Source
This commit is contained in:
boy0001 2015-08-08 17:41:32 +10:00
parent a2b29da39d
commit cdcfd8c1b5
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -925,8 +925,9 @@ public class MainUtil {
final String world = plot.world; final String world = plot.world;
final PlotManager manager = PS.get().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
final PlotWorld plotworld = PS.get().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
final Location bot = manager.getPlotBottomLocAbs(plotworld, plot.id); PlotId id = new PlotId(Math.abs(plot.id.x) + 1, Math.abs(plot.id.x) + 1);
final Location top = manager.getPlotTopLocAbs(plotworld, plot.id); final Location bot = manager.getPlotBottomLocAbs(plotworld, id);
final Location top = manager.getPlotTopLocAbs(plotworld, id);
final int border = worldBorder.get(plot.world); final int border = worldBorder.get(plot.world);
final int botmax = Math.max(Math.abs(bot.getX()), Math.abs(bot.getZ())); final int botmax = Math.max(Math.abs(bot.getX()), Math.abs(bot.getZ()));
final int topmax = Math.max(Math.abs(top.getX()), Math.abs(top.getZ())); final int topmax = Math.max(Math.abs(top.getX()), Math.abs(top.getZ()));

12
src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
View File

@ -505,10 +505,7 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
PlotId id = plotManager.getPlotId(plotworld, x2, 0, getInt(to.getZ())); PlotId id = plotManager.getPlotId(plotworld, x2, 0, getInt(to.getZ()));
Plot lastPlot = (Plot) pp.getMeta("lastplot"); Plot lastPlot = (Plot) pp.getMeta("lastplot");
if (id == null) { if (id == null) {
if (lastPlot == null) { if (lastPlot != null && !plotExit(pp, lastPlot)) {
return;
}
if (!plotExit(pp, lastPlot)) {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, PERMISSION_ADMIN_EXIT_DENIED); MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, PERMISSION_ADMIN_EXIT_DENIED);
if (lastPlot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from)))) { if (lastPlot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from)))) {
player.teleport(from); player.teleport(from);
@ -521,7 +518,7 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
} }
} }
else if (lastPlot != null && id.equals(lastPlot.id)) { else if (lastPlot != null && id.equals(lastPlot.id)) {
return; return;
} }
else { else {
Plot plot = MainUtil.getPlot(worldname, id); Plot plot = MainUtil.getPlot(worldname, id);
@ -571,10 +568,7 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
PlotId id = plotManager.getPlotId(plotworld, x2, 0, z2); PlotId id = plotManager.getPlotId(plotworld, x2, 0, z2);
Plot lastPlot = (Plot) pp.getMeta("lastplot"); Plot lastPlot = (Plot) pp.getMeta("lastplot");
if (id == null) { if (id == null) {
if (lastPlot == null) { if (lastPlot != null && !plotExit(pp, lastPlot)) {
return;
}
if (!plotExit(pp, lastPlot)) {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, PERMISSION_ADMIN_EXIT_DENIED); MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, PERMISSION_ADMIN_EXIT_DENIED);
if (lastPlot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from)))) { if (lastPlot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from)))) {
player.teleport(from); player.teleport(from);