Release 1.11.4.1 (Winter Update)
This commit is contained in:
@@ -75,7 +75,7 @@ namespace Barotrauma
|
||||
get { return frozen; }
|
||||
set
|
||||
{
|
||||
if (frozen == value) return;
|
||||
if (frozen == value) { return; }
|
||||
|
||||
frozen = value;
|
||||
|
||||
@@ -1055,7 +1055,8 @@ namespace Barotrauma
|
||||
}
|
||||
}
|
||||
|
||||
public void FindHull(Vector2? worldPosition = null, bool setSubmarine = true)
|
||||
/// <param name="setInWater">Should the character be immediately considered "in water" if it's outside hulls (normally checked in Update)</param>
|
||||
public void FindHull(Vector2? worldPosition = null, bool setSubmarine = true, bool setInWater = false)
|
||||
{
|
||||
Vector2 findPos = worldPosition == null ? this.WorldPosition : (Vector2)worldPosition;
|
||||
if (!MathUtils.IsValid(findPos))
|
||||
@@ -1068,6 +1069,10 @@ namespace Barotrauma
|
||||
}
|
||||
|
||||
Hull newHull = Hull.FindHull(findPos, currentHull);
|
||||
if (setInWater && newHull == null)
|
||||
{
|
||||
inWater = true;
|
||||
}
|
||||
|
||||
if (newHull == currentHull) { return; }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user