Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix loading profiles to solve 500 errors on login

Browse source 
This loads profiles from the server cache, which properly sets the uuid
(which again is used to check for bans in some other layers).

Backport of DynmapForge PR 77
This commit is contained in:
Wouter Haffmans 2018-10-19 22:28:59 +02:00
parent 75a0dcaf3b
commit 7cf5031a8c
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
View file

@ -43,6 +43,7 @@ import net.minecraft.network.NetworkManager;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.management.UserListBans; import net.minecraft.server.management.UserListBans;
import net.minecraft.server.management.UserListIPBans; import net.minecraft.server.management.UserListIPBans;
import net.minecraft.server.management.PlayerProfileCache;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundCategory;
import net.minecraft.util.SoundEvent; import net.minecraft.util.SoundEvent;
@ -486,6 +487,11 @@ public class DynmapPlugin
public ForgeServer() { public ForgeServer() {
} }
private GameProfile getProfileByName(String player) {
PlayerProfileCache cache = server.getPlayerProfileCache();
return cache.getGameProfileForUsername(player);
}
@Override @Override
public int getBlockIDAt(String wname, int x, int y, int z) { public int getBlockIDAt(String wname, int x, int y, int z) {
@ -601,7 +607,7 @@ public class DynmapPlugin
public boolean isPlayerBanned(String pid) public boolean isPlayerBanned(String pid)
{ {
UserListBans bl = server.getPlayerList().getBannedPlayers(); UserListBans bl = server.getPlayerList().getBannedPlayers();
return bl.isBanned(new GameProfile(null, pid)); return bl.isBanned(getProfileByName(pid));
} }
@Override @Override
@ -765,7 +771,7 @@ public class DynmapPlugin
if (scm == null) return Collections.emptySet(); if (scm == null) return Collections.emptySet();
UserListBans bl = scm.getBannedPlayers(); UserListBans bl = scm.getBannedPlayers();
if (bl == null) return Collections.emptySet(); if (bl == null) return Collections.emptySet();
if(bl.isBanned(new GameProfile(null, player))) { if(bl.isBanned(getProfileByName(player))) {
return Collections.emptySet(); return Collections.emptySet();
} }
Set<String> rslt = hasOfflinePermissions(player, perms); Set<String> rslt = hasOfflinePermissions(player, perms);
@ -784,7 +790,7 @@ public class DynmapPlugin
if (scm == null) return false; if (scm == null) return false;
UserListBans bl = scm.getBannedPlayers(); UserListBans bl = scm.getBannedPlayers();
if (bl == null) return false; if (bl == null) return false;
if(bl.isBanned(new GameProfile(null, player))) { if(bl.isBanned(getProfileByName(player))) {
return false; return false;
} }
return hasOfflinePermission(player, perm); return hasOfflinePermission(player, perm);