minor: reset character collision flags, even if without a Body

avinationmerge
UbitUmarov 2015-11-12 22:40:55 +00:00
parent 9bd6befdeb
commit 55cce6aee0
1 changed files with 6 additions and 2 deletions

View File

@ -1131,12 +1131,16 @@ namespace OpenSim.Region.PhysicsModule.ubOde
{ {
foreach (OdeCharacter chr in _characters) foreach (OdeCharacter chr in _characters)
{ {
if (chr == null || chr.Body == IntPtr.Zero || chr.collider == IntPtr.Zero ) if (chr == null)
continue; continue;
chr.IsColliding = false; chr.IsColliding = false;
// chr.CollidingGround = false; not done here // chr.CollidingGround = false; not done here
chr.CollidingObj = false; chr.CollidingObj = false;
if(chr.Body == IntPtr.Zero || chr.collider == IntPtr.Zero )
continue;
// do colisions with static space // do colisions with static space
d.SpaceCollide2(chr.collider, StaticSpace, IntPtr.Zero, nearCallback); d.SpaceCollide2(chr.collider, StaticSpace, IntPtr.Zero, nearCallback);