mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-03 06:04:43 +02:00
Compare commits
1 Commits
fix/4647
...
world-stat
Author | SHA1 | Date | |
---|---|---|---|
dcd87131dd |
@ -600,11 +600,7 @@ public class PlayerEventListener implements Listener {
|
||||
// i.e. untrusted-visit can override deny-teleport
|
||||
// this is acceptable, because otherwise it wouldn't make sense to have both flags set
|
||||
if (result || (plot.getFlag(UntrustedVisitFlag.class) && plot.getHomeSynchronous().equals(BukkitUtil.adaptComplete(to)))) {
|
||||
// returns false if the player is not allowed to enter the plot (if they are denied, for example)
|
||||
// don't let the move event cancel the entry after teleport, but rather catch and cancel early (#4647)
|
||||
if (!plotListener.plotEntry(pp, plot)) {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
plotListener.plotEntry(pp, plot);
|
||||
} else {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("deny.no_enter"),
|
||||
|
@ -144,6 +144,7 @@ public class Buy extends Command {
|
||||
plot.getPlotModificationManager().setSign(player.getName());
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("working.claimed"),
|
||||
TagResolver.resolver("world", Tag.inserting(Component.text(plot.getArea().getWorldName()))),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
);
|
||||
this.eventDispatcher.callPostPlayerBuyPlot(player, previousOwner, plot, price);
|
||||
|
@ -131,6 +131,7 @@ public class Clear extends Command {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("working.clearing_done"),
|
||||
TagResolver.builder()
|
||||
.tag("world", Tag.inserting(Component.text(plot.getArea().getWorldName())))
|
||||
.tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
|
||||
.tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
.build()
|
||||
|
@ -124,6 +124,7 @@ public class Delete extends SubCommand {
|
||||
"amount",
|
||||
Tag.inserting(Component.text(String.valueOf(System.currentTimeMillis() - start)))
|
||||
),
|
||||
TagResolver.resolver("world", Tag.inserting(Component.text(plotArea.getWorldName()))),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
);
|
||||
eventDispatcher.callPostDelete(plot);
|
||||
|
@ -1717,6 +1717,7 @@ public class Plot {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("working.claimed"),
|
||||
TagResolver.resolver("world", Tag.inserting(Component.text(this.getWorldName()))),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(this.getId().toString())))
|
||||
);
|
||||
if (teleport) {
|
||||
|
@ -390,11 +390,11 @@
|
||||
"info.area_list_tooltip": "<gold>Claimed=</gold><gray><claimed></gray>\n<gold>Usage=</gold><gray><usage></gray>\n<gold>Clusters=</gold><gray><clusters></gray>\n<gold>Region=</gold><gray><region></gray>\n<gold>Generator=</gold><gray><generator></gray>",
|
||||
"info.area_list_item": "<click:run_command:'<command_tp>'><hover:show_text:'<command_tp>'><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click> <click:run_command:'<command_info>'><hover:show_text:'<hover_info>'><gold><area_name></gold></hover></click><gray> - </gray><gray><area_type>:<area_terrain></gray>",
|
||||
"working.generating_component": "<prefix><gold>Started generating component from your settings.</gold>",
|
||||
"working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
|
||||
"working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
|
||||
"working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
|
||||
"working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
|
||||
"working.plot_not_claimed": "<prefix><gray>Plot not claimed.</gray>",
|
||||
"working.plot_is_claimed": "<prefix><gray>This plot is already claimed.</gray>",
|
||||
"working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><plot></gold><dark_aqua>.</dark_aqua>",
|
||||
"working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><world>;<plot></gold><dark_aqua>.</dark_aqua>",
|
||||
"working.progress": "<prefix><gray>Current progress: </gray><gold><progress></gold><gray>%</gray>",
|
||||
"working.component_complete": "<prefix><gold>Component generation has finished for plot <plot>.</gold>",
|
||||
"list.comment_list_header_paged": "<gray>(Page </gray><gold><cur></gold><gray>/</gray><gold><max></gold><gray>) </gray><gold>List of <amount> comment(s):</gold>",
|
||||
|
@ -206,14 +206,14 @@ tasks.getByName<Jar>("jar") {
|
||||
enabled = false
|
||||
}
|
||||
|
||||
val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5")
|
||||
val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4")
|
||||
tasks {
|
||||
register("cacheLatestFaweArtifact") {
|
||||
val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()
|
||||
val artifact = ((JsonSlurper().parse(lastSuccessfulBuildUrl) as Map<*, *>)["artifacts"] as List<*>)
|
||||
.map { it as Map<*, *> }
|
||||
.map { it["fileName"] as String }
|
||||
.first { it -> it.contains("Paper") }
|
||||
.first { it -> it.contains("Bukkit") }
|
||||
project.ext["faweArtifact"] = artifact
|
||||
}
|
||||
|
||||
|
@ -3,12 +3,12 @@
|
||||
paper = "1.20.4-R0.1-SNAPSHOT"
|
||||
guice = "7.0.0"
|
||||
spotbugs = "4.9.3"
|
||||
checkerqual = "3.49.3"
|
||||
checkerqual = "3.49.2"
|
||||
gson = "2.10"
|
||||
guava = "31.1-jre"
|
||||
snakeyaml = "2.0"
|
||||
adventure = "4.21.0"
|
||||
adventure-bukkit = "4.4.0"
|
||||
adventure = "4.20.0"
|
||||
adventure-bukkit = "4.3.4"
|
||||
log4j = "2.19.0"
|
||||
|
||||
# Plugins
|
||||
@ -23,12 +23,12 @@ mvdwapi = "3.1.1"
|
||||
prtree = "2.0.1"
|
||||
aopalliance = "1.0"
|
||||
cloud-services = "1.8.4"
|
||||
arkitektonika = "2.1.4"
|
||||
arkitektonika = "2.1.3"
|
||||
squirrelid = "0.3.2"
|
||||
paster = "1.1.7"
|
||||
paster = "1.1.6"
|
||||
bstats = "3.1.0"
|
||||
paperlib = "1.0.8"
|
||||
informative-annotations = "1.6"
|
||||
informative-annotations = "1.5"
|
||||
vault = "1.7.1"
|
||||
serverlib = "2.3.7"
|
||||
|
||||
@ -36,7 +36,7 @@ serverlib = "2.3.7"
|
||||
shadow = "8.3.6"
|
||||
grgit = "4.1.1"
|
||||
spotless = "7.0.3"
|
||||
publish = "0.32.0"
|
||||
publish = "0.31.0"
|
||||
runPaper = "2.3.1"
|
||||
|
||||
[libraries]
|
||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
4
gradlew
vendored
4
gradlew
vendored
@ -114,7 +114,7 @@ case "$( uname )" in #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH="\\\"\\\""
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
|
4
gradlew.bat
vendored
4
gradlew.bat
vendored
@ -70,11 +70,11 @@ goto fail
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
|
Reference in New Issue
Block a user