mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-12-03 08:38:46 +01:00
Compare commits
3 Commits
fix/v7/faw
...
renovate/w
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3e151bcea9 | ||
|
|
d249340d88 | ||
|
|
2438efcf87 |
2
.github/workflows/build-pr.yml
vendored
2
.github/workflows/build-pr.yml
vendored
@@ -9,7 +9,7 @@ jobs:
|
||||
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v6
|
||||
- name: Validate Gradle Wrapper
|
||||
uses: gradle/actions/wrapper-validation@v5
|
||||
- name: Setup Java
|
||||
|
||||
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -9,7 +9,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v6
|
||||
- name: Validate Gradle Wrapper
|
||||
uses: gradle/actions/wrapper-validation@v5
|
||||
- name: Setup Java
|
||||
|
||||
2
.github/workflows/codeql.yml
vendored
2
.github/workflows/codeql.yml
vendored
@@ -20,7 +20,7 @@ jobs:
|
||||
language: [ 'java' ]
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v6
|
||||
- name: Setup Java
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
|
||||
@@ -164,9 +164,6 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
|
||||
: getMinBuildHeight();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the lowest height of plot, road, and wall. Accounts for {@link Settings.Schematics#USE_WALL_IN_ROAD_SCHEM_HEIGHT}
|
||||
*/
|
||||
int schematicStartHeight() {
|
||||
int plotRoadMin = Math.min(PLOT_HEIGHT, ROAD_HEIGHT);
|
||||
if (!Settings.Schematics.USE_WALL_IN_ROAD_SCHEM_HEIGHT) {
|
||||
|
||||
@@ -276,8 +276,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
||||
SCHEM_Y = getMinGenHeight();
|
||||
plotY = 0;
|
||||
} else if (!Settings.Schematics.PASTE_ON_TOP) {
|
||||
// Schematics should generate/be pasted from build height
|
||||
SCHEM_Y = getMinBuildHeight();
|
||||
SCHEM_Y = getMinGenHeight();
|
||||
plotY = 0;
|
||||
}
|
||||
}
|
||||
@@ -294,14 +293,18 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
||||
roadY = 0; // Road is the lowest schematic
|
||||
if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldGenHeight) {
|
||||
// Road is the lowest schematic. Normalize plotY to it.
|
||||
plotY = (Settings.Schematics.PASTE_ON_TOP ? PLOT_HEIGHT : getMinBuildHeight()) - SCHEM_Y;
|
||||
if (Settings.Schematics.PASTE_ON_TOP) {
|
||||
plotY = PLOT_HEIGHT - getMinGenHeight();
|
||||
}
|
||||
}
|
||||
} else if (!Settings.Schematics.PASTE_ROAD_ON_TOP) {
|
||||
roadY = 0;
|
||||
SCHEM_Y = getMinGenHeight();
|
||||
if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldGenHeight) {
|
||||
if (schematic3 != null) {
|
||||
if (Settings.Schematics.PASTE_ON_TOP) {
|
||||
// Road is the lowest schematic. Normalize plotY to it.
|
||||
plotY = (Settings.Schematics.PASTE_ON_TOP ? PLOT_HEIGHT : getMinBuildHeight()) - SCHEM_Y;
|
||||
plotY = PLOT_HEIGHT - SCHEM_Y;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
roadY = minRoadWall - SCHEM_Y;
|
||||
|
||||
@@ -68,7 +68,6 @@ import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
@@ -530,7 +529,7 @@ public class HybridUtils {
|
||||
final QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(world));
|
||||
Location bot = plot.getBottomAbs().subtract(1, 0, 1);
|
||||
Location top = plot.getTopAbs();
|
||||
final HybridPlotWorld plotworld = Objects.requireNonNull((HybridPlotWorld) plot.getArea());
|
||||
final HybridPlotWorld plotworld = (HybridPlotWorld) plot.getArea();
|
||||
// Do not use plotworld#schematicStartHeight() here as we want to restore the pre 6.1.4 way of doing it if
|
||||
// USE_WALL_IN_ROAD_SCHEM_HEIGHT is false
|
||||
int schemY = Settings.Schematics.USE_WALL_IN_ROAD_SCHEM_HEIGHT ?
|
||||
|
||||
@@ -12,8 +12,8 @@ adventure-bukkit = "4.4.1"
|
||||
log4j = "2.19.0"
|
||||
|
||||
# Plugins
|
||||
worldedit = "7.2.20"
|
||||
fawe = "2.14.0"
|
||||
worldedit = "7.3.17"
|
||||
fawe = "2.14.2"
|
||||
placeholderapi = "2.11.7"
|
||||
luckperms = "5.5"
|
||||
essentialsx = "2.21.2"
|
||||
|
||||
Reference in New Issue
Block a user