Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-09-30 14:27:29 +02:00
Code Issues Projects Releases Wiki Activity

Fix logging in on Fabric using offline mode (#2810)

Browse Source
This commit is contained in:
Luck 2021-01-05 10:30:28 +00:00
parent 21abb94796
commit 848c36928f
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/me/lucko/luckperms/common/event/EventDispatcher.java
View File

@ -332,8 +332,8 @@ public final class EventDispatcher {
postAsync(UserFirstLoginEvent.class, uniqueId, username);
}
public void dispatchPlayerLoginProcess(UUID uniqueId, String username, User user) {
postSync(PlayerLoginProcessEvent.class, uniqueId, username, user.getApiProxy());
public void dispatchPlayerLoginProcess(UUID uniqueId, String username, @Nullable User user) {
postSync(PlayerLoginProcessEvent.class, uniqueId, username, user == null ? null : user.getApiProxy());
}
public void dispatchPlayerDataSave(UUID uniqueId, String username, PlayerSaveResult result) {

2
fabric/build.gradle
View File

@ -51,7 +51,7 @@ processResources {
}
shadowJar {
archiveName = "LuckPerms-Fabric-${project.ext.fullVersion}-dev.jar"
archiveName = "luckpermsfabric-${project.ext.fullVersion}-dev.jar"
dependencies {
exclude('net.fabricmc:.*')

21
fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricConnectionListener.java
View File

@ -42,11 +42,13 @@ import net.fabricmc.fabric.api.networking.v1.ServerLoginConnectionEvents;
import net.fabricmc.fabric.api.networking.v1.ServerLoginNetworking.LoginSynchronizer;
import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
import net.kyori.adventure.text.Component;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerLoginNetworkHandler;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
public class FabricConnectionListener extends AbstractConnectionListener {
@ -68,15 +70,16 @@ public class FabricConnectionListener extends AbstractConnectionListener {
// Get their profile from the net handler - it should have been initialised by now.
GameProfile profile = ((ServerLoginNetworkHandlerAccessor) netHandler).getGameProfile();
UUID uniqueId = PlayerEntity.getUuidFromProfile(profile);
String username = profile.getName();
// Register with the LoginSynchronizer that we want to perform a task before the login proceeds.
sync.waitFor(CompletableFuture.runAsync(() -> onPreLoginAsync(netHandler, profile), this.plugin.getBootstrap().getScheduler().async()));
sync.waitFor(CompletableFuture.runAsync(() -> onPreLoginAsync(netHandler, uniqueId, username), this.plugin.getBootstrap().getScheduler().async()));
}
private void onPreLoginAsync(ServerLoginNetworkHandler netHandler, GameProfile e) {
private void onPreLoginAsync(ServerLoginNetworkHandler netHandler, UUID uniqueId, String username) {
if (this.plugin.getConfiguration().get(ConfigKeys.DEBUG_LOGINS)) {
this.plugin.getLogger().info("Processing pre-login for " + e.getId() + " - " + e.getName());
this.plugin.getLogger().info("Processing pre-login for " + uniqueId + " - " + username);
}
/* Actually process the login for the connection.
@ -89,16 +92,16 @@ public class FabricConnectionListener extends AbstractConnectionListener {
- creating a user instance in the UserManager for this connection.
- setting up cached data. */
try {
User user = loadUser(e.getId(), e.getName());
recordConnection(e.getId());
this.plugin.getEventDispatcher().dispatchPlayerLoginProcess(e.getId(), e.getName(), user);
User user = loadUser(uniqueId, username);
recordConnection(uniqueId);
this.plugin.getEventDispatcher().dispatchPlayerLoginProcess(uniqueId, username, user);
} catch (Exception ex) {
this.plugin.getLogger().severe("Exception occurred whilst loading data for " + e.getId() + " - " + e.getName(), ex);
this.plugin.getLogger().severe("Exception occurred whilst loading data for " + uniqueId + " - " + username, ex);
// deny the connection
Component reason = TranslationManager.render(Message.LOADING_DATABASE_ERROR.build());
netHandler.disconnect(FabricSenderFactory.toNativeText(reason));
this.plugin.getEventDispatcher().dispatchPlayerLoginProcess(e.getId(), e.getName(), null);
this.plugin.getEventDispatcher().dispatchPlayerLoginProcess(uniqueId, username, null);
}
}