Sweet berry bush exploit fix

This commit is contained in:
nossr50 2021-03-29 16:09:47 -07:00
parent 50eadb2e8d
commit ae538d8c72
2 changed files with 23 additions and 20 deletions

View File

@ -2,6 +2,7 @@ Version 2.1.183
Updated Russian locale (thanks ImDaniX) Updated Russian locale (thanks ImDaniX)
Added Donkeys to beat lore (thanks QuantumToasted) Added Donkeys to beat lore (thanks QuantumToasted)
Alchemy guide now correctly labels Rabbit's foot for potion of leaping (thanks mldriscoll) Alchemy guide now correctly labels Rabbit's foot for potion of leaping (thanks mldriscoll)
Fixed a bug where sweet berry bushes would give XP in situations where they shouldn't
Version 2.1.182 Version 2.1.182
Players now receive XP from harvesting Sweet Berry bushes (double XP for harvesting fully grown berries) Players now receive XP from harvesting Sweet Berry bushes (double XP for harvesting fully grown berries)

View File

@ -825,6 +825,7 @@ public class PlayerListener implements Listener {
} }
FakePlayerAnimationEvent fakeSwing = new FakePlayerAnimationEvent(event.getPlayer()); //PlayerAnimationEvent compat FakePlayerAnimationEvent fakeSwing = new FakePlayerAnimationEvent(event.getPlayer()); //PlayerAnimationEvent compat
if(!event.isCancelled() || event.useInteractedBlock() != Event.Result.DENY) {
if (herbalismManager.canGreenThumbBlock(blockState)) { if (herbalismManager.canGreenThumbBlock(blockState)) {
//call event for Green Thumb Block //call event for Green Thumb Block
if(!EventUtils.callSubSkillBlockEvent(player, SubSkillType.HERBALISM_GREEN_THUMB, block).isCancelled()) { if(!EventUtils.callSubSkillBlockEvent(player, SubSkillType.HERBALISM_GREEN_THUMB, block).isCancelled()) {
@ -849,6 +850,7 @@ public class PlayerListener implements Listener {
} else { } else {
herbalismManager.processBerryBushHarvesting(blockState); herbalismManager.processBerryBushHarvesting(blockState);
} }
}
break; break;
case RIGHT_CLICK_AIR: case RIGHT_CLICK_AIR: