@hytopia.com/examples 1.0.18 → 1.0.19

package/frontiers-rpg-game/src/GameManager.ts

@@ -77,7 +77,7 @@ export default class GameManager {
   }
 
   private _selectWorldForPlayer = async (player: Player): Promise<World | undefined> => {
-    const gamePlayer = await GamePlayer.getOrCreate(player);
+    const gamePlayer = GamePlayer.getOrCreate(player);
     return gamePlayer.currentRegion?.world ?? this._startRegion.world;
   }
 }

package/frontiers-rpg-game/src/GamePlayer.ts

@@ -88,13 +88,15 @@ export default class GamePlayer {
     this.hotbar.onSelectedItemChanged = this._onHotbarSelectedItemChanged;
   }
 
-  public static async getOrCreate(player: Player): Promise<GamePlayer> {
+  public static getOrCreate(player: Player): GamePlayer {
     let gamePlayer = this._instances.get(player.id);
+    
     if (!gamePlayer) {
       gamePlayer = new GamePlayer(player);
-      await gamePlayer.load();
+      gamePlayer.load();
       this._instances.set(player.id, gamePlayer);
     }
+
     return gamePlayer;
   }
 
@@ -342,8 +344,8 @@ export default class GamePlayer {
     this.player.joinWorld(region.world);
   }
 
-  public async load(): Promise<void> {
-    const serializedGamePlayerData = await this.player.getPersistedData();
+  public load(): void {
+    const serializedGamePlayerData = this.player.getPersistedData();
 
     if (serializedGamePlayerData) { // Existing player, load their state
       this._loadFromSerializedData(serializedGamePlayerData as SerializedGamePlayerData);

package/frontiers-rpg-game/src/GameRegion.ts

@@ -140,9 +140,8 @@ export default class GameRegion {
     }
   }
 
-  protected async onPlayerJoin(player: Player) {
-    console.log('onPlayerJoin', this.name);
-    const gamePlayer = await GamePlayer.getOrCreate(player);
+  protected onPlayerJoin(player: Player) {
+    const gamePlayer = GamePlayer.getOrCreate(player);
     
     // Set the current region for the player
     gamePlayer.setCurrentRegion(this);
@@ -153,11 +152,6 @@ export default class GameRegion {
     const gamePlayerEntity = new GamePlayerEntity(gamePlayer);
 
     gamePlayerEntity.spawn(this._world, spawnPoint, Quaternion.fromEuler(0, spawnFacingAngle, 0));
-
-    // Since we're using an async onPlayerJoin, we need to explicitly set the camera
-    // since the camera attachment logic as of SDK 0.6.7 only checks for an entity
-    // the first tick after a player joins a world in order to auto attach the camera.
-    player.camera.setAttachedToEntity(gamePlayerEntity);
     
     // Make the camera look at the correct spawn facing angle.
     // Calculate look direction based on facing angle (identity direction is -z, consistent with threejs)
@@ -200,8 +194,8 @@ export default class GameRegion {
   // The HYTOPIA SDK handles resynchronization of all persisted state back to the player client such as
   // their entity, scene ui states, etc, but anything that uses ephemeral state (Such as UI) we need
   // to handle reloading for them manually here.
-  protected async onPlayerReconnected(player: Player) { 
-    const gamePlayer = await GamePlayer.getOrCreate(player);
+  protected onPlayerReconnected(player: Player) { 
+    const gamePlayer = GamePlayer.getOrCreate(player);
     gamePlayer.onPlayerReconnected();
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hytopia.com/examples",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "",
   "license": "ISC",
   "author": "",

package/frontiers-rpg-game/dev/persistence/player-player-1.json

@@ -1,111 +0,0 @@
-{
-  "health": 120,
-  "currentRegionId": "stalkhaven",
-  "skillExperience": [
-    [
-      "exploration",
-      225
-    ],
-    [
-      "combat",
-      162
-    ],
-    [
-      "agility",
-      20
-    ]
-  ],
-  "backpack": {
-    "items": []
-  },
-  "hotbar": {
-    "items": [
-      {
-        "position": 0,
-        "itemId": "dull_sword"
-      },
-      {
-        "position": 2,
-        "itemId": "toy_sword"
-      },
-      {
-        "position": 3,
-        "itemId": "gold",
-        "quantity": 82
-      },
-      {
-        "position": 1,
-        "itemId": "ratkin_tail"
-      },
-      {
-        "position": 4,
-        "itemId": "ratkin_tooth"
-      },
-      {
-        "position": 5,
-        "itemId": "ratkin_eyes",
-        "quantity": 3
-      },
-      {
-        "position": 6,
-        "itemId": "ratkin_bones",
-        "quantity": 3
-      }
-    ]
-  },
-  "questLog": {
-    "quests": [
-      {
-        "questId": "welcome-to-stalkhaven",
-        "state": "completed",
-        "objectiveProgress": {
-          "talk-to-mark": 1
-        }
-      },
-      {
-        "questId": "exploring-stalkhaven",
-        "state": "completed",
-        "objectiveProgress": {
-          "talk-to-mycelis": 1,
-          "talk-to-finn": 1,
-          "talk-to-sporn": 1,
-          "talk-to-mark": 1
-        }
-      },
-      {
-        "questId": "tested-mettle",
-        "state": "active",
-        "objectiveProgress": {
-          "kill-5-ratkin": 5,
-          "dodge-3-times": 3,
-          "talk-to-mark": 0
-        }
-      },
-      {
-        "questId": "dip-duck-dodge",
-        "state": "active",
-        "objectiveProgress": {
-          "dodge": 0,
-          "talk-to-sporn": 0
-        }
-      }
-    ]
-  },
-  "storage": {
-    "items": []
-  },
-  "wearables": {
-    "items": [
-      {
-        "position": 1,
-        "itemId": "adventurer_tunic"
-      }
-    ]
-  },
-  "currentRegionSpawnFacingAngle": 0,
-  "currentRegionSpawnPoint": {
-    "x": 1,
-    "y": 2,
-    "z": 40
-  }
-}