mirror of
https://github.com/AuthMe/AuthMeReloaded.git
synced 2024-09-19 02:11:55 +02:00
fix cache, still not add null check.
This commit is contained in:
parent
b4124bc46d
commit
a4fd60a6f6
@ -11,8 +11,7 @@ public class DataFileCache {
|
|||||||
private boolean flying;
|
private boolean flying;
|
||||||
|
|
||||||
public DataFileCache(ItemStack[] inventory, ItemStack[] armor) {
|
public DataFileCache(ItemStack[] inventory, ItemStack[] armor) {
|
||||||
this.inventory = inventory;
|
this(inventory, armor, "", false, false);
|
||||||
this.armor = armor;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public DataFileCache(ItemStack[] inventory, ItemStack[] armor,
|
public DataFileCache(ItemStack[] inventory, ItemStack[] armor,
|
||||||
|
@ -1,15 +1,14 @@
|
|||||||
package fr.xephi.authme.commands;
|
package fr.xephi.authme.commands;
|
||||||
|
|
||||||
import org.bukkit.command.Command;
|
|
||||||
import org.bukkit.command.CommandExecutor;
|
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import fr.xephi.authme.AuthMe;
|
import fr.xephi.authme.AuthMe;
|
||||||
import fr.xephi.authme.cache.auth.PlayerAuth;
|
import fr.xephi.authme.cache.auth.PlayerAuth;
|
||||||
import fr.xephi.authme.security.RandomString;
|
import fr.xephi.authme.security.RandomString;
|
||||||
import fr.xephi.authme.settings.Messages;
|
import fr.xephi.authme.settings.Messages;
|
||||||
import fr.xephi.authme.settings.Settings;
|
import fr.xephi.authme.settings.Settings;
|
||||||
|
import org.bukkit.command.Command;
|
||||||
|
import org.bukkit.command.CommandExecutor;
|
||||||
|
import org.bukkit.command.CommandSender;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
public class RegisterCommand implements CommandExecutor {
|
public class RegisterCommand implements CommandExecutor {
|
||||||
|
|
||||||
@ -23,26 +22,23 @@ public class RegisterCommand implements CommandExecutor {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCommand(CommandSender sender, Command cmnd, String label,
|
public boolean onCommand(CommandSender sender, Command cmnd, String label,
|
||||||
String[] args) {
|
String[] args) {
|
||||||
if (!(sender instanceof Player)) {
|
if (!(sender instanceof Player)) {
|
||||||
sender.sendMessage("Player Only! Use 'authme register <playername> <password>' instead");
|
sender.sendMessage("Player Only! Use 'authme register <playername> <password>' instead");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (args.length == 0) {
|
final Player player = (Player) sender;
|
||||||
m.send(sender, "usage_reg");
|
if (args.length == 0 || (Settings.getEnablePasswordVerifier && args.length < 2)) {
|
||||||
}
|
m.send(player, "usage_reg");
|
||||||
if (!plugin.authmePermissible(sender, "authme." + label.toLowerCase())) {
|
return true;
|
||||||
m.send(sender, "no_perm");
|
}
|
||||||
|
if (!plugin.authmePermissible(player, "authme." + label.toLowerCase())) {
|
||||||
|
m.send(player, "no_perm");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
final Player player = (Player) sender;
|
|
||||||
if (Settings.emailRegistration && !Settings.getmailAccount.isEmpty()) {
|
if (Settings.emailRegistration && !Settings.getmailAccount.isEmpty()) {
|
||||||
if (Settings.doubleEmailCheck) {
|
if (Settings.doubleEmailCheck) {
|
||||||
if (args.length < 2) {
|
if (args.length < 2 || !args[0].equals(args[1])) {
|
||||||
m.send(player, "usage_reg");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (!args[0].equals(args[1])) {
|
|
||||||
m.send(player, "usage_reg");
|
m.send(player, "usage_reg");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -57,10 +53,6 @@ public class RegisterCommand implements CommandExecutor {
|
|||||||
plugin.management.performRegister(player, thePass, email);
|
plugin.management.performRegister(player, thePass, email);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (args.length == 0 || (Settings.getEnablePasswordVerifier && args.length < 2)) {
|
|
||||||
m.send(player, "usage_reg");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (args.length > 1 && Settings.getEnablePasswordVerifier)
|
if (args.length > 1 && Settings.getEnablePasswordVerifier)
|
||||||
if (!args[0].equals(args[1])) {
|
if (!args[0].equals(args[1])) {
|
||||||
m.send(player, "password_error");
|
m.send(player, "password_error");
|
||||||
|
Loading…
Reference in New Issue
Block a user