mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of https://github.com/Bukkit/Bukkit

Browse source 
Conflicts:
	src/main/java/org/bukkit/Player.java

By: Tahg <tahgtahv@gmail.com>
This commit is contained in:
Bukkit/Spigot 2011-01-10 17:27:51 -05:00
commit 0e16bbed64
49 changed files with 1576 additions and 401 deletions
Download patch file Download diff file Expand all files Collapse all files

6
paper-api/src/main/java/org/bukkit/Material.java
View file

@ -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);