Fix a NPE with getFlowerAndGrassXp()

Fixes #1975
This commit is contained in:
TfT_02
2014-06-23 21:04:45 +02:00
parent 0de1187012
commit 4b20f12eff
2 changed files with 8 additions and 1 deletions

View File

@ -3,6 +3,7 @@ package com.gmail.nossr50.config.experience;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.GrassSpecies;
import org.bukkit.Material;
import org.bukkit.TreeSpecies;
import org.bukkit.entity.EntityType;
@ -267,7 +268,12 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
}
else if (type == Material.LONG_GRASS) {
switch (((LongGrass) data).getSpecies()) {
GrassSpecies species = ((LongGrass) data).getSpecies();
if (species == null) {
return 0;
}
switch (species) {
case DEAD:
return config.getInt("Experience.Herbalism.Dead_Bush", 30);