mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-22 21:26:46 +01:00
Merge branch 'master' of github.com:ProgrammingAtDawn/mcMMO
This commit is contained in:
commit
e98d241452
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user