Some more edits to the config.
This commit is contained in:
parent
bd69e854eb
commit
fc64136380
@ -6,6 +6,7 @@ import org.bukkit.*;
|
||||
import org.bukkit.entity.EntityType;
|
||||
|
||||
import com.massivecraft.mcore.SimpleConfig;
|
||||
import com.massivecraft.mcore.util.MUtil;
|
||||
|
||||
public class ConfServer extends SimpleConfig
|
||||
{
|
||||
@ -21,7 +22,7 @@ public class ConfServer extends SimpleConfig
|
||||
// FIELDS
|
||||
// -------------------------------------------- //
|
||||
|
||||
public final static transient List<String> baseCommandAliases = new ArrayList<String>();
|
||||
public final static transient List<String> baseCommandAliases = MUtil.list("f");
|
||||
|
||||
// Colors
|
||||
public static ChatColor colorMember = ChatColor.GREEN;
|
||||
@ -179,7 +180,7 @@ public class ConfServer extends SimpleConfig
|
||||
|
||||
// commands which will be prevented when in claimed territory of another faction
|
||||
public static Set<String> territoryNeutralDenyCommands = new LinkedHashSet<String>();
|
||||
public static Set<String> territoryEnemyDenyCommands = new LinkedHashSet<String>();
|
||||
public static Set<String> territoryEnemyDenyCommands = MUtil.set("home", "sethome", "spawn", "tpahere", "tpaccept", "tpa", "warp");
|
||||
|
||||
public static double territoryShieldFactor = 0.3;
|
||||
|
||||
@ -274,8 +275,6 @@ public class ConfServer extends SimpleConfig
|
||||
|
||||
static
|
||||
{
|
||||
baseCommandAliases.add("f");
|
||||
|
||||
factionFlagDefaults = new LinkedHashMap<FFlag, Boolean>();
|
||||
for (FFlag flag : FFlag.values())
|
||||
{
|
||||
@ -292,14 +291,6 @@ public class ConfServer extends SimpleConfig
|
||||
chatSingleFormats.put("pr", "%s ");
|
||||
chatSingleFormats.put("pb", " %s ");
|
||||
|
||||
territoryEnemyDenyCommands.add("home");
|
||||
territoryEnemyDenyCommands.add("sethome");
|
||||
territoryEnemyDenyCommands.add("spawn");
|
||||
territoryEnemyDenyCommands.add("tpahere");
|
||||
territoryEnemyDenyCommands.add("tpaccept");
|
||||
territoryEnemyDenyCommands.add("tpa");
|
||||
territoryEnemyDenyCommands.add("warp");
|
||||
|
||||
materialsContainer.add(Material.DISPENSER);
|
||||
materialsContainer.add(Material.CHEST);
|
||||
materialsContainer.add(Material.FURNACE);
|
||||
|
@ -38,13 +38,8 @@ public abstract class MPlugin extends JavaPlugin
|
||||
// Ensure basefolder exists!
|
||||
this.getDataFolder().mkdirs();
|
||||
|
||||
// GSON 2.1 is now embedded in CraftBukkit, used by the auto-updater: https://github.com/Bukkit/CraftBukkit/commit/0ed1d1fdbb1e0bc09a70bc7bfdf40c1de8411665
|
||||
// if ( ! lib.require("gson.jar", "http://search.maven.org/remotecontent?filepath=com/google/code/gson/gson/2.1/gson-2.1.jar")) return false;
|
||||
this.gson = this.getGsonBuilder().create();
|
||||
|
||||
//this.txt = new TextUtil();
|
||||
//initTXT();
|
||||
|
||||
// Create and register listeners
|
||||
this.mPluginSecretPlayerListener = new MPluginSecretPlayerListener(this);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user