From 52f05f3dfbc955a7735f8aa9075435f924df3f52 Mon Sep 17 00:00:00 2001 From: boy0001 Date: Mon, 29 Dec 2014 12:02:55 +1100 Subject: [PATCH] increment version number --- PlotSquared/pom.xml | 2 +- .../intellectualcrafters/plot/commands/RegenAllRoads.java | 2 +- .../plot/generator/HybridPlotWorld.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PlotSquared/pom.xml b/PlotSquared/pom.xml index d36110989..02da958f7 100644 --- a/PlotSquared/pom.xml +++ b/PlotSquared/pom.xml @@ -6,7 +6,7 @@ com.intellectualcrafters PlotSquared - 2.4.3 + 2.5.0 PlotSquared jar diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java index aea4a10c9..78f5da6e9 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java @@ -44,7 +44,7 @@ import org.bukkit.entity.Player; public class RegenAllRoads extends SubCommand { public RegenAllRoads() { - super(Command.REGENALLROADS, "Regenerate all road schematic in your current chunk", "regenallroads", CommandCategory.DEBUG, false); + super(Command.REGENALLROADS, "Regenerate all roads in the map", "regenallroads", CommandCategory.DEBUG, false); } @Override diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java index b71298f33..7521d2598 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java @@ -241,8 +241,8 @@ public class HybridPlotWorld extends PlotWorld { byte data = blocks1[index].getData(); if (id != 0) { - addRoadBlock((short) (x - this.PATH_WIDTH_LOWER), (short) (y + this.OFFSET), (short) (z + this.PATH_WIDTH_LOWER + 1), id, data); - addRoadBlock((short) (z + this.PATH_WIDTH_LOWER + 1), (short) (y + this.OFFSET), (short) (x - this.PATH_WIDTH_LOWER), id, data); + addOverlayBlock((short) (x - this.PATH_WIDTH_LOWER), (short) (y + this.OFFSET), (short) (z + this.PATH_WIDTH_LOWER + 1), id, data); + addOverlayBlock((short) (z + this.PATH_WIDTH_LOWER + 1), (short) (y + this.OFFSET), (short) (x - this.PATH_WIDTH_LOWER), id, data); } } } @@ -257,14 +257,14 @@ public class HybridPlotWorld extends PlotWorld { short id = blocks2[index].getBlock(); byte data = blocks2[index].getData(); if (id != 0) { - addRoadBlock((short) (x - this.PATH_WIDTH_LOWER), (short) (y + this.OFFSET), (short) (z - this.PATH_WIDTH_LOWER), id, data); + addOverlayBlock((short) (x - this.PATH_WIDTH_LOWER), (short) (y + this.OFFSET), (short) (z - this.PATH_WIDTH_LOWER), id, data); } } } } } - public void addRoadBlock(short x, short y, short z, short id, byte data) { + public void addOverlayBlock(short x, short y, short z, short id, byte data) { if (z < 0) { z += this.SIZE; }