From e519ff2497d809cfa1ce226126155a901c965fd1 Mon Sep 17 00:00:00 2001 From: daedalus Date: Tue, 24 Nov 2009 18:21:49 +0000 Subject: [PATCH] more situations considered in the "monsters can walk on people" context (http://www.runuo.com/bugs/index.php?cmd=view&id=131) --- Scripts/Mobiles/AI/Creature/BaseCreature.cs | 2 +- Scripts/Mobiles/PlayerMobile.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Scripts/Mobiles/AI/Creature/BaseCreature.cs b/Scripts/Mobiles/AI/Creature/BaseCreature.cs index d44467703..64237a8b6 100644 --- a/Scripts/Mobiles/AI/Creature/BaseCreature.cs +++ b/Scripts/Mobiles/AI/Creature/BaseCreature.cs @@ -2976,7 +2976,7 @@ namespace Server.Mobiles public override bool OnMoveOver( Mobile m ) { if ( m is BaseCreature && !((BaseCreature)m).Controlled ) - return false; + return ( !Alive || !m.Alive || IsDeadBondedPet || m.IsDeadBondedPet ) || ( Hidden && m.AccessLevel > AccessLevel.Player ); return base.OnMoveOver( m ); } diff --git a/Scripts/Mobiles/PlayerMobile.cs b/Scripts/Mobiles/PlayerMobile.cs index aafedeee8..88da78bcc 100644 --- a/Scripts/Mobiles/PlayerMobile.cs +++ b/Scripts/Mobiles/PlayerMobile.cs @@ -1726,8 +1726,8 @@ namespace Server.Mobiles public override bool OnMoveOver( Mobile m ) { - if ( Alive && m is BaseCreature && !((BaseCreature)m).Controlled ) - return false; + if ( m is BaseCreature && !((BaseCreature)m).Controlled ) + return ( !Alive || !m.Alive || IsDeadBondedPet || m.IsDeadBondedPet ) || ( Hidden && m.AccessLevel > AccessLevel.Player ); return base.OnMoveOver( m ); }