Merge pull request #5946 from mozilla/feature/chat-command-respawn

Add chat command to respawn

src/message-dispatch.js

@@ -9,7 +9,7 @@ import { ExitReason } from "./react-components/room/ExitedRoomScreen";
 import { LogMessageType } from "./react-components/room/ChatSidebar";
 import { createNetworkedEntity } from "./utils/create-networked-entity";
 import qsTruthy from "./utils/qs_truthy";
-import { add } from "./utils/chat-commands";
+import { add, respawn } from "./utils/chat-commands";
 
 let uiRoot;
 // Handles user-entered messages
@@ -243,6 +243,13 @@ export default class MessageDispatch extends EventTarget {
           add(APP.world, avatarPov, args);
         }
         break;
+      case "respawn":
+        {
+          const sceneEl = AFRAME.scenes[0];
+          const characterController = this.scene.systems["hubs-systems"].characterController;
+          respawn(APP.world, sceneEl, characterController);
+        }
+        break;
     }
   };
 }

src/utils/chat-commands.ts

@@ -1,6 +1,10 @@
+import { AScene } from "aframe";
 import { Object3D } from "three";
 import { HubsWorld } from "../app";
+import { moveToSpawnPoint } from "../bit-systems/waypoint";
+import { CharacterControllerSystem } from "../systems/character-controller-system";
 import { createNetworkedEntity } from "./create-networked-entity";
+import qsTruthy from "./qs_truthy";
 
 function checkFlag(args: string[], flag: string) {
   return !!args.find(s => s === flag);
@@ -54,3 +58,17 @@ export function add(world: HubsWorld, avatarPov: Object3D, args: string[]) {
     console.log(usage("add", ADD_FLAGS, null, ["url"]));
   }
 }
+
+export function respawn(world: HubsWorld, scene: AScene, characterController: CharacterControllerSystem) {
+  if (!scene.is("entered")) {
+    console.error("Cannot respawn until you have entered the room.");
+    return;
+  }
+
+  if (!qsTruthy("newLoader")) {
+    console.error("This command only works with the newLoader query string parameter.");
+    return;
+  }
+
+  moveToSpawnPoint(world, characterController);
+}