respawn shuttle not moving fix
This commit is contained in:
@@ -96,7 +96,10 @@ namespace Barotrauma.Networking
|
|||||||
{
|
{
|
||||||
if (RespawnShuttle != null)
|
if (RespawnShuttle != null)
|
||||||
{
|
{
|
||||||
RespawnShuttle.Velocity = Vector2.Zero;
|
if (!GameMain.Lua.game.overrideRespawnSub)
|
||||||
|
{
|
||||||
|
RespawnShuttle.Velocity = Vector2.Zero;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int clientsToRespawn = GetClientsToRespawn().Count();
|
int clientsToRespawn = GetClientsToRespawn().Count();
|
||||||
|
|||||||
@@ -113,7 +113,12 @@ namespace Barotrauma.Networking
|
|||||||
{
|
{
|
||||||
foreach (Wire wire in connection.Wires)
|
foreach (Wire wire in connection.Wires)
|
||||||
{
|
{
|
||||||
if (wire != null) wire.Locked = true;
|
#if SERVER
|
||||||
|
if (GameMain.Lua.game.overrideRespawnSub)
|
||||||
|
{
|
||||||
|
if (wire != null) wire.Locked = true;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -199,6 +204,14 @@ namespace Barotrauma.Networking
|
|||||||
|
|
||||||
private IEnumerable<object> ForceShuttleToPos(Vector2 position, float speed)
|
private IEnumerable<object> ForceShuttleToPos(Vector2 position, float speed)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
#if SERVER
|
||||||
|
if (GameMain.Lua.game.overrideRespawnSub)
|
||||||
|
{
|
||||||
|
yield return CoroutineStatus.Success;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (RespawnShuttle == null)
|
if (RespawnShuttle == null)
|
||||||
{
|
{
|
||||||
yield return CoroutineStatus.Success;
|
yield return CoroutineStatus.Success;
|
||||||
|
|||||||
Reference in New Issue
Block a user