mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-16 20:34:42 +02:00
Compare commits
1 Commits
grant-plac
...
fix/v7/sin
Author | SHA1 | Date | |
---|---|---|---|
6ee0e5c4b1 |
@ -2574,7 +2574,7 @@ public class Plot {
|
|||||||
*/
|
*/
|
||||||
public void teleportPlayer(final PlotPlayer<?> player, TeleportCause cause, Consumer<Boolean> resultConsumer) {
|
public void teleportPlayer(final PlotPlayer<?> player, TeleportCause cause, Consumer<Boolean> resultConsumer) {
|
||||||
Plot plot = this.getBasePlot(false);
|
Plot plot = this.getBasePlot(false);
|
||||||
if (!WorldUtil.isValidLocation(plot.getBottomAbs())) {
|
if ((getArea() == null || !(getArea() instanceof SinglePlotArea)) && !WorldUtil.isValidLocation(plot.getBottomAbs())) {
|
||||||
// prevent from teleporting into unsafe regions
|
// prevent from teleporting into unsafe regions
|
||||||
player.sendMessage(TranslatableCaption.of("border.denied"));
|
player.sendMessage(TranslatableCaption.of("border.denied"));
|
||||||
resultConsumer.accept(false);
|
resultConsumer.accept(false);
|
||||||
|
@ -37,7 +37,7 @@ import java.util.List;
|
|||||||
|
|
||||||
public class SinglePlotManager extends PlotManager {
|
public class SinglePlotManager extends PlotManager {
|
||||||
|
|
||||||
private static final int MAX_COORDINATE = 30000000;
|
private static final int MAX_COORDINATE = 20000000;
|
||||||
|
|
||||||
public SinglePlotManager(final @NonNull PlotArea plotArea) {
|
public SinglePlotManager(final @NonNull PlotArea plotArea) {
|
||||||
super(plotArea);
|
super(plotArea);
|
||||||
|
@ -27,8 +27,6 @@ import com.plotsquared.core.PlotSquared;
|
|||||||
import com.plotsquared.core.configuration.Settings;
|
import com.plotsquared.core.configuration.Settings;
|
||||||
import com.plotsquared.core.configuration.caption.LocaleHolder;
|
import com.plotsquared.core.configuration.caption.LocaleHolder;
|
||||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||||
import com.plotsquared.core.player.MetaDataAccess;
|
|
||||||
import com.plotsquared.core.player.PlayerMetaDataKeys;
|
|
||||||
import com.plotsquared.core.player.PlotPlayer;
|
import com.plotsquared.core.player.PlotPlayer;
|
||||||
import com.plotsquared.core.plot.Plot;
|
import com.plotsquared.core.plot.Plot;
|
||||||
import com.plotsquared.core.plot.flag.GlobalFlagContainer;
|
import com.plotsquared.core.plot.flag.GlobalFlagContainer;
|
||||||
@ -199,11 +197,6 @@ public final class PlaceholderRegistry {
|
|||||||
});
|
});
|
||||||
this.createPlaceholder("currentplot_biome", (player, plot) -> plot.getBiomeSynchronous().toString());
|
this.createPlaceholder("currentplot_biome", (player, plot) -> plot.getBiomeSynchronous().toString());
|
||||||
this.createPlaceholder("currentplot_size", (player, plot) -> String.valueOf(plot.getConnectedPlots().size()));
|
this.createPlaceholder("currentplot_size", (player, plot) -> String.valueOf(plot.getConnectedPlots().size()));
|
||||||
this.createPlaceholder("total_grants", player -> {
|
|
||||||
try (final MetaDataAccess<Integer> metaDataAccess = player.accessPersistentMetaData(PlayerMetaDataKeys.PERSISTENT_GRANTED_PLOTS)) {
|
|
||||||
return Integer.toString(metaDataAccess.get().orElse(0));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user