TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-10-02 06:44:39 +00:00
Code Issues Projects Releases Wiki Activity

Wrap UnsafeValues.fromLegacy() in try/catch for older versions

Browse source 
Should address #2352.
This commit is contained in:
md678685 2019-01-05 15:26:48 +00:00
parent 1388755d2a
commit fd01b75c33
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Essentials/src/com/earth2me/essentials/utils/MaterialUtil.java
View file

@ -103,11 +103,16 @@ public class MaterialUtil {
} }
public static Material convertFromLegacy(int id, byte damage) { public static Material convertFromLegacy(int id, byte damage) {
return EnumSet.allOf(Material.class).stream() for (Material material : EnumSet.allOf(Material.class)) {
.filter(material -> material.getId() == id) if (material.getId() == id) {
.findFirst() try {
.map(material -> Bukkit.getUnsafe().fromLegacy(new MaterialData(material, damage))) return Bukkit.getUnsafe().fromLegacy(new MaterialData(material, damage));
.orElse(null); } catch (NoSuchMethodError error) {
return material;
}
}
}
return null;
} }
public static DyeColor getColorOf(Material material) { public static DyeColor getColorOf(Material material) {