Skip to content

Commit b349517

Browse files
authored
Fix Spigot 1.21.10+ ReflServerStateProvider (EssentialsX#6377)
1 parent 000e6c5 commit b349517

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/ReflUtil.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ public final class ReflUtil {
2323
public static final NMSVersion V1_19_R1 = NMSVersion.fromString("v1_19_R1");
2424
public static final NMSVersion V1_19_R2 = NMSVersion.fromString("v1_19_R2");
2525
public static final NMSVersion V1_20_R4 = NMSVersion.fromString("v1_20_R4");
26+
public static final NMSVersion V1_21_R6 = NMSVersion.fromString("v1_21_R6");
27+
public static final NMSVersion V1_21_R7 = NMSVersion.fromString("v1_21_R7");
2628
private static final Map<String, Class<?>> classCache = new HashMap<>();
2729
private static final Table<Class<?>, String, Method> methodCache = HashBasedTable.create();
2830
private static final Table<Class<?>, MethodParams, Method> methodParamCache = HashBasedTable.create();

providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflServerStateProvider.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ public ReflServerStateProvider() {
1818
MethodHandle isRunning = null;
1919

2020
final String MDFIVEMAGICLETTER;
21-
if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_20_R4)) {
21+
if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_21_R7)) {
22+
MDFIVEMAGICLETTER = "z";
23+
} else if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_21_R6)) {
24+
MDFIVEMAGICLETTER = "B";
25+
} else if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_20_R4)) {
2226
MDFIVEMAGICLETTER = "x";
2327
} else if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_19_R2)) {
2428
MDFIVEMAGICLETTER = "v";

0 commit comments

Comments
 (0)