SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix 1.12 again

Browse Source
This commit is contained in:
libraryaddict 2021-02-03 23:06:32 +13:00
parent 6922bcd9e8
commit 44f90e51ee
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
View File

@ -107,6 +107,7 @@ public class ReflectionManager {
private static Field boardField; private static Field boardField;
public static Object scoreboardCrtieriaHealth; public static Object scoreboardCrtieriaHealth;
private static Method getObjectives; private static Method getObjectives;
private static Method getPlayerScoreObjective;
private static Method setScore; private static Method setScore;
public static void init() { public static void init() {
@ -189,7 +190,8 @@ public class ReflectionManager {
setScore = getNmsMethod("ScoreboardScore", "setScore", int.class); setScore = getNmsMethod("ScoreboardScore", "setScore", int.class);
if (!NmsVersion.v1_13.isSupported()) { if (!NmsVersion.v1_13.isSupported()) {
getObjectives = getNmsMethod("Scoreboard", "getScoreboardScores", getNmsClass("IScoreboardCriteria"), String.class, ArrayList.class); getObjectives = getNmsMethod("Scoreboard", "getObjectivesForCriteria", getNmsClass("IScoreboardCriteria"));
getPlayerScoreObjective = getNmsMethod("Scoreboard", "getObjectivesForCriteria", String.class, getNmsClass("IScoreboardCriteria"));
} else { } else {
getObjectives = getNmsMethod("Scoreboard", "getObjectivesForCriteria", getNmsClass("IScoreboardCriteria"), String.class, Consumer.class); getObjectives = getNmsMethod("Scoreboard", "getObjectivesForCriteria", getNmsClass("IScoreboardCriteria"), String.class, Consumer.class);
} }
@ -1937,9 +1939,9 @@ public class ReflectionManager {
Object board = boardField.get(scoreboard); Object board = boardField.get(scoreboard);
if (!NmsVersion.v1_13.isSupported()) { if (!NmsVersion.v1_13.isSupported()) {
Collection scores = (Collection) getObjectives.invoke(board, criteria, name, new ArrayList<>()); Collection scores = (Collection) getObjectives.invoke(board, criteria);
for (Object obj : scores) { for (Object obj : (Collection) getPlayerScoreObjective.invoke(board, name, criteria)) {
setScore.invoke(obj, score); setScore.invoke(obj, score);
} }