Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-23 10:45:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded

Browse Source
This commit is contained in:
Gabriele C 2015-12-18 17:11:33 +01:00
commit 7614b263b0
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -90,6 +90,14 @@
<include>plugin.yml</include> <include>plugin.yml</include>
</includes> </includes>
</resource> </resource>
<resource>
<targetPath>.</targetPath>
<filtering>true</filtering>
<directory>src/main/resources/</directory>
<includes>
<include>email.html</include>
</includes>
</resource>
<resource> <resource>
<targetPath>.</targetPath> <targetPath>.</targetPath>
<filtering>false</filtering> <filtering>false</filtering>

4
src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
View File

@ -229,7 +229,7 @@ public class AuthMePlayerListener implements Listener {
if (auth != null && !auth.getRealName().equals("Player") && !auth.getRealName().equals(event.getName())) { if (auth != null && !auth.getRealName().equals("Player") && !auth.getRealName().equals(event.getName())) {
event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER); event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER);
event.setKickMessage("You should join using username: " + ChatColor.AQUA + auth.getRealName() + event.setKickMessage("You should join using username: " + ChatColor.AQUA + auth.getRealName() +
ChatColor.RESET + "\nnot :" + ChatColor.RED + event.getName()); // TODO: write a better message ChatColor.RESET + "\nnot: " + ChatColor.RED + event.getName()); // TODO: write a better message
return; return;
} }
@ -288,7 +288,7 @@ public class AuthMePlayerListener implements Listener {
pl.kickPlayer(m.retrieveSingle(MessageKey.KICK_FOR_VIP)); pl.kickPlayer(m.retrieveSingle(MessageKey.KICK_FOR_VIP));
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.retrieveSingle(MessageKey.KICK_FULL_SERVER)); event.setKickMessage(m.retrieveSingle(MessageKey.KICK_FULL_SERVER));
event.setResult(PlayerLoginEvent.Result.KICK_FULL); event.setResult(PlayerLoginEvent.Result.KICK_FULL);
} }

6
src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
View File

@ -141,8 +141,10 @@ public class AsyncRegister {
return; return;
} }
if (!Settings.forceRegLogin) { if (!Settings.forceRegLogin) {
PlayerCache.getInstance().addPlayer(auth); //PlayerCache.getInstance().addPlayer(auth);
database.setLogged(name); //database.setLogged(name);
// TODO: check this...
plugin.getManagement().performLogin(player, "dontneed", true);
} }
plugin.otherAccounts.addPlayer(player.getUniqueId()); plugin.otherAccounts.addPlayer(player.getUniqueId());
ProcessSyncPasswordRegister sync = new ProcessSyncPasswordRegister(player, plugin); ProcessSyncPasswordRegister sync = new ProcessSyncPasswordRegister(player, plugin);