EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-21 12:46:46 +01:00
Code Issues Projects Releases Wiki Activity

Deprecate PlotId#copy (#3821)

Browse Source
This commit is contained in:
Hannes Greule 2022-10-08 15:11:16 +02:00 committed by GitHub
parent d4c3ceaf2b
commit caef3a923b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java
View File

@ -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;

6
Core/src/main/java/com/plotsquared/core/plot/Plot.java
View File

@ -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));

4
Core/src/main/java/com/plotsquared/core/plot/PlotId.java
View File

@ -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;
} }
/** /**