mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-06 23:54:43 +02:00
Compare commits
4 Commits
6.10.0
...
refactor/v
Author | SHA1 | Date | |
---|---|---|---|
f54bb88394 | |||
3446b913cd | |||
8b8fd6aab7 | |||
520bb64eca |
@ -251,6 +251,7 @@ public class Auto extends SubCommand {
|
|||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
Template.of("node", String.valueOf(Permission.PERMISSION_AUTO_MEGA))
|
Template.of("node", String.valueOf(Permission.PERMISSION_AUTO_MEGA))
|
||||||
);
|
);
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
if (!force && sizeX * sizeZ > Settings.Claim.MAX_AUTO_AREA) {
|
if (!force && sizeX * sizeZ > Settings.Claim.MAX_AUTO_AREA) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
|
@ -176,7 +176,7 @@ public class DatabaseCommand extends SubCommand {
|
|||||||
);
|
);
|
||||||
worldFile.renameTo(newFile);
|
worldFile.renameTo(newFile);
|
||||||
}
|
}
|
||||||
plot.setId(newId.copy());
|
plot.setId(newId);
|
||||||
plot.setArea(pa);
|
plot.setArea(pa);
|
||||||
plots.add(plot);
|
plots.add(plot);
|
||||||
continue;
|
continue;
|
||||||
|
@ -1836,8 +1836,8 @@ public class Plot {
|
|||||||
}
|
}
|
||||||
// Swap cached
|
// Swap cached
|
||||||
final PlotId temp = PlotId.of(this.getId().getX(), this.getId().getY());
|
final PlotId temp = PlotId.of(this.getId().getX(), this.getId().getY());
|
||||||
this.id = plot.getId().copy();
|
this.id = plot.getId();
|
||||||
plot.id = temp.copy();
|
plot.id = temp;
|
||||||
this.area.removePlot(this.getId());
|
this.area.removePlot(this.getId());
|
||||||
plot.area.removePlot(plot.getId());
|
plot.area.removePlot(plot.getId());
|
||||||
this.area.addPlotAbs(this);
|
this.area.addPlotAbs(this);
|
||||||
@ -1863,7 +1863,7 @@ public class Plot {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
this.area.removePlot(this.id);
|
this.area.removePlot(this.id);
|
||||||
this.id = plot.getId().copy();
|
this.id = plot.getId();
|
||||||
this.area.addPlotAbs(this);
|
this.area.addPlotAbs(this);
|
||||||
DBFunc.movePlot(this, plot);
|
DBFunc.movePlot(this, plot);
|
||||||
TaskManager.runTaskLater(whenDone, TaskTime.ticks(1L));
|
TaskManager.runTaskLater(whenDone, TaskTime.ticks(1L));
|
||||||
|
@ -110,9 +110,11 @@ public final class PlotId {
|
|||||||
* Get a copy of the plot ID
|
* Get a copy of the plot ID
|
||||||
*
|
*
|
||||||
* @return Plot ID copy
|
* @return Plot ID copy
|
||||||
|
* @deprecated PlotId is immutable, copy is not required.
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "TODO")
|
||||||
public @NonNull PlotId copy() {
|
public @NonNull PlotId copy() {
|
||||||
return of(this.getX(), this.getY());
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -19,7 +19,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "com.plotsquared"
|
group = "com.plotsquared"
|
||||||
version = "6.10.0"
|
version = "6.10.1-SNAPSHOT"
|
||||||
|
|
||||||
subprojects {
|
subprojects {
|
||||||
group = rootProject.group
|
group = rootProject.group
|
||||||
@ -65,7 +65,7 @@ subprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.14"))
|
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.15"))
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
Reference in New Issue
Block a user