Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-12 04:23:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into 1.16

Browse Source
This commit is contained in:
MattBDev
2020-08-24 21:17:53 -04:00
parent 525da53462 c0dee5caee
commit fd8cf1ebba
7 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View File

@ -22,7 +22,6 @@ package com.sk89q.worldedit.bukkit;
import com.boydti.fawe.Fawe;
import com.boydti.fawe.bukkit.FaweBukkit;
import com.boydti.fawe.config.Settings;
import com.boydti.fawe.util.MainUtil;
import com.google.common.base.Joiner;
import com.sk89q.util.yaml.YAMLProcessor;
@ -53,6 +52,7 @@ import com.sk89q.worldedit.world.item.ItemCategory;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.weather.WeatherTypes;
import io.papermc.lib.PaperLib;
import java.util.Optional;
import org.bstats.bukkit.Metrics;
import org.bukkit.Bukkit;
import org.bukkit.Material;
@ -91,7 +91,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
@ -119,7 +118,7 @@ public class WorldEditPlugin extends JavaPlugin { //implements TabCompleter
private static final Logger log = LoggerFactory.getLogger(WorldEditPlugin.class);
public static final String CUI_PLUGIN_CHANNEL = "worldedit:cui";
private static WorldEditPlugin INSTANCE;
///The BSTATS_ID needs to be modified for FAWE to prevent contaminating WorldEdit stats
// The BSTATS_ID needs to be modified for FAWE to prevent contaminating WorldEdit stats
private static final int BSTATS_PLUGIN_ID = 1403;
private BukkitImplAdapter bukkitAdapter;
@ -250,15 +249,7 @@ public class WorldEditPlugin extends JavaPlugin { //implements TabCompleter
//todo consider removing this again because it is better to stay consistent with upstream
// Setup metrics
if (Settings.IMP.ENABLED_COMPONENTS.BSTATS) {
new Metrics(this, BSTATS_PLUGIN_ID);
} else {
getLogger().warning("bStats is disabled. Please enable it in /plugins/FastAsyncWorldEdit/config.yml. It helps the developers to identify the features most used");
getLogger().warning("and organize future updates better. Cheers.");
}
// Suggest PaperMC
PaperLib.suggestPaper(this);
new Metrics(this, BSTATS_PLUGIN_ID);
}
private void setupPreWorldData() {