mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-22 08:13:12 +09:00
Fix subspace_storage IpcItems type and UpdateStorageEvent.type (#516)
This commit is contained in:
1 parent
e2dea35e02
commit
d73f26c83f
2 files changed
+4
-4
No files matched your search
@@ -8,7 +8,7 @@ import {
|
|||||||
Item,
|
Item,
|
||||||
} from "./messages";
|
} from "./messages";
|
||||||
|
|
||||||
type IpcItems = { name: string, count: number }[];
|
type IpcItems = [string, number][];
|
||||||
|
|
||||||
export class InstancePlugin extends lib.BaseInstancePlugin {
|
export class InstancePlugin extends lib.BaseInstancePlugin {
|
||||||
pendingTasks!: Set<any>;
|
pendingTasks!: Set<any>;
|
||||||
@@ -73,7 +73,7 @@ export class InstancePlugin extends lib.BaseInstancePlugin {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const fromIpcItems = items.map(item => new Item(item.name, item.count))
|
const fromIpcItems = items.map(item => new Item(item[0], item[1]))
|
||||||
this.instance.sendTo("controller", new PlaceEvent(fromIpcItems));
|
this.instance.sendTo("controller", new PlaceEvent(fromIpcItems));
|
||||||
|
|
||||||
if (this.instance.config.get("subspace_storage.log_item_transfers")) {
|
if (this.instance.config.get("subspace_storage.log_item_transfers")) {
|
||||||
@@ -85,7 +85,7 @@ export class InstancePlugin extends lib.BaseInstancePlugin {
|
|||||||
// request items --------------------------------------------------------------
|
// request items --------------------------------------------------------------
|
||||||
async requestItems(requestItems: IpcItems) {
|
async requestItems(requestItems: IpcItems) {
|
||||||
// Request the items all at once
|
// Request the items all at once
|
||||||
let fromIpcItems = requestItems.map(item => new Item(item.name, item.count))
|
let fromIpcItems = requestItems.map(item => new Item(item[0], item[1]))
|
||||||
let items = await this.instance.sendTo("controller", new RemoveRequest(fromIpcItems));
|
let items = await this.instance.sendTo("controller", new RemoveRequest(fromIpcItems));
|
||||||
|
|
||||||
if (!items.length) {
|
if (!items.length) {
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ export class GetStorageRequest {
|
|||||||
|
|
||||||
export class UpdateStorageEvent {
|
export class UpdateStorageEvent {
|
||||||
declare ["constructor"]: typeof UpdateStorageEvent;
|
declare ["constructor"]: typeof UpdateStorageEvent;
|
||||||
static type = "request" as const;
|
static type = "event" as const;
|
||||||
static src = "controller" as const;
|
static src = "controller" as const;
|
||||||
static dst = ["instance", "control"] as const;
|
static dst = ["instance", "control"] as const;
|
||||||
static plugin = "subspace_storage" as const;
|
static plugin = "subspace_storage" as const;
|
||||||
|
|||||||
Reference in new issue
Block a user