Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-07 03:11:02 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'perm-errors'

Browse Source 
Closes #286
This commit is contained in:
Tim Ekl 2011-12-18 15:34:04 -05:00
commit fdb8c862f9
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
View File

@ -57,6 +57,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
public static boolean EnforceAccess;
public static boolean EnforceGameModes;
public static boolean PrefixChat;
public static boolean DisplayPermErrors;
public static Map<String, String> teleportQueue = new HashMap<String, String>();
private AnchorManager anchorManager = new AnchorManager(this);
@ -322,6 +323,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
EnforceAccess = this.multiverseConfig.getBoolean("enforceaccess", false);
EnforceGameModes = this.multiverseConfig.getBoolean("enforcegamemodes", true);
PrefixChat = this.multiverseConfig.getBoolean("worldnameprefix", true);
DisplayPermErrors = this.multiverseConfig.getBoolean("displaypermerrors", true);
this.messaging = new MVMessaging(this);
this.messaging.setCooldown(this.multiverseConfig.getInt("messagecooldown", 5000));
this.saveMVConfigs();
@ -426,7 +428,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
}
ArrayList<String> allArgs = new ArrayList<String>(Arrays.asList(args));
allArgs.add(0, command.getName());
return this.commandHandler.locateAndRunCommand(sender, allArgs);
return this.commandHandler.locateAndRunCommand(sender, allArgs, DisplayPermErrors);
}
/**

1
src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java
View File

@ -55,6 +55,7 @@ public class VersionCommand extends MultiverseCommand {
logAndAddToPasteBinBuffer("worldnameprefix: " + MultiverseCore.PrefixChat);
logAndAddToPasteBinBuffer("enforceaccess: " + MultiverseCore.EnforceAccess);
logAndAddToPasteBinBuffer("enforcegamemodes: " + MultiverseCore.EnforceGameModes);
logAndAddToPasteBinBuffer("displaypermerrors: " + MultiverseCore.DisplayPermErrors);
logAndAddToPasteBinBuffer("debug: " + MultiverseCore.GlobalDebug);
logAndAddToPasteBinBuffer("Special Code: FRN002");

2
src/main/java/com/onarandombox/MultiverseCore/enums/ConfigProperty.java
View File

@ -8,7 +8,7 @@
package com.onarandombox.MultiverseCore.enums;
public enum ConfigProperty {
messagecooldown, teleportcooldown, worldnameprefix, enforcegamemodes, enforceaccess, debug;
messagecooldown, teleportcooldown, worldnameprefix, enforcegamemodes, enforceaccess, displaypermerrors, debug;
public static String getAllValues() {

1
src/main/resources/defaults/config.yml
View File

@ -9,3 +9,4 @@ enforceaccess: true
enforcegamemodes: true
bedrespawn: true
version: 2.4
displaypermerrors: true