TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-30 18:57:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix BungeeCord autoRegister (Fixes #46)

Browse Source
This commit is contained in:
games647
2016-07-31 09:57:50 +02:00
parent fb357424e6
commit 27c04ff08f
6 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bukkit/pom.xml
View File

@ -16,19 +16,18 @@
<name>FastLoginBukkit</name>
<repositories>
<!--LoginSecurity-->
<repository>
<id>lenis0012-repo</id>
<url>http://ci.lenis0012.com/plugin/repository/everything/</url>
</repository>
<!--Bukkit-Server-API -->
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<!--LoginSecurity-->
<repository>
<id>lenis0012-repo</id>
<url>http://ci.lenis0012.com/plugin/repository/everything/</url>
</repository>
<!--ProtocolLib-->
<repository>
<id>dmulloy2-repo</id>

4
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java
View File

@ -3,8 +3,8 @@ package com.github.games647.fastlogin.bukkit.tasks;
import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
import com.github.games647.fastlogin.bukkit.hooks.BukkitAuthPlugin;
import com.github.games647.fastlogin.core.AuthStorage;
import com.github.games647.fastlogin.core.PlayerProfile;
import com.github.games647.fastlogin.core.Storage;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
@ -39,7 +39,7 @@ public class ForceLoginTask implements Runnable {
return;
}
Storage storage = plugin.getCore().getStorage();
AuthStorage storage = plugin.getCore().getStorage();
PlayerProfile playerProfile = session.getProfile();
//check if it's the same player as we checked before

4
bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/AsyncPremiumCheck.java
View File

@ -40,8 +40,8 @@ public class AsyncPremiumCheck implements Runnable {
}
if (premiumUUID == null
|| !checkNameChange(premiumUUID, connection, username)
|| !checkPremiumName(username, connection, profile)) {
|| (!checkNameChange(premiumUUID, connection, username)
&& !checkPremiumName(username, connection, profile))) {
//nothing detected the player as premium -> start a cracked session
plugin.getSession().put(connection, new BungeeLoginSession(username, false, profile));
}

2
core/pom.xml
View File

@ -19,7 +19,7 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>2.4.6</version>
<version>2.4.7</version>
</dependency>
<!--Logging framework implements slf4j which is required by hikari-->

6
core/src/main/java/com/github/games647/fastlogin/core/Storage.java → core/src/main/java/com/github/games647/fastlogin/core/AuthStorage.java
View File

@ -11,14 +11,14 @@ import java.sql.Statement;
import java.util.UUID;
import java.util.logging.Level;
public class Storage {
public class AuthStorage {
private static final String PREMIUM_TABLE = "premium";
private final FastLoginCore core;
private final HikariDataSource dataSource;
public Storage(FastLoginCore core, String driver, String host, int port, String databasePath
public AuthStorage(FastLoginCore core, String driver, String host, int port, String databasePath
, String user, String pass) {
this.core = core;
@ -30,8 +30,6 @@ public class Storage {
databasePath = databasePath.replace("{pluginDir}", core.getDataFolder().getAbsolutePath());
databaseConfig.setThreadFactory(core.getThreadFactory());
String jdbcUrl = "jdbc:";
if (driver.contains("sqlite")) {
jdbcUrl += "sqlite" + "://" + databasePath;

6
core/src/main/java/com/github/games647/fastlogin/core/FastLoginCore.java
View File

@ -20,7 +20,7 @@ public abstract class FastLoginCore {
protected final Map<String, String> localeMessages = new ConcurrentHashMap<>();
private MojangApiConnector mojangApiConnector;
private Storage storage;
private AuthStorage storage;
public void setMojangApiConnector(MojangApiConnector mojangApiConnector) {
this.mojangApiConnector = mojangApiConnector;
@ -30,7 +30,7 @@ public abstract class FastLoginCore {
return mojangApiConnector;
}
public Storage getStorage() {
public AuthStorage getStorage() {
return storage;
}
@ -49,7 +49,7 @@ public abstract class FastLoginCore {
public abstract void loadConfig();
public boolean setupDatabase(String driver, String host, int port, String database, String user, String password) {
storage = new Storage(this, driver, host, port, database, user, password);
storage = new AuthStorage(this, driver, host, port, database, user, password);
try {
storage.createTables();
return true;