mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-07 16:14:42 +02:00
Compare commits
1 Commits
7.0.0-rc.3
...
fix/consis
Author | SHA1 | Date | |
---|---|---|---|
0a1faa0d04 |
@ -152,8 +152,7 @@ public class EntityEventListener implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
|
case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
|
||||||
"TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL", "DEFAULT",
|
"TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
|
||||||
"DUPLICATION", "FROZEN", "SPELL" -> {
|
|
||||||
if (!area.isMobSpawning()) {
|
if (!area.isMobSpawning()) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
return;
|
return;
|
||||||
|
@ -275,7 +275,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
|||||||
SCHEM_Y = getMinGenHeight();
|
SCHEM_Y = getMinGenHeight();
|
||||||
plotY = 0;
|
plotY = 0;
|
||||||
} else if (!Settings.Schematics.PASTE_ON_TOP) {
|
} else if (!Settings.Schematics.PASTE_ON_TOP) {
|
||||||
SCHEM_Y = getMinBuildHeight();
|
SCHEM_Y = getMinGenHeight();
|
||||||
plotY = 0;
|
plotY = 0;
|
||||||
}
|
}
|
||||||
maxSchematicHeight = plotY + plotSchemHeight;
|
maxSchematicHeight = plotY + plotSchemHeight;
|
||||||
@ -296,20 +296,15 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
|||||||
// Road is the lowest schematic. Normalize plotY to it.
|
// Road is the lowest schematic. Normalize plotY to it.
|
||||||
if (Settings.Schematics.PASTE_ON_TOP) {
|
if (Settings.Schematics.PASTE_ON_TOP) {
|
||||||
plotY = PLOT_HEIGHT - getMinGenHeight();
|
plotY = PLOT_HEIGHT - getMinGenHeight();
|
||||||
} else {
|
|
||||||
plotY = getMinBuildHeight() - getMinGenHeight();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (!Settings.Schematics.PASTE_ROAD_ON_TOP) {
|
} else if (!Settings.Schematics.PASTE_ROAD_ON_TOP) {
|
||||||
if (SCHEM_Y == getMinGenHeight()) { // Only possible if plot schematic is enabled
|
roadY = 0;
|
||||||
// Plot is still the lowest schematic, normalize roadY to it
|
SCHEM_Y = getMinGenHeight();
|
||||||
roadY = getMinBuildHeight() - getMinGenHeight();
|
if (schematic3 != null) {
|
||||||
} else if (schematic3 != null) {
|
|
||||||
SCHEM_Y = getMinBuildHeight();
|
|
||||||
roadY = 0;// Road is the lowest schematic
|
|
||||||
if (Settings.Schematics.PASTE_ON_TOP) {
|
if (Settings.Schematics.PASTE_ON_TOP) {
|
||||||
// Road is the lowest schematic. Normalize plotY to it.
|
// Road is the lowest schematic. Normalize plotY to it.
|
||||||
plotY = PLOT_HEIGHT - getMinBuildHeight();
|
plotY = PLOT_HEIGHT - SCHEM_Y;
|
||||||
}
|
}
|
||||||
maxSchematicHeight = Math.max(maxSchematicHeight, plotY + plotSchemHeight);
|
maxSchematicHeight = Math.max(maxSchematicHeight, plotY + plotSchemHeight);
|
||||||
}
|
}
|
||||||
@ -562,7 +557,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
|||||||
* Get the y value where the plot schematic should be pasted from.
|
* Get the y value where the plot schematic should be pasted from.
|
||||||
*
|
*
|
||||||
* @return plot schematic y start value
|
* @return plot schematic y start value
|
||||||
* @since 7.0.0
|
* @since TODO
|
||||||
*/
|
*/
|
||||||
public int getPlotYStart() {
|
public int getPlotYStart() {
|
||||||
return SCHEM_Y + plotY;
|
return SCHEM_Y + plotY;
|
||||||
@ -572,7 +567,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
|||||||
* Get the y value where the road schematic should be pasted from.
|
* Get the y value where the road schematic should be pasted from.
|
||||||
*
|
*
|
||||||
* @return road schematic y start value
|
* @return road schematic y start value
|
||||||
* @since 7.0.0
|
* @since TODO
|
||||||
*/
|
*/
|
||||||
public int getRoadYStart() {
|
public int getRoadYStart() {
|
||||||
return SCHEM_Y + roadY;
|
return SCHEM_Y + roadY;
|
||||||
|
@ -529,7 +529,7 @@ public class HybridUtils {
|
|||||||
Math.min(plotworld.PLOT_HEIGHT, Math.min(plotworld.WALL_HEIGHT, plotworld.ROAD_HEIGHT)) : plotworld.ROAD_HEIGHT;
|
Math.min(plotworld.PLOT_HEIGHT, Math.min(plotworld.WALL_HEIGHT, plotworld.ROAD_HEIGHT)) : plotworld.ROAD_HEIGHT;
|
||||||
int sx = bot.getX() - plotworld.ROAD_WIDTH + 1;
|
int sx = bot.getX() - plotworld.ROAD_WIDTH + 1;
|
||||||
int sz = bot.getZ() + 1;
|
int sz = bot.getZ() + 1;
|
||||||
int sy = Settings.Schematics.PASTE_ROAD_ON_TOP ? schemY : plot.getArea().getMinBuildHeight();
|
int sy = Settings.Schematics.PASTE_ROAD_ON_TOP ? schemY : plot.getArea().getMinGenHeight();
|
||||||
int ex = bot.getX();
|
int ex = bot.getX();
|
||||||
int ez = top.getZ();
|
int ez = top.getZ();
|
||||||
int ey = get_ey(plotworld, queue, sx, ex, sz, ez, sy);
|
int ey = get_ey(plotworld, queue, sx, ex, sz, ez, sy);
|
||||||
|
@ -180,7 +180,8 @@ public abstract class PlotArea implements ComponentLike {
|
|||||||
this.worldConfiguration = worldConfiguration;
|
this.worldConfiguration = worldConfiguration;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void parseFlags(FlagContainer flagContainer, List<String> flagStrings) {
|
private static Collection<PlotFlag<?, ?>> parseFlags(List<String> flagStrings) {
|
||||||
|
final Collection<PlotFlag<?, ?>> flags = new ArrayList<>();
|
||||||
for (final String key : flagStrings) {
|
for (final String key : flagStrings) {
|
||||||
final String[] split;
|
final String[] split;
|
||||||
if (key.contains(";")) {
|
if (key.contains(";")) {
|
||||||
@ -192,7 +193,7 @@ public abstract class PlotArea implements ComponentLike {
|
|||||||
GlobalFlagContainer.getInstance().getFlagFromString(split[0]);
|
GlobalFlagContainer.getInstance().getFlagFromString(split[0]);
|
||||||
if (flagInstance != null) {
|
if (flagInstance != null) {
|
||||||
try {
|
try {
|
||||||
flagContainer.addFlag(flagInstance.parse(split[1]));
|
flags.add(flagInstance.parse(split[1]));
|
||||||
} catch (final FlagParseException e) {
|
} catch (final FlagParseException e) {
|
||||||
LOGGER.warn(
|
LOGGER.warn(
|
||||||
"Failed to parse default flag with key '{}' and value '{}'. "
|
"Failed to parse default flag with key '{}' and value '{}'. "
|
||||||
@ -203,10 +204,9 @@ public abstract class PlotArea implements ComponentLike {
|
|||||||
);
|
);
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
flagContainer.addUnknownFlag(split[0], split[1]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@ -405,7 +405,7 @@ public abstract class PlotArea implements ComponentLike {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
parseFlags(this.getFlagContainer(), flags);
|
this.getFlagContainer().addAll(parseFlags(flags));
|
||||||
ConsolePlayer.getConsole().sendMessage(
|
ConsolePlayer.getConsole().sendMessage(
|
||||||
TranslatableCaption.of("flags.area_flags"),
|
TranslatableCaption.of("flags.area_flags"),
|
||||||
TagResolver.resolver("flags", Tag.inserting(Component.text(flags.toString())))
|
TagResolver.resolver("flags", Tag.inserting(Component.text(flags.toString())))
|
||||||
@ -427,7 +427,7 @@ public abstract class PlotArea implements ComponentLike {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.roadFlags = roadflags.size() > 0;
|
this.roadFlags = roadflags.size() > 0;
|
||||||
parseFlags(this.getRoadFlagContainer(), roadflags);
|
this.getRoadFlagContainer().addAll(parseFlags(roadflags));
|
||||||
ConsolePlayer.getConsole().sendMessage(
|
ConsolePlayer.getConsole().sendMessage(
|
||||||
TranslatableCaption.of("flags.road_flags"),
|
TranslatableCaption.of("flags.road_flags"),
|
||||||
TagResolver.resolver("flags", Tag.inserting(Component.text(roadflags.toString())))
|
TagResolver.resolver("flags", Tag.inserting(Component.text(roadflags.toString())))
|
||||||
|
Reference in New Issue
Block a user