Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions 1

New materials don't even have an ID anymore

Browse source 
Handle that case as well.

Honestly the best solution would be to just get rid of getBlockIDAt as it's only used in two places where it could be trivially replaced
This commit is contained in:
BrainStone 2021-07-18 03:27:59 +02:00
parent 1ef296d0b8
commit b72b8a52c2
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
View file

@ -183,12 +183,17 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
} catch (NoSuchMethodError e) { } catch (NoSuchMethodError e) {
// We failed once, no need to retry // We failed once, no need to retry
tryNativeId.set(false); tryNativeId.set(false);
} catch (java.lang.IllegalArgumentException e) {
// Ignore this entirely, as modern materials throw
// java.lang.IllegalArgumentException: Cannot get ID of Modern Material
} }
} }
// We're living in a world where numerical IDs have been phased out completely. // We're living in a world where numerical IDs have been phased out completely.
// Let's return *some* number, because we need one // Let's return *some* number, because we need one.
return material.ordinal(); // Also in that case we are adding a constant to ensure we're not conflicting with the
// actual IDs
return material.ordinal() + (1 << 20);
} }
private static final int getBlockIdFromBlock(Block block) { private static final int getBlockIdFromBlock(Block block) {
return getBlockIdFromMaterial(block.getType()); return getBlockIdFromMaterial(block.getType());