Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some more edits to the config.

Browse Source
This commit is contained in:
Olof Larsson 2013-04-10 11:07:47 +02:00
parent bd69e854eb
commit fc64136380
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/massivecraft/factions/ConfServer.java
View File

@ -6,6 +6,7 @@ import org.bukkit.*;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import com.massivecraft.mcore.SimpleConfig; import com.massivecraft.mcore.SimpleConfig;
import com.massivecraft.mcore.util.MUtil;
public class ConfServer extends SimpleConfig public class ConfServer extends SimpleConfig
{ {
@ -21,7 +22,7 @@ public class ConfServer extends SimpleConfig
// FIELDS // FIELDS
// -------------------------------------------- // // -------------------------------------------- //
public final static transient List<String> baseCommandAliases = new ArrayList<String>(); public final static transient List<String> baseCommandAliases = MUtil.list("f");
// Colors // Colors
public static ChatColor colorMember = ChatColor.GREEN; 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 // commands which will be prevented when in claimed territory of another faction
public static Set<String> territoryNeutralDenyCommands = new LinkedHashSet<String>(); 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; public static double territoryShieldFactor = 0.3;
@ -274,8 +275,6 @@ public class ConfServer extends SimpleConfig
static static
{ {
baseCommandAliases.add("f");
factionFlagDefaults = new LinkedHashMap<FFlag, Boolean>(); factionFlagDefaults = new LinkedHashMap<FFlag, Boolean>();
for (FFlag flag : FFlag.values()) for (FFlag flag : FFlag.values())
{ {
@ -292,14 +291,6 @@ public class ConfServer extends SimpleConfig
chatSingleFormats.put("pr", "%s "); chatSingleFormats.put("pr", "%s ");
chatSingleFormats.put("pb", " %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.DISPENSER);
materialsContainer.add(Material.CHEST); materialsContainer.add(Material.CHEST);
materialsContainer.add(Material.FURNACE); materialsContainer.add(Material.FURNACE);

5
src/com/massivecraft/factions/zcore/MPlugin.java
View File

@ -38,13 +38,8 @@ public abstract class MPlugin extends JavaPlugin
// Ensure basefolder exists! // Ensure basefolder exists!
this.getDataFolder().mkdirs(); 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.gson = this.getGsonBuilder().create();
//this.txt = new TextUtil();
//initTXT();
// Create and register listeners // Create and register listeners
this.mPluginSecretPlayerListener = new MPluginSecretPlayerListener(this); this.mPluginSecretPlayerListener = new MPluginSecretPlayerListener(this);