Merge 2.1.50

This commit is contained in:
nossr50
2019-04-28 05:46:49 -07:00
11 changed files with 126 additions and 77 deletions

View File

@ -174,9 +174,7 @@ public class HerbalismManager extends SkillManager {
}
public boolean isOneBlockPlant(Material material) {
return !(material == Material.CACTUS || material == Material.CHORUS_PLANT
|| material == Material.SUGAR_CANE || material == Material.KELP_PLANT || material == Material.KELP
|| material == Material.TALL_SEAGRASS || material == Material.TALL_GRASS);
return !mcMMO.getMaterialMapStore().isMultiBlock(material);
}
/**