Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-12-18 14:47:47 +01:00
Code Issues Projects Releases Wiki Activity

Add forceRegisterCommand to force a command after a /register (passwords

Browse Source 
only)
This commit is contained in:
Xephi 2014-08-27 06:14:49 +02:00
parent e869eae036
commit 0d8ce9e3d8
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java
View File

@ -35,13 +35,16 @@ public class ProcessSyncronousPasswordRegister implements Runnable {
this.plugin = plugin; this.plugin = plugin;
} }
protected void forceCommands(Player player) { protected void forceCommands() {
for (String command : Settings.forceCommands) { for (String command : Settings.forceRegisterCommands) {
try { try {
player.performCommand(command.replace("%p", player.getName())); player.performCommand(command.replace("%p", player.getName()));
} catch (Exception e) { } catch (Exception e) {
} }
} }
for (String command : Settings.forceRegisterCommandsAsConsole) {
Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), command.replace("%p", player.getName()));
}
} }
protected void forceLogin(Player player) { protected void forceLogin(Player player) {
@ -144,7 +147,7 @@ public class ProcessSyncronousPasswordRegister implements Runnable {
} }
// Register is now finish , we can force all commands // Register is now finish , we can force all commands
forceCommands(player); forceCommands();
} }
} }

14
src/main/java/fr/xephi/authme/settings/Settings.java
View File

@ -38,6 +38,8 @@ public final class Settings extends YamlConfiguration {
public static List<String> countriesBlacklist = null; public static List<String> countriesBlacklist = null;
public static List<String> forceCommands = null; public static List<String> forceCommands = null;
public static List<String> forceCommandsAsConsole = null; public static List<String> forceCommandsAsConsole = null;
public static List<String> forceRegisterCommands = null;
public static List<String> forceRegisterCommandsAsConsole = null;
private AuthMe plugin; private AuthMe plugin;
private final File file; private final File file;
public static DataSourceType getDataSource; public static DataSourceType getDataSource;
@ -265,6 +267,8 @@ public final class Settings extends YamlConfiguration {
applyBlindEffect = configFile.getBoolean("settings.applyBlindEffect", false); applyBlindEffect = configFile.getBoolean("settings.applyBlindEffect", false);
emailBlacklist = configFile.getStringList("Email.emailBlacklisted"); emailBlacklist = configFile.getStringList("Email.emailBlacklisted");
emailWhitelist = configFile.getStringList("Email.emailWhitelisted"); emailWhitelist = configFile.getStringList("Email.emailWhitelisted");
forceRegisterCommands = (List<String>) configFile.getList("settings.forceRegisterCommands", new ArrayList<String>());
forceRegisterCommandsAsConsole = (List<String>) configFile.getList("settings.forceRegisterCommandsAsConsole", new ArrayList<String>());
// Load the welcome message // Load the welcome message
getWelcomeMessage(plugin); getWelcomeMessage(plugin);
@ -430,6 +434,8 @@ public final class Settings extends YamlConfiguration {
applyBlindEffect = configFile.getBoolean("settings.applyBlindEffect", false); applyBlindEffect = configFile.getBoolean("settings.applyBlindEffect", false);
emailBlacklist = configFile.getStringList("Email.emailBlacklisted"); emailBlacklist = configFile.getStringList("Email.emailBlacklisted");
emailWhitelist = configFile.getStringList("Email.emailWhitelisted"); emailWhitelist = configFile.getStringList("Email.emailWhitelisted");
forceRegisterCommands = (List<String>) configFile.getList("settings.forceRegisterCommands", new ArrayList<String>());
forceRegisterCommandsAsConsole = (List<String>) configFile.getList("settings.forceRegisterCommandsAsConsole", new ArrayList<String>());
// Reload the welcome message // Reload the welcome message
getWelcomeMessage(AuthMe.getInstance()); getWelcomeMessage(AuthMe.getInstance());
@ -564,6 +570,14 @@ public final class Settings extends YamlConfiguration {
set("Email.emailWhitelisted", new ArrayList<String>()); set("Email.emailWhitelisted", new ArrayList<String>());
changes = true; changes = true;
} }
if (!contains("settings.forceRegisterCommands")) {
set("settings.forceRegisterCommands", new ArrayList<String>());
changes = true;
}
if (!contains("settings.forceRegisterCommandsAsConsole")) {
set("settings.forceRegisterCommandsAsConsole", new ArrayList<String>());
changes = true;
}
if (changes) { if (changes) {
plugin.getLogger().warning("Merge new Config Options - I'm not an error, please don't report me"); plugin.getLogger().warning("Merge new Config Options - I'm not an error, please don't report me");

4
src/main/resources/config.yml
View File

@ -250,6 +250,10 @@ settings:
forceCommands: [] forceCommands: []
# Force these commands after /login as a server console, without any '/', use %p for replace with player name # Force these commands after /login as a server console, without any '/', use %p for replace with player name
forceCommandsAsConsole: [] forceCommandsAsConsole: []
# Force these commands after /register, without any '/', use %p for replace with player name
forceRegisterCommands: []
# Force these commands after /register as a server console, without any '/', use %p for replace with player name
forceRegisterCommandsAsConsole: []
# Do we need to display the welcome message (welcome.txt) after a register or a login? # Do we need to display the welcome message (welcome.txt) after a register or a login?
# You can use colors in this welcome.txt + some replaced strings : # You can use colors in this welcome.txt + some replaced strings :
# {PLAYER} : player name, {ONLINE} : display number of online players, {MAXPLAYERS} : display server slots, # {PLAYER} : player name, {ONLINE} : display number of online players, {MAXPLAYERS} : display server slots,