mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-11-26 12:35:15 +01:00
Fix minor issues
This commit is contained in:
parent
47c74cfa6d
commit
8c37cc5340
@ -46,6 +46,7 @@ import com.plotsquared.core.util.MathMan;
|
|||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.plotsquared.core.util.RegionManager;
|
import com.plotsquared.core.util.RegionManager;
|
||||||
import com.plotsquared.core.util.RegionUtil;
|
import com.plotsquared.core.util.RegionUtil;
|
||||||
|
import com.plotsquared.core.util.SchematicHandler;
|
||||||
import com.plotsquared.core.util.SetupUtils;
|
import com.plotsquared.core.util.SetupUtils;
|
||||||
import com.plotsquared.core.util.StringMan;
|
import com.plotsquared.core.util.StringMan;
|
||||||
import com.plotsquared.core.util.WorldUtil;
|
import com.plotsquared.core.util.WorldUtil;
|
||||||
@ -140,6 +141,8 @@ public class Area extends SubCommand {
|
|||||||
hybridPlotWorld.ROAD_WIDTH = hybridPlotWorld.ROAD_OFFSET_X = hybridPlotWorld.ROAD_OFFSET_Z = 0;
|
hybridPlotWorld.ROAD_WIDTH = hybridPlotWorld.ROAD_OFFSET_X = hybridPlotWorld.ROAD_OFFSET_Z = 0;
|
||||||
// Set the plot height to the selection height
|
// Set the plot height to the selection height
|
||||||
hybridPlotWorld.PLOT_HEIGHT = hybridPlotWorld.ROAD_HEIGHT = hybridPlotWorld.WALL_HEIGHT = selectedRegion.getMaximumPoint().getBlockY();
|
hybridPlotWorld.PLOT_HEIGHT = hybridPlotWorld.ROAD_HEIGHT = hybridPlotWorld.WALL_HEIGHT = selectedRegion.getMaximumPoint().getBlockY();
|
||||||
|
// No sign plz
|
||||||
|
hybridPlotWorld.setAllowSigns(false);
|
||||||
final File parentFile = MainUtil.getFile(PlotSquared.imp().getDirectory(), "schematics" + File.separator +
|
final File parentFile = MainUtil.getFile(PlotSquared.imp().getDirectory(), "schematics" + File.separator +
|
||||||
"GEN_ROAD_SCHEMATIC" + File.separator + hybridPlotWorld.getWorldName() + File.separator +
|
"GEN_ROAD_SCHEMATIC" + File.separator + hybridPlotWorld.getWorldName() + File.separator +
|
||||||
hybridPlotWorld.getId());
|
hybridPlotWorld.getId());
|
||||||
@ -156,6 +159,14 @@ public class Area extends SubCommand {
|
|||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Setup schematic
|
||||||
|
try {
|
||||||
|
hybridPlotWorld.setupSchematics();
|
||||||
|
} catch (final SchematicHandler.UnsupportedFormatException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
// Calculate the offset
|
// Calculate the offset
|
||||||
final BlockVector3 singlePos1 = selectedRegion.getMinimumPoint();
|
final BlockVector3 singlePos1 = selectedRegion.getMinimumPoint();
|
||||||
|
|
||||||
@ -187,21 +198,14 @@ public class Area extends SubCommand {
|
|||||||
final String world = SetupUtils.manager.setupWorld(singleSetup);
|
final String world = SetupUtils.manager.setupWorld(singleSetup);
|
||||||
if (WorldUtil.IMP.isWorld(world)) {
|
if (WorldUtil.IMP.isWorld(world)) {
|
||||||
PlotSquared.get().loadWorld(world, null);
|
PlotSquared.get().loadWorld(world, null);
|
||||||
Captions.SETUP_FINISHED.send(player);
|
MainUtil.sendMessage(player, Captions.SINGLE_AREA_CREATED);
|
||||||
player.teleport(WorldUtil.IMP.getSpawn(world),
|
|
||||||
TeleportCause.COMMAND);
|
|
||||||
} else {
|
} else {
|
||||||
MainUtil.sendMessage(player,
|
MainUtil.sendMessage(player,
|
||||||
"An error occurred while creating the world: " + hybridPlotWorld
|
"An error occurred while creating the world: " + hybridPlotWorld
|
||||||
.getWorldName());
|
.getWorldName());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
if (hasConfirmation(player)) {
|
singleRun.run();
|
||||||
CmdConfirm.addPending(player,
|
|
||||||
getCommandString() + " create pos2 (Creates world)", singleRun);
|
|
||||||
} else {
|
|
||||||
singleRun.run();
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
case "c":
|
case "c":
|
||||||
case "setup":
|
case "setup":
|
||||||
|
@ -280,37 +280,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
|||||||
(short) (z + shift + oddshift + centerShiftZ), biome);
|
(short) (z + shift + oddshift + centerShiftZ), biome);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* HashMap<BlockLoc, CompoundTag> items = schematic3.getTiles();
|
|
||||||
if (!items.isEmpty()) {
|
|
||||||
this.G_SCH_STATE = new HashMap<>();
|
|
||||||
outer:
|
|
||||||
for (Map.Entry<BlockLoc, CompoundTag> entry : items.entrySet()) {
|
|
||||||
BlockLoc loc = entry.getKey();
|
|
||||||
short x = (short) (loc.x + shift + oddshift + centerShiftX);
|
|
||||||
short z = (short) (loc.z + shift + oddshift + centerShiftZ);
|
|
||||||
short y = (short) (loc.y + this.PLOT_HEIGHT);
|
|
||||||
int pair = MathMan.pair(x, z);
|
|
||||||
HashMap<Integer, CompoundTag> existing = this.G_SCH_STATE.get(pair);
|
|
||||||
if (existing == null) {
|
|
||||||
existing = new HashMap<>();
|
|
||||||
this.G_SCH_STATE.put(pair, existing);
|
|
||||||
}
|
|
||||||
existing.put((int) y, entry.getValue());
|
|
||||||
|
|
||||||
CompoundTag tag = entry.getValue();
|
PlotSquared.debug(Captions.PREFIX + "&3 - plot schematic: &7true");
|
||||||
Map<String, Tag> map = ReflectionUtils.getMap(tag.getValue());
|
|
||||||
for (int i = 1; i <= 4; i++) {
|
|
||||||
String ln = tag.getString("Line" + i);
|
|
||||||
if (ln == null || ln.length() > 11)
|
|
||||||
continue outer;
|
|
||||||
}
|
|
||||||
SIGN_LOCATION =
|
|
||||||
new Location(worldname, loc.x + centerShiftX, this.PLOT_HEIGHT + loc.y,
|
|
||||||
loc.z + centerShiftZ);
|
|
||||||
ALLOW_SIGNS = true;
|
|
||||||
continue outer;
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
}
|
}
|
||||||
if (schematic1 == null || schematic2 == null || this.ROAD_WIDTH == 0) {
|
if (schematic1 == null || schematic2 == null || this.ROAD_WIDTH == 0) {
|
||||||
PlotSquared.debug(Captions.PREFIX + "&3 - schematic: &7false");
|
PlotSquared.debug(Captions.PREFIX + "&3 - schematic: &7false");
|
||||||
|
@ -1023,7 +1023,7 @@ public abstract class PlotArea {
|
|||||||
* @return true if plot signs are allow, false otherwise.
|
* @return true if plot signs are allow, false otherwise.
|
||||||
*/
|
*/
|
||||||
public boolean allowSigns() {
|
public boolean allowSigns() {
|
||||||
return allowSigns;
|
return allowSigns && (this.plots.size() > 1) /* Do not generate signs for single plots */;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user