Merge branch 'master' into 'master'

Fixed an issue #6101 (https://gitlab.com/OpenMW/openmw/-/issues/6101)

See merge request OpenMW/openmw!949

AUTHORS.md

@@ -27,6 +27,7 @@ Programmers
     Alexander Olofsson (Ananace)
     Alex Rice
     Alex S (docwest)
+    Alexey Yaryshev (skeevert)
     Allofich
     Andrei Kortunov (akortunov)
     AnyOldName3

CHANGELOG.md

@@ -4,6 +4,7 @@
     Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
     Bug #5483: AutoCalc flag is not used to calculate spells cost
+    Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
 
 0.47.0
 ------

apps/openmw/mwmechanics/mechanicsmanagerimp.cpp

@@ -869,7 +869,7 @@ namespace MWMechanics
         int lockLevel = cellref.getLockLevel();
         if (target.getClass().isDoor() &&
             (lockLevel <= 0 || lockLevel == ESM::UnbreakableLock) &&
-            ptr.getCellRef().getTrap().empty())
+            cellref.getTrap().empty())
         {
             return true;
         }