Fixed ConsumeGenerator 'kickstarting'
This commit is contained in:
@@ -54,6 +54,6 @@ public class ConsumeItemDynamic extends Consume{
|
||||
|
||||
@Override
|
||||
public boolean valid(Building build){
|
||||
return build.items != null && build.items.has(items.get(build));
|
||||
return build.consumeTriggerValid() || build.items.has(items.get(build));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,9 +53,11 @@ public class ConsumeItemFilter extends Consume{
|
||||
|
||||
@Override
|
||||
public boolean valid(Building build){
|
||||
if(build.consumeTriggerValid()) return true;
|
||||
|
||||
for(int i = 0; i < content.items().size; i++){
|
||||
Item item = content.item(i);
|
||||
if(build.items != null && build.items.has(item) && this.filter.get(item)){
|
||||
if(this.filter.get(item) && build.items.has(item)){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ public class ConsumeItems extends Consume{
|
||||
|
||||
@Override
|
||||
public boolean valid(Building build){
|
||||
return build.items != null && build.items.has(items);
|
||||
return build.consumeTriggerValid() || build.items.has(items);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user