mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-21 14:54:43 +02:00
Compare commits
1 Commits
fix/3725
...
fix/v6/gra
Author | SHA1 | Date | |
---|---|---|---|
9207c1868f |
1
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
1
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
@ -27,7 +27,6 @@ body:
|
|||||||
description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
|
description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
|
||||||
multiple: false
|
multiple: false
|
||||||
options:
|
options:
|
||||||
- '1.19.2'
|
|
||||||
- '1.19.1'
|
- '1.19.1'
|
||||||
- '1.19'
|
- '1.19'
|
||||||
- '1.18.2'
|
- '1.18.2'
|
||||||
|
@ -656,15 +656,20 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
|
|||||||
final @NonNull SQLiteUUIDService sqLiteUUIDService,
|
final @NonNull SQLiteUUIDService sqLiteUUIDService,
|
||||||
final @NonNull CacheUUIDService cacheUUIDService
|
final @NonNull CacheUUIDService cacheUUIDService
|
||||||
) {
|
) {
|
||||||
// Record all unique UUID's and put them into a queue
|
// Load all uuids into a big chunky boi queue
|
||||||
final Set<UUID> uuidSet = new HashSet<>();
|
final Queue<UUID> uuidQueue = new LinkedBlockingQueue<>();
|
||||||
PlotSquared.get().forEachPlotRaw(plot -> {
|
PlotSquared.get().forEachPlotRaw(plot -> {
|
||||||
uuidSet.add(plot.getOwnerAbs());
|
final Set<UUID> uuids = new HashSet<>();
|
||||||
uuidSet.addAll(plot.getMembers());
|
uuids.add(plot.getOwnerAbs());
|
||||||
uuidSet.addAll(plot.getTrusted());
|
uuids.addAll(plot.getMembers());
|
||||||
uuidSet.addAll(plot.getDenied());
|
uuids.addAll(plot.getTrusted());
|
||||||
|
uuids.addAll(plot.getDenied());
|
||||||
|
for (final UUID uuid : uuids) {
|
||||||
|
if (!uuidQueue.contains(uuid)) {
|
||||||
|
uuidQueue.add(uuid);
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
final Queue<UUID> uuidQueue = new LinkedBlockingQueue<>(uuidSet);
|
|
||||||
|
|
||||||
LOGGER.info("(UUID) {} UUIDs will be cached", uuidQueue.size());
|
LOGGER.info("(UUID) {} UUIDs will be cached", uuidQueue.size());
|
||||||
|
|
||||||
|
@ -692,7 +692,7 @@ public class BlockEventListener implements Listener {
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (Tag.CORAL_BLOCKS.isTagged(blockType) || Tag.CORALS.isTagged(blockType) || Tag.WALL_CORALS.isTagged(blockType)) {
|
if (Tag.CORAL_BLOCKS.isTagged(blockType) || Tag.CORALS.isTagged(blockType)) {
|
||||||
if (!plot.getFlag(CoralDryFlag.class)) {
|
if (!plot.getFlag(CoralDryFlag.class)) {
|
||||||
plot.debug("Coral could not dry because coral-dry = false");
|
plot.debug("Coral could not dry because coral-dry = false");
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
|
@ -126,16 +126,16 @@ public class EntitySpawnListener implements Listener {
|
|||||||
Plot plot = location.getOwnedPlotAbs();
|
Plot plot = location.getOwnedPlotAbs();
|
||||||
EntityType type = entity.getType();
|
EntityType type = entity.getType();
|
||||||
if (plot == null) {
|
if (plot == null) {
|
||||||
|
if (!area.isMobSpawning()) {
|
||||||
|
if (type == EntityType.PLAYER) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (type == EntityType.DROPPED_ITEM) {
|
if (type == EntityType.DROPPED_ITEM) {
|
||||||
if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
|
if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!area.isMobSpawning()) {
|
|
||||||
if (type == EntityType.PLAYER) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (type.isAlive()) {
|
if (type.isAlive()) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
|
@ -229,17 +229,17 @@ public class PaperListener implements Listener {
|
|||||||
Plot plot = location.getOwnedPlotAbs();
|
Plot plot = location.getOwnedPlotAbs();
|
||||||
if (plot == null) {
|
if (plot == null) {
|
||||||
EntityType type = event.getType();
|
EntityType type = event.getType();
|
||||||
// PreCreatureSpawnEvent **should** not be called for DROPPED_ITEM, just for the sake of consistency
|
|
||||||
if (type == EntityType.DROPPED_ITEM) {
|
|
||||||
if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
|
|
||||||
event.setCancelled(true);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!area.isMobSpawning()) {
|
if (!area.isMobSpawning()) {
|
||||||
if (type == EntityType.PLAYER) {
|
if (type == EntityType.PLAYER) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (type == EntityType.DROPPED_ITEM) {
|
||||||
|
if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
|
||||||
|
event.setShouldAbortSpawn(true);
|
||||||
|
event.setCancelled(true);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (type.isAlive()) {
|
if (type.isAlive()) {
|
||||||
event.setShouldAbortSpawn(true);
|
event.setShouldAbortSpawn(true);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
|
@ -164,7 +164,7 @@ public final class PlaceholderRegistry {
|
|||||||
PlayerManager.getPlayerList(plot.getDenied(), player));
|
PlayerManager.getPlayerList(plot.getDenied(), player));
|
||||||
});
|
});
|
||||||
this.createPlaceholder("currentplot_creationdate", (player, plot) -> {
|
this.createPlaceholder("currentplot_creationdate", (player, plot) -> {
|
||||||
if (plot.getTimestamp() == 0 || !plot.hasOwner()) {
|
if (plot.getTimestamp() == 0) {
|
||||||
return legacyComponent(TranslatableCaption.of("info.unknown"), player);
|
return legacyComponent(TranslatableCaption.of("info.unknown"), player);
|
||||||
}
|
}
|
||||||
long creationDate = plot.getTimestamp();
|
long creationDate = plot.getTimestamp();
|
||||||
|
@ -5,7 +5,7 @@ guice = "5.1.0"
|
|||||||
spotbugs = "4.7.1"
|
spotbugs = "4.7.1"
|
||||||
|
|
||||||
# Plugins
|
# Plugins
|
||||||
worldedit = "7.2.12"
|
worldedit = "7.2.10"
|
||||||
placeholderapi = "2.11.2"
|
placeholderapi = "2.11.2"
|
||||||
luckperms = "5.4"
|
luckperms = "5.4"
|
||||||
essentialsx = "2.19.4"
|
essentialsx = "2.19.4"
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
Reference in New Issue
Block a user