Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore datapacks on 1.15

Browse Source
This commit is contained in:
NotMyFault 2021-08-26 10:47:00 +02:00
parent ee14f7ebb1
commit 81534b3476
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/FaweBukkit.java
View File

@ -26,8 +26,10 @@ import com.fastasyncworldedit.core.util.TaskManager;
import com.fastasyncworldedit.core.util.WEManager; import com.fastasyncworldedit.core.util.WEManager;
import com.fastasyncworldedit.core.util.image.ImageViewer; import com.fastasyncworldedit.core.util.image.ImageViewer;
import com.plotsquared.core.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.BukkitPlayer; import com.sk89q.worldedit.bukkit.BukkitPlayer;
import com.sk89q.worldedit.extension.platform.Capability;
import com.sk89q.worldedit.internal.util.LogManagerCompat; import com.sk89q.worldedit.internal.util.LogManagerCompat;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import io.papermc.paper.datapack.Datapack; import io.papermc.paper.datapack.Datapack;
@ -53,12 +55,12 @@ public class FaweBukkit implements IFawe, Listener {
private static final Logger LOGGER = LogManagerCompat.getLogger(); private static final Logger LOGGER = LogManagerCompat.getLogger();
private final Plugin plugin; private final Plugin plugin;
private ItemUtil itemUtil;
private boolean listeningImages;
private final boolean chunksStretched; private final boolean chunksStretched;
private final FAWEPlatformAdapterImpl platformAdapter; private final FAWEPlatformAdapterImpl platformAdapter;
private ItemUtil itemUtil;
private boolean listeningImages;
private Preloader preloader; private Preloader preloader;
private volatile boolean keepUnloaded;
public FaweBukkit(Plugin plugin) { public FaweBukkit(Plugin plugin) {
this.plugin = plugin; this.plugin = plugin;
@ -130,7 +132,6 @@ public class FaweBukkit implements IFawe, Listener {
return plugin.getDataFolder(); return plugin.getDataFolder();
} }
public ItemUtil getItemUtil() { public ItemUtil getItemUtil() {
ItemUtil tmp = itemUtil; ItemUtil tmp = itemUtil;
if (tmp == null) { if (tmp == null) {
@ -161,7 +162,8 @@ public class FaweBukkit implements IFawe, Listener {
.append(" • Soft Dependencies: ").append(p.getDescription().getSoftDepend()).append("\n") .append(" • Soft Dependencies: ").append(p.getDescription().getSoftDepend()).append("\n")
.append(" • Provides: ").append(p.getDescription().getProvides()).append("\n"); .append(" • Provides: ").append(p.getDescription().getProvides()).append("\n");
} }
if (PaperLib.isPaper()) { int dataVersion = WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.GAME_HOOKS).getDataVersion();
if (dataVersion >= 2586 && PaperLib.isPaper()) {
Collection<Datapack> datapacks = Bukkit.getServer().getDatapackManager().getEnabledPacks(); Collection<Datapack> datapacks = Bukkit.getServer().getDatapackManager().getEnabledPacks();
msg.append("Enabled Datapacks (").append(datapacks.size()).append("):\n"); msg.append("Enabled Datapacks (").append(datapacks.size()).append("):\n");
for (Datapack dp : datapacks) { for (Datapack dp : datapacks) {
@ -236,8 +238,6 @@ public class FaweBukkit implements IFawe, Listener {
return managers; return managers;
} }
private volatile boolean keepUnloaded;
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onWorldLoad(WorldLoadEvent event) { public void onWorldLoad(WorldLoadEvent event) {
if (keepUnloaded) { if (keepUnloaded) {