mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-04 06:34:42 +02:00
Compare commits
15 Commits
reenable-c
...
7.3.11
Author | SHA1 | Date | |
---|---|---|---|
6f4c156585 | |||
afb36d98c7 | |||
001ae78fb2 | |||
5fc8e06c22 | |||
f9401dda94 | |||
d1a48dba4d | |||
db9b51a535 | |||
511db0af37 | |||
e1ccda3e6d | |||
a69cd609b9 | |||
5d4e6c5819 | |||
db05f1481a | |||
ee3dd00225 | |||
346a48225d | |||
dfd80c4723 |
@ -104,7 +104,7 @@ tasks {
|
|||||||
opt.links("https://jd.papermc.io/paper/1.20/")
|
opt.links("https://jd.papermc.io/paper/1.20/")
|
||||||
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
|
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
|
||||||
opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
|
opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
|
||||||
opt.links("https://jd.advntr.dev/api/4.14.0/")
|
opt.links("https://jd.advntr.dev/api/" + libs.adventureApi.get().versionConstraint.toString())
|
||||||
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
|
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
|
||||||
opt.links("https://checkerframework.org/api/")
|
opt.links("https://checkerframework.org/api/")
|
||||||
opt.isLinkSource = true
|
opt.isLinkSource = true
|
||||||
|
@ -822,12 +822,18 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
|
|||||||
// Temporarily classify as vehicle
|
// Temporarily classify as vehicle
|
||||||
case "MINECART":
|
case "MINECART":
|
||||||
case "MINECART_CHEST":
|
case "MINECART_CHEST":
|
||||||
|
case "CHEST_MINECART":
|
||||||
case "MINECART_COMMAND":
|
case "MINECART_COMMAND":
|
||||||
|
case "COMMAND_BLOCK_MINECART":
|
||||||
case "MINECART_FURNACE":
|
case "MINECART_FURNACE":
|
||||||
|
case "FURNACE_MINECART":
|
||||||
case "MINECART_HOPPER":
|
case "MINECART_HOPPER":
|
||||||
|
case "HOPPER_MINECART":
|
||||||
case "MINECART_MOB_SPAWNER":
|
case "MINECART_MOB_SPAWNER":
|
||||||
|
case "SPAWNER_MINECART":
|
||||||
case "ENDER_CRYSTAL":
|
case "ENDER_CRYSTAL":
|
||||||
case "MINECART_TNT":
|
case "MINECART_TNT":
|
||||||
|
case "TNT_MINECART":
|
||||||
case "CHEST_BOAT":
|
case "CHEST_BOAT":
|
||||||
case "BOAT":
|
case "BOAT":
|
||||||
if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
|
if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
|
||||||
|
@ -68,8 +68,8 @@ tasks {
|
|||||||
val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
|
val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
|
||||||
val opt = options as StandardJavadocDocletOptions
|
val opt = options as StandardJavadocDocletOptions
|
||||||
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
|
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
|
||||||
opt.links("https://jd.advntr.dev/api/4.14.0/")
|
opt.links("https://jd.advntr.dev/api/" + libs.adventureApi.get().versionConstraint.toString())
|
||||||
opt.links("https://jd.advntr.dev/text-minimessage/4.14.0/")
|
opt.links("https://jd.advntr.dev/text-minimessage/" + libs.adventureApi.get().versionConstraint.toString())
|
||||||
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
|
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
|
||||||
opt.links("https://checkerframework.org/api/")
|
opt.links("https://checkerframework.org/api/")
|
||||||
opt.isLinkSource = true
|
opt.isLinkSource = true
|
||||||
|
@ -795,9 +795,8 @@ public class PlotSquared {
|
|||||||
if (world.equals("CheckingPlotSquaredGenerator")) {
|
if (world.equals("CheckingPlotSquaredGenerator")) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!this.getPlotAreaManager().addWorld(world)) {
|
// Don't check the return result -> breaks runtime loading of single plot areas on creation
|
||||||
return;
|
this.getPlotAreaManager().addWorld(world);
|
||||||
}
|
|
||||||
Set<String> worlds;
|
Set<String> worlds;
|
||||||
if (this.worldConfiguration.contains("worlds")) {
|
if (this.worldConfiguration.contains("worlds")) {
|
||||||
worlds = this.worldConfiguration.getConfigurationSection("worlds").getKeys(false);
|
worlds = this.worldConfiguration.getConfigurationSection("worlds").getKeys(false);
|
||||||
|
@ -184,6 +184,7 @@ public class Area extends SubCommand {
|
|||||||
CuboidRegion.makeCuboid(playerSelectedRegion)
|
CuboidRegion.makeCuboid(playerSelectedRegion)
|
||||||
).length != 0) {
|
).length != 0) {
|
||||||
player.sendMessage(TranslatableCaption.of("single.single_area_overlapping"));
|
player.sendMessage(TranslatableCaption.of("single.single_area_overlapping"));
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
// Alter the region
|
// Alter the region
|
||||||
final BlockVector3 playerSelectionMin = playerSelectedRegion.getMinimumPoint();
|
final BlockVector3 playerSelectionMin = playerSelectedRegion.getMinimumPoint();
|
||||||
|
@ -153,7 +153,7 @@ public class Kick extends SubCommand {
|
|||||||
if (plot == null) {
|
if (plot == null) {
|
||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
}
|
}
|
||||||
return TabCompletions.completePlayersInPlot(plot, String.join(",", args).trim(),
|
return TabCompletions.completePlayersInPlot(player, plot, String.join(",", args).trim(),
|
||||||
Collections.singletonList(player.getName())
|
Collections.singletonList(player.getName())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,7 @@ public class Storage extends Config {
|
|||||||
public static String PASSWORD = "password";
|
public static String PASSWORD = "password";
|
||||||
public static String DATABASE = "plot_db";
|
public static String DATABASE = "plot_db";
|
||||||
|
|
||||||
@Comment("Set additional properties: https://goo.gl/wngtN8")
|
@Comment("Set additional properties: https://dev.mysql.com/doc/connector-j/en/connector-j-reference-configuration-properties.html")
|
||||||
public static List<String>
|
public static List<String>
|
||||||
PROPERTIES = new ArrayList<>(Collections.singletonList("useSSL=false"));
|
PROPERTIES = new ArrayList<>(Collections.singletonList("useSSL=false"));
|
||||||
|
|
||||||
|
@ -107,6 +107,7 @@ public final class TabCompletions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static @NonNull List<Command> completePlayersInPlot(
|
public static @NonNull List<Command> completePlayersInPlot(
|
||||||
|
final @NonNull PlotPlayer<?> issuer,
|
||||||
final @NonNull Plot plot,
|
final @NonNull Plot plot,
|
||||||
final @NonNull String input, final @NonNull List<String> existing
|
final @NonNull String input, final @NonNull List<String> existing
|
||||||
) {
|
) {
|
||||||
@ -115,7 +116,9 @@ public final class TabCompletions {
|
|||||||
final List<PlotPlayer<?>> inPlot = plot.getPlayersInPlot();
|
final List<PlotPlayer<?>> inPlot = plot.getPlayersInPlot();
|
||||||
players = new ArrayList<>(inPlot.size());
|
players = new ArrayList<>(inPlot.size());
|
||||||
for (PlotPlayer<?> player : inPlot) {
|
for (PlotPlayer<?> player : inPlot) {
|
||||||
players.add(player.getName());
|
if (issuer.canSee(player)) {
|
||||||
|
players.add(player.getName());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cachedCompletionValues.put("inPlot" + plot, players);
|
cachedCompletionValues.put("inPlot" + plot, players);
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "com.intellectualsites.plotsquared"
|
group = "com.intellectualsites.plotsquared"
|
||||||
version = "7.3.10-SNAPSHOT"
|
version = "7.3.11"
|
||||||
|
|
||||||
if (!File("$rootDir/.git").exists()) {
|
if (!File("$rootDir/.git").exists()) {
|
||||||
logger.lifecycle("""
|
logger.lifecycle("""
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
paper = "1.20.4-R0.1-SNAPSHOT"
|
paper = "1.20.4-R0.1-SNAPSHOT"
|
||||||
guice = "7.0.0"
|
guice = "7.0.0"
|
||||||
spotbugs = "4.8.6"
|
spotbugs = "4.8.6"
|
||||||
checkerqual = "3.46.0"
|
checkerqual = "3.47.0"
|
||||||
gson = "2.10"
|
gson = "2.10"
|
||||||
guava = "31.1-jre"
|
guava = "31.1-jre"
|
||||||
snakeyaml = "2.0"
|
snakeyaml = "2.0"
|
||||||
@ -26,18 +26,18 @@ cloud-services = "1.8.4"
|
|||||||
arkitektonika = "2.1.3"
|
arkitektonika = "2.1.3"
|
||||||
squirrelid = "0.3.2"
|
squirrelid = "0.3.2"
|
||||||
paster = "1.1.6"
|
paster = "1.1.6"
|
||||||
bstats = "3.0.2"
|
bstats = "3.0.3"
|
||||||
paperlib = "1.0.8"
|
paperlib = "1.0.8"
|
||||||
informative-annotations = "1.5"
|
informative-annotations = "1.5"
|
||||||
vault = "1.7.1"
|
vault = "1.7.1"
|
||||||
serverlib = "2.3.6"
|
serverlib = "2.3.6"
|
||||||
|
|
||||||
# Gradle plugins
|
# Gradle plugins
|
||||||
shadow = "8.1.1"
|
shadow = "8.3.1"
|
||||||
grgit = "4.1.1"
|
grgit = "4.1.1"
|
||||||
spotless = "6.25.0"
|
spotless = "6.25.0"
|
||||||
nexus = "2.0.0"
|
nexus = "2.0.0"
|
||||||
runPaper = "2.3.0"
|
runPaper = "2.3.1"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
# Platform expectations
|
# Platform expectations
|
||||||
@ -78,7 +78,7 @@ vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault
|
|||||||
serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.ref = "serverlib" }
|
serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.ref = "serverlib" }
|
||||||
|
|
||||||
[plugins]
|
[plugins]
|
||||||
shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
|
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
|
||||||
grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
|
grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
|
||||||
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
|
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
|
||||||
nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
|
nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
Javadocs generated for
|
Javadocs generated for
|
||||||
<a href="https://github.com/IntellectualSites/PlotSquared/" rel="noopener nofollow noreferrer" target="_blank"> PlotSquared</a> |
|
<a href="https://github.com/IntellectualSites/PlotSquared/" rel="noopener nofollow noreferrer" target="_blank"> PlotSquared</a> |
|
||||||
<a href="https://intellectualsites.gitbook.io/plotsquared/" rel="noopener nofollow noreferrer"> Documentation </a> |
|
<a href="https://intellectualsites.gitbook.io/plotsquared/" rel="noopener nofollow noreferrer"> Documentation </a> |
|
||||||
Visit us on our <a href="https://discord.gg/intellectualsites" rel="noopener nofollow noreferrer"> Discord server</a> :)
|
Visit us on our <a href="https://discord.gg/intellectualsites" rel="noopener nofollow noreferrer"> Discord server</a> :)
|
||||||
|
Reference in New Issue
Block a user