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

Fix scores for 1.12

Browse Source
This commit is contained in:
libraryaddict 2021-01-28 18:20:26 +13:00
parent 4c7ba6a9ad
commit 6c2cd6ac7a
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,11 +184,16 @@ public class ReflectionManager {
noDamageTicks = getNmsField("Entity", "noDamageTicks"); noDamageTicks = getNmsField("Entity", "noDamageTicks");
isInvul = getNmsMethod("Entity", "isInvulnerable", getNmsClass("DamageSource")); isInvul = getNmsMethod("Entity", "isInvulnerable", getNmsClass("DamageSource"));
genericDamage = getNmsField("DamageSource", "GENERIC").get(null); genericDamage = getNmsField("DamageSource", "GENERIC").get(null);
boardField = getCraftClass("scoreboard.CraftScoreboard").getDeclaredField("board"); boardField = getCraftClass("scoreboard.CraftScoreboard").getDeclaredField("board");
boardField.setAccessible(true); boardField.setAccessible(true);
scoreboardCrtieriaHealth = getNmsField("IScoreboardCriteria", "HEALTH").get(null); scoreboardCrtieriaHealth = getNmsField("IScoreboardCriteria", "HEALTH").get(null);
setScore = getNmsMethod("ScoreboardScore", "setScore", int.class); setScore = getNmsMethod("ScoreboardScore", "setScore", int.class);
getObjectives = getNmsMethod("Scoreboard", "getObjectivesForCriteria", getNmsClass("IScoreboardCriteria"), String.class, Consumer.class);
if (!NmsVersion.v1_13.isSupported()) {
getObjectives = getNmsMethod("Scoreboard", "getScoreboardScores", getNmsClass("IScoreboardCriteria"), String.class, ArrayList.class);
} else {
getObjectives = getNmsMethod("Scoreboard", "getObjectivesForCriteria", getNmsClass("IScoreboardCriteria"), String.class, Consumer.class);
}
Method method = getNmsMethod("SoundCategory", "a"); Method method = getNmsMethod("SoundCategory", "a");
@ -1932,6 +1937,16 @@ public class ReflectionManager {
try { try {
Object board = boardField.get(scoreboard); Object board = boardField.get(scoreboard);
if (!NmsVersion.v1_13.isSupported()) {
Collection scores = (Collection) getObjectives.invoke(board, criteria, name, new ArrayList<>());
for (Object obj : scores) {
setScore.invoke(obj, score);
}
return;
}
Consumer con = o -> { Consumer con = o -> {
try { try {
setScore.invoke(o, score); setScore.invoke(o, score);