mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-02 21:54:43 +02:00
Compare commits
1 Commits
chore/v6/d
...
fix/expire
Author | SHA1 | Date | |
---|---|---|---|
ebbbb6c670 |
@ -104,12 +104,6 @@ public class BlockEventListener117 implements Listener {
|
||||
if (entity instanceof Item item) {
|
||||
UUID itemThrower = item.getThrower();
|
||||
if (plot != null) {
|
||||
if (itemThrower == null && (itemThrower = item.getOwner()) == null) {
|
||||
plot.debug(
|
||||
"A thrown item couldn't trigger sculk sensors because misc-interact = false and the item's owner could not be resolved.");
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
if (!plot.isAdded(itemThrower)) {
|
||||
if (!plot.isAdded(itemThrower)) {
|
||||
plot.debug("A thrown item couldn't trigger sculk sensors because misc-interact = false");
|
||||
|
@ -48,10 +48,6 @@ import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.block.BlockPlaceEvent;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
/**
|
||||
* @deprecated P2 effectively no longer supports 1.13
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "TODO")
|
||||
public class PaperListener113 extends PaperListener {
|
||||
|
||||
@Inject
|
||||
|
@ -289,7 +289,7 @@ public interface PlotPlatform<P> extends LocaleHolder {
|
||||
* Get the {@link ExpireManager} implementation for the platform
|
||||
*
|
||||
* @return Expire manager
|
||||
* @since 6.10.2
|
||||
* @since TODO
|
||||
*/
|
||||
default @NonNull ExpireManager expireManager() {
|
||||
return injector().getInstance(ExpireManager.class);
|
||||
|
@ -142,14 +142,6 @@ 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;
|
||||
}
|
||||
|
||||
|
@ -124,7 +124,7 @@ public class Merge extends SubCommand {
|
||||
return false;
|
||||
}
|
||||
final int size = plot.getConnectedPlots().size();
|
||||
int max = Permissions.hasPermissionRange(player, Permission.PERMISSION_MERGE, Settings.Limit.MAX_PLOTS);
|
||||
int max = Permissions.hasPermissionRange(player, "plots.merge", Settings.Limit.MAX_PLOTS);
|
||||
PlotMergeEvent event =
|
||||
this.eventDispatcher.callMerge(plot, direction, max, player);
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
|
@ -298,10 +298,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
||||
int roadSchemHeight;
|
||||
|
||||
if (schematic1 != null) {
|
||||
roadSchemHeight = Math.max(
|
||||
schematic1.getClipboard().getDimensions().getY(),
|
||||
schematic2.getClipboard().getDimensions().getY()
|
||||
);
|
||||
roadSchemHeight = schematic1.getClipboard().getDimensions().getY();
|
||||
maxSchematicHeight = Math.max(roadSchemHeight, maxSchematicHeight);
|
||||
if (maxSchematicHeight == worldGenHeight) {
|
||||
SCHEM_Y = getMinGenHeight();
|
||||
@ -489,7 +486,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 = "6.10.2")
|
||||
@Deprecated(forRemoval = true, since = "TODO")
|
||||
public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
|
||||
if (z < 0) {
|
||||
z += this.SIZE;
|
||||
@ -524,7 +521,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 = "6.10.2")
|
||||
@Deprecated(forRemoval = true, since = "TODO")
|
||||
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 = "6.10.2")
|
||||
@Deprecated(forRemoval = true, since = "TODO")
|
||||
public @NonNull PlotId copy() {
|
||||
return this;
|
||||
}
|
||||
|
@ -65,7 +65,7 @@ public class ExpireManager {
|
||||
/**
|
||||
* @deprecated Use {@link PlotPlatform#expireManager()} instead
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "6.10.2")
|
||||
@Deprecated(forRemoval = true, since = "TODO")
|
||||
public static ExpireManager IMP;
|
||||
private final ConcurrentHashMap<UUID, Long> dates_cache;
|
||||
private final ConcurrentHashMap<UUID, Long> account_age_cache;
|
||||
|
@ -19,7 +19,7 @@ plugins {
|
||||
}
|
||||
|
||||
group = "com.plotsquared"
|
||||
version = "6.10.4-SNAPSHOT"
|
||||
version = "6.10.2-SNAPSHOT"
|
||||
|
||||
subprojects {
|
||||
group = rootProject.group
|
||||
@ -65,7 +65,7 @@ subprojects {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.18"))
|
||||
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.16"))
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
Reference in New Issue
Block a user