From 8c3c9a6fde08af05754c90ef439c2407ef50bd7e Mon Sep 17 00:00:00 2001 From: Pahimar Date: Fri, 3 Jun 2016 19:45:18 -0400 Subject: [PATCH] Fix logic derp in isLearnable/isExchangeable that was causing everything to be broken and on fire. Closes #1067 (cherry picked from commit 63ac5b0819c15d372eeb7082a2935a001d01c494) --- .../java/com/pahimar/ee3/blacklist/BlacklistRegistry.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/pahimar/ee3/blacklist/BlacklistRegistry.java b/src/main/java/com/pahimar/ee3/blacklist/BlacklistRegistry.java index 20bd334c..3dc7001d 100644 --- a/src/main/java/com/pahimar/ee3/blacklist/BlacklistRegistry.java +++ b/src/main/java/com/pahimar/ee3/blacklist/BlacklistRegistry.java @@ -85,6 +85,7 @@ public class BlacklistRegistry { } else { if (EnergyValueRegistryProxy.hasEnergyValue(wrappedObject)) { + if (knowledgeBlacklist.contains(wrappedObject)) { return false; } @@ -96,6 +97,8 @@ public class BlacklistRegistry { } } } + + return true; } } } @@ -116,6 +119,7 @@ public class BlacklistRegistry { WrappedStack wrappedObject = WrappedStack.wrap(object, 1); if (EnergyValueRegistryProxy.hasEnergyValue(wrappedObject)) { + if (exchangeBlacklist.contains(wrappedObject)) { return false; } @@ -127,6 +131,8 @@ public class BlacklistRegistry { } } } + + return true; } }