summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorMikeMatrix <m.braun92@gmail.com>2013-01-11 02:07:38 +0100
committerfeildmaster <admin@feildmaster.com>2013-01-15 05:05:20 -0600
commitcdba964122a9ad6238f549b38a438cb3722495ae (patch)
tree1b474f79ff411fbe28a4cef65ff8d497ed1d45bc /src/main/java/org
parenta809f5bf0e42617900d94061163e0ff4196027ce (diff)
downloadbukkit-cdba964122a9ad6238f549b38a438cb3722495ae.tar
bukkit-cdba964122a9ad6238f549b38a438cb3722495ae.tar.gz
bukkit-cdba964122a9ad6238f549b38a438cb3722495ae.tar.lz
bukkit-cdba964122a9ad6238f549b38a438cb3722495ae.tar.xz
bukkit-cdba964122a9ad6238f549b38a438cb3722495ae.zip
Added negative id check to Material.getMaterial(int). Fixes BUKKIT-3414
Negative id values would try to access the array out of bounds and throw an java.lang.ArrayIndexOutOfBoundsException.
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/Material.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 1a726104..7d26f61e 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -528,7 +528,7 @@ public enum Material {
* @return Material if found, or null
*/
public static Material getMaterial(final int id) {
- if (byId.length > id) {
+ if (byId.length > id && id >= 0) {
return byId[id];
} else {
return null;