mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-25 16:45:28 +02:00
Compare commits
7 Commits
6.6.2
...
fix/v6/rel
Author | SHA1 | Date | |
---|---|---|---|
![]() |
5c1cc38702 | ||
![]() |
38682ecff6 | ||
![]() |
6a54dc7eff | ||
![]() |
8454c29c91 | ||
![]() |
b2c9311a47 | ||
![]() |
c4aa497a2b | ||
![]() |
c13f544390 |
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
@@ -8,11 +8,11 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v3.0.0
|
uses: actions/checkout@v3
|
||||||
- name: Validate Gradle Wrapper"
|
- name: Validate Gradle Wrapper"
|
||||||
uses: gradle/wrapper-validation-action@v1.0.4
|
uses: gradle/wrapper-validation-action@v1
|
||||||
- name: Setup Java
|
- name: Setup Java
|
||||||
uses: actions/setup-java@v3.0.0
|
uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: 17
|
java-version: 17
|
||||||
|
@@ -57,8 +57,12 @@ public class SetHome extends SetCommand {
|
|||||||
Plot base = plot.getBasePlot(false);
|
Plot base = plot.getBasePlot(false);
|
||||||
Location bottom = base.getBottomAbs();
|
Location bottom = base.getBottomAbs();
|
||||||
Location location = player.getLocationFull();
|
Location location = player.getLocationFull();
|
||||||
BlockLoc rel = new BlockLoc(location.getX() - bottom.getX(), location.getY(),
|
BlockLoc rel = new BlockLoc(
|
||||||
location.getZ() - bottom.getZ(), location.getYaw(), location.getPitch()
|
location.getX() - bottom.getX(),
|
||||||
|
location.getY(), // y is absolute
|
||||||
|
location.getZ() - bottom.getZ(),
|
||||||
|
location.getYaw(),
|
||||||
|
location.getPitch()
|
||||||
);
|
);
|
||||||
base.setHome(rel);
|
base.setHome(rel);
|
||||||
player.sendMessage(TranslatableCaption.of("position.position_set"));
|
player.sendMessage(TranslatableCaption.of("position.position_set"));
|
||||||
|
@@ -389,7 +389,7 @@ public class ClassicPlotManager extends SquarePlotManager {
|
|||||||
if (!plot.isMerged(Direction.NORTH)) {
|
if (!plot.isMerged(Direction.NORTH)) {
|
||||||
int z = bot.getZ();
|
int z = bot.getZ();
|
||||||
for (int x = bot.getX(); x < top.getX(); x++) {
|
for (int x = bot.getX(); x < top.getX(); x++) {
|
||||||
for (int y = classicPlotWorld.getMaxBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
|
for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
|
||||||
queue.setBlock(x, y, z, blocks);
|
queue.setBlock(x, y, z, blocks);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -309,7 +309,7 @@ public class PlotListener {
|
|||||||
}
|
}
|
||||||
if ((lastPlot != null) && plot.getId().equals(lastPlot.getId()) && plot.hasOwner()) {
|
if ((lastPlot != null) && plot.getId().equals(lastPlot.getId()) && plot.hasOwner()) {
|
||||||
final UUID plotOwner = plot.getOwnerAbs();
|
final UUID plotOwner = plot.getOwnerAbs();
|
||||||
String owner = PlayerManager.resolveName(plotOwner, false).getComponent(player);
|
String owner = PlayerManager.resolveName(plotOwner, true).getComponent(player);
|
||||||
Caption header = fromFlag ? StaticCaption.of(title) : TranslatableCaption.of("titles" +
|
Caption header = fromFlag ? StaticCaption.of(title) : TranslatableCaption.of("titles" +
|
||||||
".title_entered_plot");
|
".title_entered_plot");
|
||||||
Caption subHeader = fromFlag ? StaticCaption.of(subtitle) : TranslatableCaption.of("titles" +
|
Caption subHeader = fromFlag ? StaticCaption.of(subtitle) : TranslatableCaption.of("titles" +
|
||||||
|
@@ -1465,7 +1465,7 @@ public class Plot {
|
|||||||
.at(
|
.at(
|
||||||
bottom.getWorldName(),
|
bottom.getWorldName(),
|
||||||
bottom.getX() + home.getX(),
|
bottom.getX() + home.getX(),
|
||||||
bottom.getY() + home.getY(),
|
home.getY(), // y is absolute
|
||||||
bottom.getZ() + home.getZ(),
|
bottom.getZ() + home.getZ(),
|
||||||
home.getYaw(),
|
home.getYaw(),
|
||||||
home.getPitch()
|
home.getPitch()
|
||||||
|
@@ -333,10 +333,9 @@ public final class PlotModificationManager {
|
|||||||
ids.add(current.getId());
|
ids.add(current.getId());
|
||||||
}
|
}
|
||||||
this.plot.clearRatings();
|
this.plot.clearRatings();
|
||||||
QueueCoordinator queue = null;
|
QueueCoordinator queue = this.plot.getArea().getQueue();
|
||||||
if (createSign) {
|
if (createSign) {
|
||||||
this.removeSign();
|
this.removeSign();
|
||||||
queue = this.plot.getArea().getQueue();
|
|
||||||
}
|
}
|
||||||
PlotManager manager = this.plot.getArea().getPlotManager();
|
PlotManager manager = this.plot.getArea().getPlotManager();
|
||||||
if (createRoad) {
|
if (createRoad) {
|
||||||
|
@@ -18,7 +18,7 @@ plugins {
|
|||||||
idea
|
idea
|
||||||
}
|
}
|
||||||
|
|
||||||
version = "6.6.2"
|
version = "6.6.3-SNAPSHOT"
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
group = "com.plotsquared"
|
group = "com.plotsquared"
|
||||||
|
@@ -18,7 +18,7 @@ adventure-platform-bukkit = "4.0.1"
|
|||||||
|
|
||||||
# Plugins
|
# Plugins
|
||||||
worldedit = "7.2.10"
|
worldedit = "7.2.10"
|
||||||
fawe = "2.1.0"
|
fawe = "2.1.1"
|
||||||
vault = "1.7.1"
|
vault = "1.7.1"
|
||||||
placeholderapi = "2.11.1"
|
placeholderapi = "2.11.1"
|
||||||
luckperms = "5.4"
|
luckperms = "5.4"
|
||||||
|
Reference in New Issue
Block a user