EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 05:06:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix NPE for Alchemy Fixes #5080 Fixes #5073

Browse Source
This commit is contained in:
nossr50 2024-09-14 15:19:13 -07:00
parent 9b046bd490
commit bac16238ac
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java
View File

@ -152,11 +152,16 @@ public class AlchemyBrewTask extends CancellableRunnable {
private void finish() {
final McMMOPlayerBrewEvent event = new McMMOPlayerBrewEvent(mmoPlayer, brewingStand);
mcMMO.p.getServer().getPluginManager().callEvent(event);
if (mmoPlayer == null) {
// Still need to finish brewing if the player is null
AlchemyPotionBrewer.finishBrewing(brewingStand, null, false);
} else {
final McMMOPlayerBrewEvent event = new McMMOPlayerBrewEvent(mmoPlayer, brewingStand);
mcMMO.p.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
AlchemyPotionBrewer.finishBrewing(brewingStand, mmoPlayer, false);
if (!event.isCancelled()) {
AlchemyPotionBrewer.finishBrewing(brewingStand, mmoPlayer, false);
}
}
Alchemy.brewingStandMap.remove(brewingStand.getLocation());