EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixes an OfflinePlayerUtil breakage caused by NMS Changes

Browse Source
This commit is contained in:
MeFisto94 2020-08-06 13:56:58 +02:00
parent 01d2b0024f
commit 48d3c2105d
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java
View File

@ -97,6 +97,17 @@ public class OfflinePlayerUtil {
return callConstructor(c, worldServer); return callConstructor(c, worldServer);
} }
public static Object getWorldServer116() {
Object server = getMinecraftServer();
Class<?> minecraftServerClass = getNmsClass("MinecraftServer");
Class<?> dimensionManager = getNmsClass("DimensionManager");
Class<?> genericResourceKey = getNmsClass("ResourceKey");
Object overworld = getField(makeField(dimensionManager, "OVERWORLD"), null);
Method getWorldServer =
makeMethod(minecraftServerClass, "getWorldServer", genericResourceKey);
return callMethod(getWorldServer, server, overworld);
}
public static Object getWorldServerNew() { public static Object getWorldServerNew() {
Object server = getMinecraftServer(); Object server = getMinecraftServer();
Class<?> minecraftServerClass = getNmsClass("MinecraftServer"); Class<?> minecraftServerClass = getNmsClass("MinecraftServer");
@ -115,7 +126,11 @@ public class OfflinePlayerUtil {
try { try {
o = callMethod(getWorldServer, server, 0); o = callMethod(getWorldServer, server, 0);
} catch (final RuntimeException e) { } catch (final RuntimeException e) {
o = getWorldServerNew(); try {
o = getWorldServerNew();
} catch (final RuntimeException f) {
o = getWorldServer116();
}
} }
return o; return o;
} }