Skip to content

Bugfix: testing commands created monsters that were not destroyed on new scene #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 20, 2021
Merged

Bugfix: testing commands created monsters that were not destroyed on new scene #291

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3ccc72
Ensure entities spawned by the testing hotkeys are correctly destroye…
eheimburg Apr 19, 2021
bd0ee33
Update ServerTestingHotkeys.cs
eheimburg Apr 19, 2021
f4b9e47
remove #if check
eheimburg Apr 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions Assets/BossRoom/Scripts/Server/ServerTestingHotkeys.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ namespace BossRoom.Server
{
/// <summary>
/// Provides various special commands that the Host can use while developing and
/// debugging the game. These are not compiled into release builds. (If you want
/// to disable them for debug builds, disable or remove this component from the
/// BossRoomState prefab.)
/// debugging the game. To disable them, just disable or remove this component from the
/// BossRoomState prefab.
/// </summary>
public class ServerTestingHotkeys : NetworkBehaviour
{
#if UNITY_EDITOR || DEVELOPMENT_BUILD
[SerializeField]
[Tooltip("Enemy to spawn. Make sure this is included in the NetworkManager's list of prefabs!")]
private NetworkObject m_EnemyPrefab;
Expand Down Expand Up @@ -50,19 +48,18 @@ private void Update()
if (m_SpawnEnemyKeyCode != KeyCode.None && Input.GetKeyDown(m_SpawnEnemyKeyCode))
{
var newEnemy = Instantiate(m_EnemyPrefab);
newEnemy.SpawnWithOwnership(NetworkManager.Singleton.LocalClientId);
newEnemy.SpawnWithOwnership(NetworkManager.Singleton.LocalClientId, null, true);
}
if (m_SpawnBossKeyCode != KeyCode.None && Input.GetKeyDown(m_SpawnBossKeyCode))
{
var newEnemy = Instantiate(m_BossPrefab);
newEnemy.SpawnWithOwnership(NetworkManager.Singleton.LocalClientId);
newEnemy.SpawnWithOwnership(NetworkManager.Singleton.LocalClientId, null, true);
}
if (m_InstantQuitKeyCode != KeyCode.None && Input.GetKeyDown(m_InstantQuitKeyCode))
{
GameStateRelay.SetRelayObject(false); // indicate to the post-game screen that the game was lost
MLAPI.SceneManagement.NetworkSceneManager.SwitchScene("PostGame");
}
}
#endif
}
}