mp fix

Scenes/JonScene.tscn

@@ -1,6 +1,6 @@
 [gd_scene format=3 uid="uid://do6mrslyqe5qe"]
 
-[ext_resource type="Script" uid="uid://b4ldkd3ngs0vp" path="res://main.gd" id="1_57ppd"]
+[ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://Scenes/multiplayer_world.gd" id="1_57ppd"]
 [ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://XROrigin.tscn" id="2_o1b3t"]
 [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://Textures/dev_material_3d.tres" id="3_irf4n"]
 [ext_resource type="PackedScene" uid="uid://j7caslh27nor" path="res://Stations/Hob.tscn" id="4_ctden"]
@@ -45,9 +45,20 @@ script = ExtResource("1_57ppd")
 [node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=1177077250]
 environment = SubResource("Environment_bvwq1")
 
-[node name="XROrigin3D" parent="." unique_id=2055526621 instance=ExtResource("2_o1b3t")]
+[node name="XROrigin3D" parent="." unique_id=2055526621 groups=["local_xr_origin"] instance=ExtResource("2_o1b3t")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9667189, 0)
 
+[node name="WorldContent" type="Node3D" parent="."]
+
+[node name="Players" type="Node3D" parent="."]
+
+[node name="ItemsSpawner" type="MultiplayerSpawner" parent="."]
+spawn_path = NodePath("../WorldContent")
+
+[node name="PlayersSpawner" type="MultiplayerSpawner" parent="."]
+_spawnable_scenes = PackedStringArray("res://Player/net_player.tscn")
+spawn_path = NodePath("../Players")
+
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="." unique_id=1376644384]
 transform = Transform3D(-0.8660254, -0.43301278, 0.24999999, 0.3022632, -0.05510214, 0.9516306, -0.39829266, 0.8997021, 0.17860365, 0, 0, 0)
 

Scenes/multiPlayer.tscn

@@ -4,6 +4,7 @@
 [ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://XROrigin.tscn" id="2_g30gi"]
 [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://Textures/dev_material_3d.tres" id="3_75ecy"]
 [ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://Textures/sky/NightSkyHDRI009_16K.tres" id="5_c3xgf"]
+[ext_resource type="Script" uid="uid://biu4qr3nr1eny" path="res://test/mp_test_driver.gd" id="99_mptst"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_vlqg6"]
 size = Vector3(15, 0.1, 15)
@@ -74,3 +75,6 @@ shape = SubResource("BoxShape3D_arao0")
 [node name="CollisionShape3D4" type="CollisionShape3D" parent="StaticBody3D" unique_id=1431367494]
 transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 7.502467, 9.197384, -0.018813023)
 shape = SubResource("BoxShape3D_arao0")
+
+[node name="TestDriver" type="Node" parent="."]
+script = ExtResource("99_mptst")

Scenes/multiplayer_world.gd

@@ -72,12 +72,34 @@ func _on_session_started(_is_server: bool) -> void:
 ## Spawns the world's stations/items exactly once, on the machine that owns
 ## world logic (server or offline). Safe to call multiple times/entry points.
 func _populate_world_if_owner() -> void:
-	if not NetworkManager.owns_world() or _populated or not populate_from_layout:
+	if _populated or not populate_from_layout:
 		return
+	# WorldLayout reads the live scene tree to find what to replicate, so it
+	# needs to be an instance sitting in that tree — its methods can't be called
+	# on the class itself.
+	var layout := WorldLayout.new()
+	add_child(layout)
+	var authored := layout.get_station_nodes()
+	authored.append_array(layout.get_item_nodes())
+
+	# The stations and items authored into the scene file are a *template*, not
+	# the live world. Only the server turns them into real objects, spawned
+	# through NetworkManager so they replicate. Every peer therefore drops its
+	# own authored copies: the client would otherwise show its local originals
+	# on top of the server's replicated ones, and the two sets would drift apart
+	# because only the server's are synced.
+	if not NetworkManager.owns_world():
+		NetworkManager.log_line("Clearing %d authored nodes; the server's copies replace them" % authored.size())
+		_remove_authored(authored)
+		layout.queue_free()
+		return
+
 	_populated = true
 	GameManager.meals_in_play = ["hamburger"]
-	var stations := WorldLayout.get_stations()
-	var items := WorldLayout.get_items()
+	var stations := layout.get_stations()
+	var items := layout.get_items()
+	layout.queue_free()
+	_remove_authored(authored)
 	NetworkManager.log_line("Populating world: %d stations, %d items" % [stations.size(), items.size()])
 	for d in stations:
 		NetworkManager.spawn_item(d["scene"], d["xform"], d["name"], d["props"])
@@ -86,6 +108,16 @@ func _populate_world_if_owner() -> void:
 	NetworkManager.log_line("World populated")
 
 
+# Free the authored template nodes. Done immediately rather than with
+# queue_free() so the names are released before the replicated copies are
+# spawned under the same ones.
+func _remove_authored(nodes: Array[Node]) -> void:
+	for node in nodes:
+		if is_instance_valid(node):
+			node.get_parent().remove_child(node)
+			node.free()
+
+
 ## Only the server (or the single offline machine) materialises player
 ## avatars; MultiplayerSpawner replicates the result to everyone else,
 ## including late joiners.