mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-08-25 07:15:35 +02:00
Compare commits
1 Commits
feat/v7/ge
...
renovate/w
Author | SHA1 | Date | |
---|---|---|---|
![]() |
8012aa9399 |
@@ -435,11 +435,6 @@ public class Settings extends Config {
|
|||||||
|
|
||||||
public static String SCHEMATICS = "schematics";
|
public static String SCHEMATICS = "schematics";
|
||||||
public static String TEMPLATES = "templates";
|
public static String TEMPLATES = "templates";
|
||||||
@Comment({"If schematics used for generation should be searched for in the path.schematics location",
|
|
||||||
" - This settings exists and is `false` by default for backwards compatibility.",
|
|
||||||
" - If false then generation schematics must be located in `schematics`",
|
|
||||||
" - Schematics must still always be under GEN_ROAD_SCHEMATIC/<world> etc."})
|
|
||||||
public static boolean USE_SCHEMATICS_PATH_FOR_GEN_SCHEMATICS = false;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -140,8 +140,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
|||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
protected PlotManager createManager() {
|
protected PlotManager createManager() {
|
||||||
return new HybridPlotManager(
|
return new HybridPlotManager(this, PlotSquared.platform().regionManager(),
|
||||||
this, PlotSquared.platform().regionManager(),
|
|
||||||
PlotSquared.platform().injector().getInstance(ProgressSubscriberFactory.class)
|
PlotSquared.platform().injector().getInstance(ProgressSubscriberFactory.class)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -216,16 +215,15 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
|||||||
|
|
||||||
// Try to determine root. This means that plot areas can have separate schematic
|
// Try to determine root. This means that plot areas can have separate schematic
|
||||||
// directories
|
// directories
|
||||||
String schematicFolder = Settings.Paths.USE_SCHEMATICS_PATH_FOR_GEN_SCHEMATICS ? Settings.Paths.SCHEMATICS : "schematics";
|
|
||||||
if (!(root =
|
if (!(root =
|
||||||
FileUtils.getFile(
|
FileUtils.getFile(
|
||||||
PlotSquared.platform().getDirectory(),
|
PlotSquared.platform().getDirectory(),
|
||||||
schematicFolder + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + this.getWorldName() + File.separator + this.getId()
|
"schematics/GEN_ROAD_SCHEMATIC/" + this.getWorldName() + "/" + this.getId()
|
||||||
))
|
))
|
||||||
.exists()) {
|
.exists()) {
|
||||||
root = FileUtils.getFile(
|
root = FileUtils.getFile(
|
||||||
PlotSquared.platform().getDirectory(),
|
PlotSquared.platform().getDirectory(),
|
||||||
schematicFolder + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + this.getWorldName()
|
"schematics/GEN_ROAD_SCHEMATIC/" + this.getWorldName()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -12,7 +12,7 @@ adventure-bukkit = "4.4.1"
|
|||||||
log4j = "2.19.0"
|
log4j = "2.19.0"
|
||||||
|
|
||||||
# Plugins
|
# Plugins
|
||||||
worldedit = "7.2.20"
|
worldedit = "7.3.16"
|
||||||
fawe = "2.13.1"
|
fawe = "2.13.1"
|
||||||
placeholderapi = "2.11.6"
|
placeholderapi = "2.11.6"
|
||||||
luckperms = "5.5"
|
luckperms = "5.5"
|
||||||
|
Reference in New Issue
Block a user