mirror of
https://github.com/HarbourMasters/Shipwright
synced 2026-10-14 07:43:40 -04:00
fix preplanted beans without souls being seen as planted on the tracker (#7251)
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
#include "logic.h"
|
||||
#include "bean_patches.h"
|
||||
#include "../debugger/performanceTimer.h"
|
||||
#include "soh/Enhancements/randomizer/randomizerEnums.h"
|
||||
#include "soh/OTRGlobals.h"
|
||||
#include "randomizer.h"
|
||||
#include "randomizerEnumStrings.h"
|
||||
@@ -1334,6 +1335,12 @@ bool Logic::BeanPlanted(LogicVal beanEvent) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// if we don't have the bean soul, the bean isn't really planted.
|
||||
if (!HasItem(static_cast<RandomizerGet>(beanEvent - LOGIC_PLANT_DEATH_MOUNTAIN_CRATER_BEAN +
|
||||
RG_DEATH_MOUNTAIN_CRATER_BEAN_SOUL))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const BeanPatch* patch = FindBeanPatch(beanEvent);
|
||||
if (patch == nullptr) {
|
||||
assert(false);
|
||||
|
||||
Reference in New Issue
Block a user