zhdev/bukman
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Merge pull request #49 from FrankHeijden/fix/1.18-recipies-cleanup

Browse source 
Fix recipy cleanup on 1.18
This commit is contained in:
Frank van der Heijden 2022-04-21 18:52:09 +02:00 • committed by GitHub
commit 1029dfb4f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/reflection/RCraftingManager.java
View file

@ -52,6 +52,11 @@ public class RCraftingManager {
Collection<Map> list = (Collection<Map>) recipes.values(); Collection<Map> list = (Collection<Map>) recipes.values();
list.forEach(map -> MapUtils.removeKeys(map, predicate)); list.forEach(map -> MapUtils.removeKeys(map, predicate));
} }
if (MinecraftReflectionVersion.MINOR >= 18) {
Map byName = reflection.get(craftingManager, "d");
MapUtils.removeKeys(byName, predicate);
}
} }
} }
} }

2
Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/reflection/RMinecraftKey.java
View file

@ -36,7 +36,7 @@ public class RMinecraftKey {
} else if (MinecraftReflectionVersion.MINOR == 17) { } else if (MinecraftReflectionVersion.MINOR == 17) {
return reflection.invoke(instance, "getNamespace"); return reflection.invoke(instance, "getNamespace");
} else if (MinecraftReflectionVersion.MINOR >= 18) { } else if (MinecraftReflectionVersion.MINOR >= 18) {
return reflection.invoke(instance, "a"); return reflection.invoke(instance, "b");
} }
return reflection.get(instance, "namespace"); return reflection.get(instance, "namespace");
} }