From 4aa1309797dc20183f8c20eeb8ecd0fffc5e7776 Mon Sep 17 00:00:00 2001
From: Dennis Postma <dennis@directonline.io>
Date: Sun, 27 Oct 2024 18:50:13 +0100
Subject: [PATCH] Small cleanup

---
 src/components/zone/Zone.vue      | 11 ++---------
 src/components/zone/ZoneTiles.vue |  2 +-
 src/composables/zoneComposable.ts |  9 +++++++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/components/zone/Zone.vue b/src/components/zone/Zone.vue
index 317c279..2527f4d 100644
--- a/src/components/zone/Zone.vue
+++ b/src/components/zone/Zone.vue
@@ -13,8 +13,7 @@ import type { Character as CharacterT, Zone as ZoneT, ExtendedCharacter as Exten
 import ZoneTiles from '@/components/zone/ZoneTiles.vue'
 import ZoneObjects from '@/components/zone/ZoneObjects.vue'
 import Characters from '@/components/zone/Characters.vue'
-import { unduplicateArray } from '@/utilities'
-import { FlattenZoneArray, loadZoneTileTexture } from '@/composables/zoneComposable'
+import { loadZoneTiles } from '@/composables/zoneComposable'
 
 const scene = useScene()
 const gameStore = useGameStore()
@@ -37,6 +36,7 @@ gameStore.connection!.on('zone:character:teleport', async (data: zoneLoadData) =
     zoneId: data.zone.id
   })
 
+  await loadZoneTiles(response.zone, scene)
   zoneStore.setZone(data.zone)
   zoneStore.setCharacters(data.characters)
 })
@@ -55,13 +55,6 @@ gameStore.connection!.on('character:move', (data: ExtendedCharacterT) => {
   zoneStore.updateCharacter(data)
 })
 
-async function loadZoneTiles(zone: ZoneT, scene: Phaser.Scene) {
-  const tileArray = unduplicateArray(FlattenZoneArray(zone.tiles))
-  for (const tile of tileArray) {
-    await loadZoneTileTexture(scene, tile, new Date())
-  }
-}
-
 onMounted(async () => {
   // Emit zone:character:join event to server and wait for response, then set zone and characters
   gameStore!.connection!.emit('zone:character:join', async (response: zoneLoadData) => {
diff --git a/src/components/zone/ZoneTiles.vue b/src/components/zone/ZoneTiles.vue
index ff64a7b..c3f4070 100644
--- a/src/components/zone/ZoneTiles.vue
+++ b/src/components/zone/ZoneTiles.vue
@@ -7,7 +7,7 @@ import config from '@/config'
 import { useScene } from 'phavuer'
 import { useZoneStore } from '@/stores/zoneStore'
 import { onBeforeUnmount } from 'vue'
-import { setLayerTiles, loadZoneTileTexture } from '@/composables/zoneComposable'
+import { setLayerTiles } from '@/composables/zoneComposable'
 import Controls from '@/components/utilities/Controls.vue'
 
 const emit = defineEmits(['tilemap:create'])
diff --git a/src/composables/zoneComposable.ts b/src/composables/zoneComposable.ts
index dd51ec6..3b5c651 100644
--- a/src/composables/zoneComposable.ts
+++ b/src/composables/zoneComposable.ts
@@ -4,6 +4,8 @@ import TilemapLayer = Phaser.Tilemaps.TilemapLayer
 import Tileset = Phaser.Tilemaps.Tileset
 import Tile = Phaser.Tilemaps.Tile
 import { useAssetManager } from '@/managers/assetManager'
+import type { Zone as ZoneT } from '@/types'
+import { unduplicateArray } from '@/utilities'
 
 export function getTile(layer: TilemapLayer | Tilemap, x: number, y: number): Tile | undefined {
   const tile = layer.getTileAtWorldXY(x, y)
@@ -83,6 +85,13 @@ export function FlattenZoneArray(tiles: string[][]) {
   return normalArray
 }
 
+export async function loadZoneTiles(zone: ZoneT, scene: Phaser.Scene) {
+  const tileArray = unduplicateArray(FlattenZoneArray(zone.tiles))
+  for (const tile of tileArray) {
+    await loadZoneTileTexture(scene, tile, new Date())
+  }
+}
+
 export async function loadZoneTileTexture(scene: Phaser.Scene, textureId: string, updatedAt: Date): Promise<boolean> {
   const assetManager = useAssetManager