AncTe/template
1
0
Fork 0
mirror of https://github.com/motajs/template.git synced 2026-09-12 17:58:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: getLocationData logic

Browse Source
This commit is contained in:
unanmed 2026-09-09 19:42:37 +08:00
parent e27015c4d2
commit 7dd4f39e7e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages-user/data-base/src/map/eventPath.test.ts
View File

@ -77,7 +77,7 @@ describe('MapState raw event path', () => {
expect(layer?.event(1, 0)?.ref()).toEqual(
new Map([[5, 'point-event']])
);
expect(layer?.getLocationData(1, 0)?.static.tileEvent().get()).toEqual(
expect(layer?.getLocationData(1, 0)?.static?.tileEvent().get()).toEqual(
new Map()
);
expect(layer?.event(1, 0)?.dirty()).toBe(false);

10
packages-user/data-base/src/map/mapLayer.ts
View File

@ -263,9 +263,9 @@ export class MapLayer
}
getLocationData(x: number, y: number): ILayerLocation | null {
if (!this.inMap(x, y)) return null;
const staticTile = this.getTile(x, y);
if (!staticTile) return null;
const num = staticTile.num();
const num = staticTile?.num() ?? -1;
const dynamics = this.getDynamicTilesAt(x, y);
return {
locator: { x, y },
@ -406,7 +406,7 @@ export class MapLayer
createDynamic(num: number, x: number, y: number): IDynamicTile {
const tile = new DynamicTile(num, x, y, this);
const location = this.getLocationData(x, y);
if (location) {
if (location?.static) {
const tileEvent = tile.tileEvent();
const staticEvent = location.static.tileEvent();
tileEvent.clear();
@ -679,7 +679,7 @@ export class MapLayer
const blocks = new Map<number, IStaticBlockSave>();
for (const location of this.iterateBlocks()) {
const tile = location.static;
if (!tile.shouldSave()) continue;
if (!tile || !tile.shouldSave()) continue;
const index = this.map.indexer.locaterToIndex(location.locator);
blocks.set(index, tile.saveState(SaveCompression.NoCompression));
}
@ -817,7 +817,7 @@ export class MapLayer
for (const [index, tileSave] of save) {
const { x, y } = this.map.indexer.indexToLocator(index);
const location = this.getLocationData(x, y);
if (!location) continue;
if (!location?.static) continue;
location.static.loadState(tileSave, SaveCompression.NoCompression);
}
}

2
packages-user/data-base/src/map/types.ts
View File

@ -254,7 +254,7 @@ export interface ILayerLocation {
/** 该点包含的所有动态图块 */
readonly dynamics: Iterable<IDynamicTile>;
/** 该点的静态图块原始数据 */
readonly static: IStaticTile;
readonly static: IStaticTile | null;
}
export interface IMapLayerHooks extends IHookBase {