Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-06-13 13:04:03 +00:00
Code Issues Projects Releases Wiki Activity

fix everything

Browse Source
This commit is contained in:
dengr1065 2020-08-16 17:09:25 +03:00
parent 55ad849b83
commit 9af135b5ce
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/js/game/component_registry.js
View File

@ -15,11 +15,8 @@ import { ConstantSignalComponent } from "./components/constant_signal";
import { LogicGateComponent } from "./components/logic_gate";
import { LeverComponent } from "./components/lever";
import { WireTunnelComponent } from "./components/wire_tunnel";
<<<<<<< HEAD
import { ProcessingRequirementComponent } from "./components/processing_requirement";
=======
import { DisplayComponent } from "./components/display";
>>>>>>> upstream/master
export function initComponentRegistry() {
gComponentRegistry.register(StaticMapEntityComponent);

4
src/js/game/systems/item_processor.js
View File

@ -1,5 +1,5 @@
import { globalConfig } from "../../core/config";
import { BaseItem, enumItemType } from "../base_item";
import { BaseItem } from "../base_item";
import { enumColorMixingResults } from "../colors";
import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor";
import { Entity } from "../entity";
@ -345,7 +345,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
for (let i = 0; i < 4; ++i) {
if (colorItems[i] == null) {
skipped[i] = false; // make sure we never insert null item back
} else if (pinValues[i].getItemType() == enumItemType.color) {
} else if (pinValues[i] instanceof ColorItem) {
// if pin value is a color, skip anything except that color
// but still require any color, because it would not work on
// slow factories.