mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-09 08:32:07 -07:00
Merge branch 'master' of https://github.com/Bukkit/Bukkit
Conflicts: src/main/java/org/bukkit/Player.java By: Tahg <tahgtahv@gmail.com>
This commit is contained in:
@@ -194,6 +194,10 @@ public enum Material {
|
||||
return id;
|
||||
}
|
||||
|
||||
public boolean isBlock() {
|
||||
return id < 256;
|
||||
}
|
||||
|
||||
public static Material getMaterial(final int id) {
|
||||
return lookupId.get(id);
|
||||
}
|
||||
@@ -201,7 +205,7 @@ public enum Material {
|
||||
public static Material getMaterial(final String name) {
|
||||
return lookupName.get(name);
|
||||
}
|
||||
|
||||
|
||||
static {
|
||||
for (Material material : values()) {
|
||||
lookupId.put(material.getID(), material);
|
||||
|
Reference in New Issue
Block a user