Fix logic derp in isLearnable/isExchangeable that was causing everything to be broken and on fire. Closes #1067
(cherry picked from commit 63ac5b0819c15d372eeb7082a2935a001d01c494)
This commit is contained in:
parent
39a3c8eef8
commit
8c3c9a6fde
|
@ -85,6 +85,7 @@ public class BlacklistRegistry {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (EnergyValueRegistryProxy.hasEnergyValue(wrappedObject)) {
|
if (EnergyValueRegistryProxy.hasEnergyValue(wrappedObject)) {
|
||||||
|
|
||||||
if (knowledgeBlacklist.contains(wrappedObject)) {
|
if (knowledgeBlacklist.contains(wrappedObject)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -96,6 +97,8 @@ public class BlacklistRegistry {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -116,6 +119,7 @@ public class BlacklistRegistry {
|
||||||
WrappedStack wrappedObject = WrappedStack.wrap(object, 1);
|
WrappedStack wrappedObject = WrappedStack.wrap(object, 1);
|
||||||
|
|
||||||
if (EnergyValueRegistryProxy.hasEnergyValue(wrappedObject)) {
|
if (EnergyValueRegistryProxy.hasEnergyValue(wrappedObject)) {
|
||||||
|
|
||||||
if (exchangeBlacklist.contains(wrappedObject)) {
|
if (exchangeBlacklist.contains(wrappedObject)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -127,6 +131,8 @@ public class BlacklistRegistry {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue