mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-05 23:24:43 +02:00
Compare commits
9 Commits
fix/expire
...
feature/v6
Author | SHA1 | Date | |
---|---|---|---|
e888ea95dc | |||
28bd993680 | |||
8330f37d8a | |||
985fae65b6 | |||
db2d590e8e | |||
c8d356783a | |||
4947450ff0 | |||
de4e91ff62 | |||
fe5e3d5f6d |
@ -289,7 +289,7 @@ public interface PlotPlatform<P> extends LocaleHolder {
|
||||
* Get the {@link ExpireManager} implementation for the platform
|
||||
*
|
||||
* @return Expire manager
|
||||
* @since TODO
|
||||
* @since 6.10.2
|
||||
*/
|
||||
default @NonNull ExpireManager expireManager() {
|
||||
return injector().getInstance(ExpireManager.class);
|
||||
|
@ -142,6 +142,14 @@ public class Auto extends SubCommand {
|
||||
}
|
||||
}
|
||||
}
|
||||
int maxMerge = Permissions.hasPermissionRange(player, Permission.PERMISSION_MERGE, Settings.Limit.MAX_PLOTS);
|
||||
if (sizeX * sizeZ > maxMerge) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
Template.of("node", Permission.PERMISSION_MERGE + "." + (sizeX * sizeZ))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -140,8 +140,7 @@ public class DebugExec extends SubCommand {
|
||||
return true;
|
||||
}
|
||||
case "start-expire" -> {
|
||||
ExpireManager expireManager = PlotSquared.platform().expireManager() == null ? new ExpireManager(this.eventDispatcher) : PlotSquared.platform().expireManager();
|
||||
if (expireManager.runAutomatedTask()) {
|
||||
if (PlotSquared.platform().expireManager().runAutomatedTask()) {
|
||||
player.sendMessage(TranslatableCaption.of("debugexec.expiry_started"));
|
||||
} else {
|
||||
player.sendMessage(TranslatableCaption.of("debugexec.expiry_already_started"));
|
||||
@ -149,7 +148,7 @@ public class DebugExec extends SubCommand {
|
||||
return true;
|
||||
}
|
||||
case "stop-expire" -> {
|
||||
if (PlotSquared.platform().expireManager() == null || !PlotSquared.platform().expireManager().cancelTask()) {
|
||||
if (!PlotSquared.platform().expireManager().cancelTask()) {
|
||||
player.sendMessage(TranslatableCaption.of("debugexec.task_halted"));
|
||||
} else {
|
||||
player.sendMessage(TranslatableCaption.of("debugexec.task_cancelled"));
|
||||
|
@ -124,7 +124,7 @@ public class Merge extends SubCommand {
|
||||
return false;
|
||||
}
|
||||
final int size = plot.getConnectedPlots().size();
|
||||
int max = Permissions.hasPermissionRange(player, "plots.merge", Settings.Limit.MAX_PLOTS);
|
||||
int max = Permissions.hasPermissionRange(player, Permission.PERMISSION_MERGE, Settings.Limit.MAX_PLOTS);
|
||||
PlotMergeEvent event =
|
||||
this.eventDispatcher.callMerge(plot, direction, max, player);
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
|
@ -298,7 +298,10 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
||||
int roadSchemHeight;
|
||||
|
||||
if (schematic1 != null) {
|
||||
roadSchemHeight = schematic1.getClipboard().getDimensions().getY();
|
||||
roadSchemHeight = Math.max(
|
||||
schematic1.getClipboard().getDimensions().getY(),
|
||||
schematic2.getClipboard().getDimensions().getY()
|
||||
);
|
||||
maxSchematicHeight = Math.max(roadSchemHeight, maxSchematicHeight);
|
||||
if (maxSchematicHeight == worldGenHeight) {
|
||||
SCHEM_Y = getMinGenHeight();
|
||||
@ -486,7 +489,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
||||
/**
|
||||
* @deprecated This method should not be available for public API usage and will be made private.
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "TODO")
|
||||
@Deprecated(forRemoval = true, since = "6.10.2")
|
||||
public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
|
||||
if (z < 0) {
|
||||
z += this.SIZE;
|
||||
@ -521,7 +524,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
||||
/**
|
||||
* @deprecated This method should not be available for public API usage and will be made private.
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "TODO")
|
||||
@Deprecated(forRemoval = true, since = "6.10.2")
|
||||
public void addOverlayBiome(short x, short z, BiomeType id) {
|
||||
if (z < 0) {
|
||||
z += this.SIZE;
|
||||
|
@ -112,7 +112,7 @@ public final class PlotId {
|
||||
* @return Plot ID copy
|
||||
* @deprecated PlotId is immutable, copy is not required.
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "TODO")
|
||||
@Deprecated(forRemoval = true, since = "6.10.2")
|
||||
public @NonNull PlotId copy() {
|
||||
return this;
|
||||
}
|
||||
|
@ -18,6 +18,7 @@
|
||||
*/
|
||||
package com.plotsquared.core.plot.expiration;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.plotsquared.core.PlotPlatform;
|
||||
import com.plotsquared.core.PlotSquared;
|
||||
import com.plotsquared.core.configuration.caption.Caption;
|
||||
@ -64,7 +65,7 @@ public class ExpireManager {
|
||||
/**
|
||||
* @deprecated Use {@link PlotPlatform#expireManager()} instead
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "TODO")
|
||||
@Deprecated(forRemoval = true, since = "6.10.2")
|
||||
public static ExpireManager IMP;
|
||||
private final ConcurrentHashMap<UUID, Long> dates_cache;
|
||||
private final ConcurrentHashMap<UUID, Long> account_age_cache;
|
||||
@ -76,6 +77,7 @@ public class ExpireManager {
|
||||
*/
|
||||
private int running;
|
||||
|
||||
@Inject
|
||||
public ExpireManager(final @NonNull EventDispatcher eventDispatcher) {
|
||||
this.tasks = new ArrayDeque<>();
|
||||
this.dates_cache = new ConcurrentHashMap<>();
|
||||
|
@ -19,7 +19,7 @@ plugins {
|
||||
}
|
||||
|
||||
group = "com.plotsquared"
|
||||
version = "6.10.2-SNAPSHOT"
|
||||
version = "6.10.4-SNAPSHOT"
|
||||
|
||||
subprojects {
|
||||
group = rootProject.group
|
||||
@ -65,7 +65,7 @@ subprojects {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.16"))
|
||||
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.18"))
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
Reference in New Issue
Block a user