Merge branch 'master' of github.com:ProgrammingAtDawn/mcMMO

This commit is contained in:
Glitchfinder 2018-05-11 10:04:14 -07:00
commit e98d241452

View File

@ -148,10 +148,6 @@ public class HerbalismManager extends SkillManager {
} }
} }
else { else {
if (Permissions.greenThumbPlant(player, material)) {
processGreenThumbPlants(blockState, greenTerra);
}
if(material == Material.CHORUS_FLOWER && blockState.getRawData() != 5) { if(material == Material.CHORUS_FLOWER && blockState.getRawData() != 5) {
return; return;
} }
@ -165,6 +161,10 @@ public class HerbalismManager extends SkillManager {
amount = Herbalism.calculateMultiBlockPlantDrops(blockState); amount = Herbalism.calculateMultiBlockPlantDrops(blockState);
xp *= amount; xp *= amount;
} }
if (Permissions.greenThumbPlant(player, material)) {
processGreenThumbPlants(blockState, greenTerra);
}
} }
applyXpGain(xp, XPGainReason.PVE); applyXpGain(xp, XPGainReason.PVE);