mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-21 23:04:42 +02:00
Compare commits
4 Commits
chore/anal
...
6.9.1
Author | SHA1 | Date | |
---|---|---|---|
263cb47a21 | |||
005600c99e | |||
26bec7fe2f | |||
f4b886d977 |
@ -462,6 +462,7 @@ public final class FlagCommand extends Command {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final Plot plot = player.getLocation().getPlotAbs();
|
final Plot plot = player.getLocation().getPlotAbs();
|
||||||
|
final PlotFlag<?, ?> flagWithOldValue = plot.getFlagContainer().getFlag(flag.getClass());
|
||||||
PlotFlagRemoveEvent event = eventDispatcher.callFlagRemove(flag, plot);
|
PlotFlagRemoveEvent event = eventDispatcher.callFlagRemove(flag, plot);
|
||||||
if (event.getEventResult() == Result.DENY) {
|
if (event.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
@ -506,7 +507,7 @@ public final class FlagCommand extends Command {
|
|||||||
if (plot.removeFlag(flag)) {
|
if (plot.removeFlag(flag)) {
|
||||||
player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
|
player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
|
||||||
"value",
|
"value",
|
||||||
String.valueOf(flag)
|
String.valueOf(flagWithOldValue)
|
||||||
));
|
));
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
@ -544,7 +545,7 @@ public final class FlagCommand extends Command {
|
|||||||
}
|
}
|
||||||
player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
|
player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
|
||||||
"value",
|
"value",
|
||||||
String.valueOf(flag)
|
String.valueOf(flagWithOldValue)
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@ package com.plotsquared.core.generator;
|
|||||||
import com.google.inject.Inject;
|
import com.google.inject.Inject;
|
||||||
import com.google.inject.assistedinject.Assisted;
|
import com.google.inject.assistedinject.Assisted;
|
||||||
import com.intellectualsites.annotations.DoNotUse;
|
import com.intellectualsites.annotations.DoNotUse;
|
||||||
|
import com.intellectualsites.annotations.NotPublic;
|
||||||
import com.plotsquared.core.PlotSquared;
|
import com.plotsquared.core.PlotSquared;
|
||||||
import com.plotsquared.core.configuration.ConfigurationSection;
|
import com.plotsquared.core.configuration.ConfigurationSection;
|
||||||
import com.plotsquared.core.configuration.Settings;
|
import com.plotsquared.core.configuration.Settings;
|
||||||
@ -480,7 +481,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
|||||||
/**
|
/**
|
||||||
* @deprecated This method should not be available for public API usage and will be made private.
|
* @deprecated This method should not be available for public API usage and will be made private.
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true, since = "TODO")
|
@Deprecated(since = "6.9.1")
|
||||||
|
@NotPublic
|
||||||
public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
|
public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
|
||||||
if (z < 0) {
|
if (z < 0) {
|
||||||
z += this.SIZE;
|
z += this.SIZE;
|
||||||
@ -510,7 +512,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
|||||||
/**
|
/**
|
||||||
* @deprecated This method should not be available for public API usage and will be made private.
|
* @deprecated This method should not be available for public API usage and will be made private.
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true, since = "TODO")
|
@Deprecated(since = "6.9.1")
|
||||||
|
@NotPublic
|
||||||
public void addOverlayBiome(short x, short z, BiomeType id) {
|
public void addOverlayBiome(short x, short z, BiomeType id) {
|
||||||
if (z < 0) {
|
if (z < 0) {
|
||||||
z += this.SIZE;
|
z += this.SIZE;
|
||||||
|
@ -189,13 +189,13 @@ public class HybridUtils {
|
|||||||
if (X == ctx) {
|
if (X == ctx) {
|
||||||
maxX = tx & 15;
|
maxX = tx & 15;
|
||||||
} else {
|
} else {
|
||||||
maxX = 16;
|
maxX = 15;
|
||||||
}
|
}
|
||||||
int maxZ;
|
int maxZ;
|
||||||
if (Z == ctz) {
|
if (Z == ctz) {
|
||||||
maxZ = tz & 15;
|
maxZ = tz & 15;
|
||||||
} else {
|
} else {
|
||||||
maxZ = 16;
|
maxZ = 15;
|
||||||
}
|
}
|
||||||
|
|
||||||
int chunkBlockX = X << 4;
|
int chunkBlockX = X << 4;
|
||||||
@ -221,7 +221,7 @@ public class HybridUtils {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
final Runnable run = () -> TaskManager.runTaskAsync(() -> {
|
final Runnable run = () -> {
|
||||||
int size = width * length;
|
int size = width * length;
|
||||||
int[] changes = new int[size];
|
int[] changes = new int[size];
|
||||||
int[] faces = new int[size];
|
int[] faces = new int[size];
|
||||||
@ -296,7 +296,7 @@ public class HybridUtils {
|
|||||||
analysis.variety_sd = (int) (MathMan.getSD(variety, analysis.variety) * 100);
|
analysis.variety_sd = (int) (MathMan.getSD(variety, analysis.variety) * 100);
|
||||||
whenDone.value = analysis;
|
whenDone.value = analysis;
|
||||||
whenDone.run();
|
whenDone.run();
|
||||||
});
|
};
|
||||||
queue.setCompleteTask(run);
|
queue.setCompleteTask(run);
|
||||||
queue.enqueue();
|
queue.enqueue();
|
||||||
});
|
});
|
||||||
|
@ -313,7 +313,7 @@ public sealed class Location extends BlockLoc implements Comparable<Location> pe
|
|||||||
/**
|
/**
|
||||||
* Get the absolute {@link Plot}, if any, that contains this location
|
* Get the absolute {@link Plot}, if any, that contains this location
|
||||||
*
|
*
|
||||||
* @return (Absolute) plot containing the location, or {code null}
|
* @return (Absolute) plot containing the location, or {@code null}
|
||||||
*/
|
*/
|
||||||
public @Nullable Plot getPlotAbs() {
|
public @Nullable Plot getPlotAbs() {
|
||||||
final PlotArea area = this.getPlotArea();
|
final PlotArea area = this.getPlotArea();
|
||||||
@ -327,7 +327,7 @@ public sealed class Location extends BlockLoc implements Comparable<Location> pe
|
|||||||
/**
|
/**
|
||||||
* Get the {@link Plot}, if any, that contains this location
|
* Get the {@link Plot}, if any, that contains this location
|
||||||
*
|
*
|
||||||
* @return plot containing the location, or {code null}
|
* @return plot containing the location, or {@code null}
|
||||||
*/
|
*/
|
||||||
public @Nullable Plot getPlot() {
|
public @Nullable Plot getPlot() {
|
||||||
final PlotArea area = this.getPlotArea();
|
final PlotArea area = this.getPlotArea();
|
||||||
|
@ -643,7 +643,7 @@ public abstract class PlotArea {
|
|||||||
* @param player Player to check
|
* @param player Player to check
|
||||||
* @param y y height to check
|
* @param y y height to check
|
||||||
* @return true if outside build area with no permissions
|
* @return true if outside build area with no permissions
|
||||||
* @since TODO
|
* @since 6.9.1
|
||||||
*/
|
*/
|
||||||
public boolean notifyIfOutsideBuildArea(PlotPlayer<?> player, int y) {
|
public boolean notifyIfOutsideBuildArea(PlotPlayer<?> player, int y) {
|
||||||
if (!buildRangeContainsY(y) && !Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
|
if (!buildRangeContainsY(y) && !Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
|
||||||
|
@ -19,7 +19,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "com.plotsquared"
|
group = "com.plotsquared"
|
||||||
version = "6.9.1-SNAPSHOT"
|
version = "6.9.1"
|
||||||
|
|
||||||
subprojects {
|
subprojects {
|
||||||
group = rootProject.group
|
group = rootProject.group
|
||||||
|
Reference in New Issue
Block a user