Replace faulty network instantiation with networked position

joebinns · Mar 10, 2024 · 47308b4 · 47308b4
1 parent 534c25d
commit 47308b4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/FGNetworking/Assets/Scripts/AmmoPacks/StandardAmmoPack.cs b/FGNetworking/Assets/Scripts/AmmoPacks/StandardAmmoPack.cs
@@ -16,16 +16,18 @@ private void OnTriggerEnter2D(Collider2D other)
 
 		ammo.GainAmmo(AMMO);
 
-		var spawnPosition = new Vector3(
+		var newPosition = new Vector3(
 			Random.Range(-4f, 4f),
 			Random.Range(-2f, 2f),
 			0f);
 
-		var newAmmoPack = Instantiate(ammoPackPrefab, spawnPosition, Quaternion.identity);
-		var newNetworkObject = newAmmoPack.GetComponent<NetworkObject>();
-		newNetworkObject.Spawn();
+		transform.position = newPosition;
+		SetPositionClientRpc(newPosition);
+	}
 
-		var networkObject = gameObject.GetComponent<NetworkObject>();
-		networkObject.Despawn();
+	[ClientRpc]
+	private void SetPositionClientRpc(Vector3 newPosition)
+	{
+		transform.position = newPosition;
 	}
 }
diff --git a/FGNetworking/Assets/Scripts/Mines/StandardMine.cs b/FGNetworking/Assets/Scripts/Mines/StandardMine.cs
@@ -13,15 +13,19 @@ void OnTriggerEnter2D(Collider2D other)
 			if (!health) return;
 			health.LoseHealth(25);
 
-			int xPosition = Random.Range(-4, 4);
-			int yPosition = Random.Range(-2, 2);
+			var newPosition = new Vector3(
+				Random.Range(-4f, 4f),
+				Random.Range(-2f, 2f),
+				0f);
 
-			GameObject newMine = Instantiate(minePrefab, new Vector3(xPosition, yPosition, 0), Quaternion.identity);
-			NetworkObject no = newMine.GetComponent<NetworkObject>();
-			no.Spawn();
-
-			NetworkObject networkObject = gameObject.GetComponent<NetworkObject>();
-			networkObject.Despawn();
+			transform.position = newPosition;
+			SetPositionClientRpc(newPosition);
 		}
 	}
+
+	[ClientRpc]
+	private void SetPositionClientRpc(Vector3 newPosition)
+	{
+		transform.position = newPosition;
+	}
 }