mirror of
https://github.com/AuthMe/AuthMeReloaded.git
synced 2024-11-23 18:55:11 +01:00
start fixing language
This commit is contained in:
parent
32e088c73f
commit
f8ec474534
77
.idea/dictionaries/Gabriele.xml
Normal file
77
.idea/dictionaries/Gabriele.xml
Normal file
@ -0,0 +1,77 @@
|
|||||||
|
<component name="ProjectDictionaryState">
|
||||||
|
<dictionary name="Gabriele">
|
||||||
|
<words>
|
||||||
|
<w>abcdef</w>
|
||||||
|
<w>againt</w>
|
||||||
|
<w>allowd</w>
|
||||||
|
<w>antibot</w>
|
||||||
|
<w>auths</w>
|
||||||
|
<w>bcrypt</w>
|
||||||
|
<w>bcrypt's</w>
|
||||||
|
<w>bukkit</w>
|
||||||
|
<w>checkpw</w>
|
||||||
|
<w>ciphertext</w>
|
||||||
|
<w>classe</w>
|
||||||
|
<w>clen</w>
|
||||||
|
<w>crazycrypt</w>
|
||||||
|
<w>cycically</w>
|
||||||
|
<w>damager</w>
|
||||||
|
<w>datasource</w>
|
||||||
|
<w>doffp</w>
|
||||||
|
<w>dontneed</w>
|
||||||
|
<w>doublemd</w>
|
||||||
|
<w>ekskey</w>
|
||||||
|
<w>feistel</w>
|
||||||
|
<w>gensalt</w>
|
||||||
|
<w>geoip</w>
|
||||||
|
<w>getclasse</w>
|
||||||
|
<w>hashpw</w>
|
||||||
|
<w>hashsum</w>
|
||||||
|
<w>hotbar</w>
|
||||||
|
<w>joomla</w>
|
||||||
|
<w>koffp</w>
|
||||||
|
<w>koolaid</w>
|
||||||
|
<w>lastposworld</w>
|
||||||
|
<w>lastposx</w>
|
||||||
|
<w>lastposy</w>
|
||||||
|
<w>lastposz</w>
|
||||||
|
<w>lgpl</w>
|
||||||
|
<w>logininmillieseconds</w>
|
||||||
|
<w>maxmind</w>
|
||||||
|
<w>maxolen</w>
|
||||||
|
<w>mazieres</w>
|
||||||
|
<w>minecraft</w>
|
||||||
|
<w>motd</w>
|
||||||
|
<w>multiverse</w>
|
||||||
|
<w>mybb</w>
|
||||||
|
<w>offp</w>
|
||||||
|
<w>orphean</w>
|
||||||
|
<w>parameterised</w>
|
||||||
|
<w>passwordb</w>
|
||||||
|
<w>pbkdf</w>
|
||||||
|
<w>phpbb</w>
|
||||||
|
<w>phpfusion</w>
|
||||||
|
<w>playername</w>
|
||||||
|
<w>plen</w>
|
||||||
|
<w>preprocess</w>
|
||||||
|
<w>provos</w>
|
||||||
|
<w>royalauth</w>
|
||||||
|
<w>rtner</w>
|
||||||
|
<w>saltb</w>
|
||||||
|
<w>saltedsha</w>
|
||||||
|
<w>schneier's</w>
|
||||||
|
<w>scry</w>
|
||||||
|
<w>slen</w>
|
||||||
|
<w>sqlite</w>
|
||||||
|
<w>streamtoword</w>
|
||||||
|
<w>teleport</w>
|
||||||
|
<w>tortious</w>
|
||||||
|
<w>unavailableworld</w>
|
||||||
|
<w>unlogged</w>
|
||||||
|
<w>wordpress</w>
|
||||||
|
<w>xauth</w>
|
||||||
|
<w>xenforo</w>
|
||||||
|
<w>xephi</w>
|
||||||
|
</words>
|
||||||
|
</dictionary>
|
||||||
|
</component>
|
@ -15,7 +15,7 @@ public class AntiBot {
|
|||||||
|
|
||||||
private static final AuthMe plugin = AuthMe.getInstance();
|
private static final AuthMe plugin = AuthMe.getInstance();
|
||||||
private static final Messages messages = plugin.getMessages();
|
private static final Messages messages = plugin.getMessages();
|
||||||
private static final List<String> antibotPlayers = new ArrayList<>();
|
private static final List<String> antiBotPlayers = new ArrayList<>();
|
||||||
private static AntiBotStatus antiBotStatus = AntiBotStatus.DISABLED;
|
private static AntiBotStatus antiBotStatus = AntiBotStatus.DISABLED;
|
||||||
|
|
||||||
public static void setupAntiBotService() {
|
public static void setupAntiBotService() {
|
||||||
@ -56,7 +56,7 @@ public class AntiBot {
|
|||||||
public void run() {
|
public void run() {
|
||||||
if (antiBotStatus == AntiBotStatus.ACTIVE) {
|
if (antiBotStatus == AntiBotStatus.ACTIVE) {
|
||||||
antiBotStatus = AntiBotStatus.LISTENING;
|
antiBotStatus = AntiBotStatus.LISTENING;
|
||||||
antibotPlayers.clear();
|
antiBotPlayers.clear();
|
||||||
for (String s : messages.send("antibot_auto_disabled"))
|
for (String s : messages.send("antibot_auto_disabled"))
|
||||||
Bukkit.broadcastMessage(s.replace("%m", "" + Settings.antiBotDuration));
|
Bukkit.broadcastMessage(s.replace("%m", "" + Settings.antiBotDuration));
|
||||||
}
|
}
|
||||||
@ -77,15 +77,15 @@ public class AntiBot {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
antibotPlayers.add(player.getName().toLowerCase());
|
antiBotPlayers.add(player.getName().toLowerCase());
|
||||||
if (antibotPlayers.size() > Settings.antiBotSensibility) {
|
if (antiBotPlayers.size() > Settings.antiBotSensibility) {
|
||||||
activateAntiBot();
|
activateAntiBot();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
|
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
antibotPlayers.remove(player.getName().toLowerCase());
|
antiBotPlayers.remove(player.getName().toLowerCase());
|
||||||
}
|
}
|
||||||
}, 300);
|
}, 300);
|
||||||
}
|
}
|
||||||
|
@ -297,7 +297,6 @@ public class AuthMe extends JavaPlugin {
|
|||||||
|
|
||||||
// Sponsor messages
|
// Sponsor messages
|
||||||
ConsoleLogger.info("AuthMe hooks perfectly with the VeryGames server hosting!");
|
ConsoleLogger.info("AuthMe hooks perfectly with the VeryGames server hosting!");
|
||||||
ConsoleLogger.info("Development builds are available on our jenkins, thanks to f14stelt.");
|
|
||||||
ConsoleLogger.info("Do you want a good game server? Look at our sponsor GameHosting.it leader in Italy as Game Server Provider!");
|
ConsoleLogger.info("Do you want a good game server? Look at our sponsor GameHosting.it leader in Italy as Game Server Provider!");
|
||||||
|
|
||||||
// Successful message
|
// Successful message
|
||||||
@ -548,7 +547,7 @@ public class AuthMe extends JavaPlugin {
|
|||||||
public void setupDatabase() throws Exception {
|
public void setupDatabase() throws Exception {
|
||||||
if (database != null)
|
if (database != null)
|
||||||
database.close();
|
database.close();
|
||||||
// Backend MYSQL - FILE - SQLITE - SQLITEHIKARI
|
// Backend MYSQL - FILE - SQLITE
|
||||||
boolean isSQLite = false;
|
boolean isSQLite = false;
|
||||||
switch (Settings.getDataSource) {
|
switch (Settings.getDataSource) {
|
||||||
case FILE:
|
case FILE:
|
||||||
|
@ -234,7 +234,7 @@ public class AuthMePlayerListener implements Listener {
|
|||||||
event.setJoinMessage(null);
|
event.setJoinMessage(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Shedule login task so works after the prelogin
|
// Schedule login task so works after the preLogin
|
||||||
// (Fix found by Koolaid5000)
|
// (Fix found by Koolaid5000)
|
||||||
Bukkit.getScheduler().runTask(plugin, new Runnable() {
|
Bukkit.getScheduler().runTask(plugin, new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
@ -300,7 +300,7 @@ public class AuthMePlayerListener implements Listener {
|
|||||||
pl.kickPlayer(m.send("kick_forvip")[0]);
|
pl.kickPlayer(m.send("kick_forvip")[0]);
|
||||||
event.allow();
|
event.allow();
|
||||||
} else {
|
} else {
|
||||||
ConsoleLogger.info("The player " + event.getPlayer().getName() + " tryed to join, but the server was full");
|
ConsoleLogger.info("The player " + event.getPlayer().getName() + " tried to join, but the server was full");
|
||||||
event.setKickMessage(m.send("kick_fullserver")[0]);
|
event.setKickMessage(m.send("kick_fullserver")[0]);
|
||||||
event.setResult(PlayerLoginEvent.Result.KICK_FULL);
|
event.setResult(PlayerLoginEvent.Result.KICK_FULL);
|
||||||
}
|
}
|
||||||
|
@ -36,7 +36,7 @@ public class AsynchronousJoin {
|
|||||||
private final DataSource database;
|
private final DataSource database;
|
||||||
private final String name;
|
private final String name;
|
||||||
private final Messages m;
|
private final Messages m;
|
||||||
private final BukkitScheduler sched;
|
private final BukkitScheduler scheduler;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor for AsynchronousJoin.
|
* Constructor for AsynchronousJoin.
|
||||||
@ -48,7 +48,7 @@ public class AsynchronousJoin {
|
|||||||
public AsynchronousJoin(Player player, AuthMe plugin, DataSource database) {
|
public AsynchronousJoin(Player player, AuthMe plugin, DataSource database) {
|
||||||
this.player = player;
|
this.player = player;
|
||||||
this.plugin = plugin;
|
this.plugin = plugin;
|
||||||
this.sched = plugin.getServer().getScheduler();
|
this.scheduler = plugin.getServer().getScheduler();
|
||||||
this.database = database;
|
this.database = database;
|
||||||
this.name = player.getName().toLowerCase();
|
this.name = player.getName().toLowerCase();
|
||||||
this.m = Messages.getInstance();
|
this.m = Messages.getInstance();
|
||||||
@ -69,7 +69,7 @@ public class AsynchronousJoin {
|
|||||||
|
|
||||||
if (!plugin.canConnect()) {
|
if (!plugin.canConnect()) {
|
||||||
final GameMode gM = AuthMePlayerListener.gameMode.get(name);
|
final GameMode gM = AuthMePlayerListener.gameMode.get(name);
|
||||||
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
|
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
@ -85,7 +85,7 @@ public class AsynchronousJoin {
|
|||||||
final String ip = plugin.getIP(player);
|
final String ip = plugin.getIP(player);
|
||||||
if (Settings.isAllowRestrictedIp && !Settings.getRestrictedIp(name, ip)) {
|
if (Settings.isAllowRestrictedIp && !Settings.getRestrictedIp(name, ip)) {
|
||||||
final GameMode gM = AuthMePlayerListener.gameMode.get(name);
|
final GameMode gM = AuthMePlayerListener.gameMode.get(name);
|
||||||
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
|
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
@ -101,7 +101,7 @@ public class AsynchronousJoin {
|
|||||||
}
|
}
|
||||||
if (Settings.getMaxJoinPerIp > 0 && !plugin.getPermissionsManager().hasPermission(player, "authme.allow2accounts") && !ip.equalsIgnoreCase("127.0.0.1") && !ip.equalsIgnoreCase("localhost")) {
|
if (Settings.getMaxJoinPerIp > 0 && !plugin.getPermissionsManager().hasPermission(player, "authme.allow2accounts") && !ip.equalsIgnoreCase("127.0.0.1") && !ip.equalsIgnoreCase("localhost")) {
|
||||||
if (plugin.hasJoinedIp(player.getName(), ip)) {
|
if (plugin.hasJoinedIp(player.getName(), ip)) {
|
||||||
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
|
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
@ -116,7 +116,7 @@ public class AsynchronousJoin {
|
|||||||
final boolean isAuthAvailable = database.isAuthAvailable(name);
|
final boolean isAuthAvailable = database.isAuthAvailable(name);
|
||||||
if (isAuthAvailable) {
|
if (isAuthAvailable) {
|
||||||
if (Settings.isForceSurvivalModeEnabled && !Settings.forceOnlyAfterLogin) {
|
if (Settings.isForceSurvivalModeEnabled && !Settings.forceOnlyAfterLogin) {
|
||||||
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
|
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
@ -128,7 +128,7 @@ public class AsynchronousJoin {
|
|||||||
}
|
}
|
||||||
if (!Settings.noTeleport)
|
if (!Settings.noTeleport)
|
||||||
if (Settings.isTeleportToSpawnEnabled || (Settings.isForceSpawnLocOnJoinEnabled && Settings.getForcedWorlds.contains(player.getWorld().getName()))) {
|
if (Settings.isTeleportToSpawnEnabled || (Settings.isForceSpawnLocOnJoinEnabled && Settings.getForcedWorlds.contains(player.getWorld().getName()))) {
|
||||||
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
|
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
@ -158,7 +158,7 @@ public class AsynchronousJoin {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (Settings.isForceSurvivalModeEnabled && !Settings.forceOnlyAfterLogin) {
|
if (Settings.isForceSurvivalModeEnabled && !Settings.forceOnlyAfterLogin) {
|
||||||
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
|
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
@ -176,7 +176,7 @@ public class AsynchronousJoin {
|
|||||||
}
|
}
|
||||||
if (!Settings.noTeleport)
|
if (!Settings.noTeleport)
|
||||||
if (!needFirstSpawn() && Settings.isTeleportToSpawnEnabled || (Settings.isForceSpawnLocOnJoinEnabled && Settings.getForcedWorlds.contains(player.getWorld().getName()))) {
|
if (!needFirstSpawn() && Settings.isTeleportToSpawnEnabled || (Settings.isForceSpawnLocOnJoinEnabled && Settings.getForcedWorlds.contains(player.getWorld().getName()))) {
|
||||||
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
|
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
@ -202,12 +202,12 @@ public class AsynchronousJoin {
|
|||||||
final int timeOut = Settings.getRegistrationTimeout * 20;
|
final int timeOut = Settings.getRegistrationTimeout * 20;
|
||||||
int msgInterval = Settings.getWarnMessageInterval;
|
int msgInterval = Settings.getWarnMessageInterval;
|
||||||
if (timeOut > 0) {
|
if (timeOut > 0) {
|
||||||
BukkitTask id = sched.runTaskLaterAsynchronously(plugin, new TimeoutTask(plugin, name, player), timeOut);
|
BukkitTask id = scheduler.runTaskLaterAsynchronously(plugin, new TimeoutTask(plugin, name, player), timeOut);
|
||||||
LimboCache.getInstance().getLimboPlayer(name).setTimeoutTaskId(id);
|
LimboCache.getInstance().getLimboPlayer(name).setTimeoutTaskId(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
Utils.setGroup(player, isAuthAvailable ? GroupType.NOTLOGGEDIN : GroupType.UNREGISTERED);
|
Utils.setGroup(player, isAuthAvailable ? GroupType.NOTLOGGEDIN : GroupType.UNREGISTERED);
|
||||||
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
|
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
player.setOp(false);
|
player.setOp(false);
|
||||||
@ -249,7 +249,7 @@ public class AsynchronousJoin {
|
|||||||
|
|
||||||
String[] msg = isAuthAvailable ? m.send("login_msg") :
|
String[] msg = isAuthAvailable ? m.send("login_msg") :
|
||||||
m.send("reg_" + (Settings.emailRegistration ? "email_" : "") + "msg");
|
m.send("reg_" + (Settings.emailRegistration ? "email_" : "") + "msg");
|
||||||
BukkitTask msgTask = sched.runTaskAsynchronously(plugin, new MessageTask(plugin, name, msg, msgInterval));
|
BukkitTask msgTask = scheduler.runTaskAsynchronously(plugin, new MessageTask(plugin, name, msg, msgInterval));
|
||||||
LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(msgTask);
|
LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(msgTask);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -297,7 +297,7 @@ public class AsynchronousJoin {
|
|||||||
return;
|
return;
|
||||||
if (!player.hasPlayedBefore())
|
if (!player.hasPlayedBefore())
|
||||||
return;
|
return;
|
||||||
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
|
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
if (spawnLoc.getWorld() == null) {
|
if (spawnLoc.getWorld() == null) {
|
||||||
|
@ -183,7 +183,7 @@ public class AsynchronousLogin {
|
|||||||
if (!Settings.noConsoleSpam)
|
if (!Settings.noConsoleSpam)
|
||||||
ConsoleLogger.info(realName + " logged in!");
|
ConsoleLogger.info(realName + " logged in!");
|
||||||
|
|
||||||
// makes player isLoggedin via API
|
// Set player status to LoggedIn
|
||||||
PlayerCache.getInstance().addPlayer(auth);
|
PlayerCache.getInstance().addPlayer(auth);
|
||||||
database.setLogged(name);
|
database.setLogged(name);
|
||||||
plugin.otherAccounts.addPlayer(player.getUniqueId());
|
plugin.otherAccounts.addPlayer(player.getUniqueId());
|
||||||
@ -192,14 +192,14 @@ public class AsynchronousLogin {
|
|||||||
// task, we schedule it in the end
|
// task, we schedule it in the end
|
||||||
// so that we can be sure, and have not to care if it might be
|
// so that we can be sure, and have not to care if it might be
|
||||||
// processed in other order.
|
// processed in other order.
|
||||||
ProcessSyncronousPlayerLogin syncronousPlayerLogin = new ProcessSyncronousPlayerLogin(player, plugin, database);
|
ProcessSynchronousPlayerLogin synchronousPlayerLogin = new ProcessSynchronousPlayerLogin(player, plugin, database);
|
||||||
if (syncronousPlayerLogin.getLimbo() != null) {
|
if (synchronousPlayerLogin.getLimbo() != null) {
|
||||||
if (syncronousPlayerLogin.getLimbo().getTimeoutTaskId() != null)
|
if (synchronousPlayerLogin.getLimbo().getTimeoutTaskId() != null)
|
||||||
syncronousPlayerLogin.getLimbo().getTimeoutTaskId().cancel();
|
synchronousPlayerLogin.getLimbo().getTimeoutTaskId().cancel();
|
||||||
if (syncronousPlayerLogin.getLimbo().getMessageTaskId() != null)
|
if (synchronousPlayerLogin.getLimbo().getMessageTaskId() != null)
|
||||||
syncronousPlayerLogin.getLimbo().getMessageTaskId().cancel();
|
synchronousPlayerLogin.getLimbo().getMessageTaskId().cancel();
|
||||||
}
|
}
|
||||||
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, syncronousPlayerLogin);
|
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, synchronousPlayerLogin);
|
||||||
} else if (player.isOnline()) {
|
} else if (player.isOnline()) {
|
||||||
if (!Settings.noConsoleSpam)
|
if (!Settings.noConsoleSpam)
|
||||||
ConsoleLogger.info(realName + " used the wrong password");
|
ConsoleLogger.info(realName + " used the wrong password");
|
||||||
@ -236,7 +236,7 @@ public class AsynchronousLogin {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
List<String> auths = this.database.getAllAuthsByName(auth);
|
List<String> auths = this.database.getAllAuthsByName(auth);
|
||||||
// List<String> uuidlist =
|
// List<String> uuidList =
|
||||||
// plugin.otherAccounts.getAllPlayersByUUID(player.getUniqueId());
|
// plugin.otherAccounts.getAllPlayersByUUID(player.getUniqueId());
|
||||||
if (auths.isEmpty()) {
|
if (auths.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
@ -245,7 +245,7 @@ public class AsynchronousLogin {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
StringBuilder message = new StringBuilder("[AuthMe] ");
|
StringBuilder message = new StringBuilder("[AuthMe] ");
|
||||||
// String uuidaccounts =
|
// String uuidAccounts =
|
||||||
// "[AuthMe] PlayerNames has %size% links to this UUID : ";
|
// "[AuthMe] PlayerNames has %size% links to this UUID : ";
|
||||||
int i = 0;
|
int i = 0;
|
||||||
for (String account : auths) {
|
for (String account : auths) {
|
||||||
@ -258,17 +258,17 @@ public class AsynchronousLogin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
* TODO: Active uuid system i = 0; for (String account : uuidlist) {
|
* TODO: Active uuid system i = 0; for (String account : uuidList) {
|
||||||
* i++; uuidaccounts = uuidaccounts + account; if (i != auths.size()) {
|
* i++; uuidAccounts = uuidAccounts + account; if (i != auths.size()) {
|
||||||
* uuidaccounts = uuidaccounts + ", "; } else { uuidaccounts =
|
* uuidAccounts = uuidAccounts + ", "; } else { uuidAccounts =
|
||||||
* uuidaccounts + "."; } }
|
* uuidAccounts + "."; } }
|
||||||
*/
|
*/
|
||||||
for (Player player : Utils.getOnlinePlayers()) {
|
for (Player player : Utils.getOnlinePlayers()) {
|
||||||
if (plugin.getPermissionsManager().hasPermission(player, "authme.seeOtherAccounts")) {
|
if (plugin.getPermissionsManager().hasPermission(player, "authme.seeOtherAccounts")) {
|
||||||
player.sendMessage("[AuthMe] The player " + auth.getNickname() + " has " + auths.size() + " accounts");
|
player.sendMessage("[AuthMe] The player " + auth.getNickname() + " has " + auths.size() + " accounts");
|
||||||
player.sendMessage(message.toString());
|
player.sendMessage(message.toString());
|
||||||
// player.sendMessage(uuidaccounts.replace("%size%",
|
// player.sendMessage(uuidAccounts.replace("%size%",
|
||||||
// ""+uuidlist.size()));
|
// ""+uuidList.size()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ import org.bukkit.potion.PotionEffectType;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
public class ProcessSyncronousPlayerLogin implements Runnable {
|
public class ProcessSynchronousPlayerLogin implements Runnable {
|
||||||
|
|
||||||
private final LimboPlayer limbo;
|
private final LimboPlayer limbo;
|
||||||
private final Player player;
|
private final Player player;
|
||||||
@ -34,14 +34,14 @@ public class ProcessSyncronousPlayerLogin implements Runnable {
|
|||||||
private final JsonCache playerCache;
|
private final JsonCache playerCache;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor for ProcessSyncronousPlayerLogin.
|
* Constructor for ProcessSynchronousPlayerLogin.
|
||||||
*
|
*
|
||||||
* @param player Player
|
* @param player Player
|
||||||
* @param plugin AuthMe
|
* @param plugin AuthMe
|
||||||
* @param data DataSource
|
* @param data DataSource
|
||||||
*/
|
*/
|
||||||
public ProcessSyncronousPlayerLogin(Player player, AuthMe plugin,
|
public ProcessSynchronousPlayerLogin(Player player, AuthMe plugin,
|
||||||
DataSource data) {
|
DataSource data) {
|
||||||
this.plugin = plugin;
|
this.plugin = plugin;
|
||||||
this.database = data;
|
this.database = data;
|
||||||
this.pm = plugin.getServer().getPluginManager();
|
this.pm = plugin.getServer().getPluginManager();
|
@ -35,8 +35,7 @@ public class AsynchronousQuit {
|
|||||||
* @param database DataSource
|
* @param database DataSource
|
||||||
* @param isKick boolean
|
* @param isKick boolean
|
||||||
*/
|
*/
|
||||||
public AsynchronousQuit(Player p, AuthMe plugin, DataSource database,
|
public AsynchronousQuit(Player p, AuthMe plugin, DataSource database, boolean isKick) {
|
||||||
boolean isKick) {
|
|
||||||
this.player = p;
|
this.player = p;
|
||||||
this.plugin = plugin;
|
this.plugin = plugin;
|
||||||
this.database = database;
|
this.database = database;
|
||||||
@ -45,9 +44,7 @@ public class AsynchronousQuit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void process() {
|
public void process() {
|
||||||
if (player == null)
|
if (player == null || Utils.isUnrestricted(player)) {
|
||||||
return;
|
|
||||||
if (/*Utils.isNPC(player) || */Utils.isUnrestricted(player)) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -56,7 +53,8 @@ public class AsynchronousQuit {
|
|||||||
if (PlayerCache.getInstance().isAuthenticated(name)) {
|
if (PlayerCache.getInstance().isAuthenticated(name)) {
|
||||||
if (Settings.isSaveQuitLocationEnabled) {
|
if (Settings.isSaveQuitLocationEnabled) {
|
||||||
Location loc = player.getLocation();
|
Location loc = player.getLocation();
|
||||||
PlayerAuth auth = new PlayerAuth(name, loc.getX(), loc.getY(), loc.getZ(), loc.getWorld().getName(), player.getName());
|
PlayerAuth auth = new PlayerAuth(name, loc.getX(), loc.getY(), loc.getZ(), loc.getWorld().getName(),
|
||||||
|
player.getName());
|
||||||
database.updateQuitLoc(auth);
|
database.updateQuitLoc(auth);
|
||||||
}
|
}
|
||||||
PlayerAuth auth = new PlayerAuth(name, ip, System.currentTimeMillis(), player.getName());
|
PlayerAuth auth = new PlayerAuth(name, ip, System.currentTimeMillis(), player.getName());
|
||||||
@ -97,6 +95,6 @@ public class AsynchronousQuit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AuthMePlayerListener.gameMode.remove(name);
|
AuthMePlayerListener.gameMode.remove(name);
|
||||||
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new ProcessSyncronousPlayerQuit(plugin, player, isOp, isFlying, needToChange));
|
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new ProcessSynchronousPlayerQuit(plugin, player, isOp, isFlying, needToChange));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,7 @@ import org.bukkit.entity.Player;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
public class ProcessSyncronousPlayerQuit implements Runnable {
|
public class ProcessSynchronousPlayerQuit implements Runnable {
|
||||||
|
|
||||||
protected final AuthMe plugin;
|
protected final AuthMe plugin;
|
||||||
protected final Player player;
|
protected final Player player;
|
||||||
@ -16,7 +16,7 @@ public class ProcessSyncronousPlayerQuit implements Runnable {
|
|||||||
protected final boolean needToChange;
|
protected final boolean needToChange;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor for ProcessSyncronousPlayerQuit.
|
* Constructor for ProcessSynchronousPlayerQuit.
|
||||||
*
|
*
|
||||||
* @param plugin AuthMe
|
* @param plugin AuthMe
|
||||||
* @param player Player
|
* @param player Player
|
||||||
@ -24,7 +24,7 @@ public class ProcessSyncronousPlayerQuit implements Runnable {
|
|||||||
* @param isFlying boolean
|
* @param isFlying boolean
|
||||||
* @param needToChange boolean
|
* @param needToChange boolean
|
||||||
*/
|
*/
|
||||||
public ProcessSyncronousPlayerQuit(AuthMe plugin, Player player
|
public ProcessSynchronousPlayerQuit(AuthMe plugin, Player player
|
||||||
, boolean isOp, boolean isFlying
|
, boolean isOp, boolean isFlying
|
||||||
, boolean needToChange) {
|
, boolean needToChange) {
|
||||||
this.plugin = plugin;
|
this.plugin = plugin;
|
@ -163,7 +163,7 @@ public class AsyncRegister {
|
|||||||
database.setLogged(name);
|
database.setLogged(name);
|
||||||
}
|
}
|
||||||
plugin.otherAccounts.addPlayer(player.getUniqueId());
|
plugin.otherAccounts.addPlayer(player.getUniqueId());
|
||||||
ProcessSyncronousPasswordRegister sync = new ProcessSyncronousPasswordRegister(player, plugin);
|
ProcessSynchronousPasswordRegister sync = new ProcessSynchronousPasswordRegister(player, plugin);
|
||||||
plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, sync);
|
plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, sync);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -20,7 +20,7 @@ import org.bukkit.scheduler.BukkitTask;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
public class ProcessSyncronousPasswordRegister implements Runnable {
|
public class ProcessSynchronousPasswordRegister implements Runnable {
|
||||||
|
|
||||||
protected final Player player;
|
protected final Player player;
|
||||||
protected final String name;
|
protected final String name;
|
||||||
@ -28,12 +28,12 @@ public class ProcessSyncronousPasswordRegister implements Runnable {
|
|||||||
private final Messages m = Messages.getInstance();
|
private final Messages m = Messages.getInstance();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor for ProcessSyncronousPasswordRegister.
|
* Constructor for ProcessSynchronousPasswordRegister.
|
||||||
*
|
*
|
||||||
* @param player Player
|
* @param player Player
|
||||||
* @param plugin AuthMe
|
* @param plugin AuthMe
|
||||||
*/
|
*/
|
||||||
public ProcessSyncronousPasswordRegister(Player player, AuthMe plugin) {
|
public ProcessSynchronousPasswordRegister(Player player, AuthMe plugin) {
|
||||||
this.player = player;
|
this.player = player;
|
||||||
this.name = player.getName().toLowerCase();
|
this.name = player.getName().toLowerCase();
|
||||||
this.plugin = plugin;
|
this.plugin = plugin;
|
Loading…
Reference in New Issue
Block a user