Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12720 from druiz17/fix-parent-tree

Browse source 
Fix far grabbing a grabbable child when the parent is not grabbable.
This commit is contained in:
John Conklin II 2018-03-30 12:25:22 -07:00 committed by GitHub
commit 542d1ad1ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/system/controllers/controllerModules/farActionGrabEntity.js
View file

@ -475,7 +475,7 @@ Script.include("/~/system/libraries/Xform.js");
entityID = targetEntity.id;
targetProps = targetEntity.props;
if (entityIsGrabbable(targetProps)) {
if (entityIsGrabbable(targetProps) || entityIsGrabbable(this.targetObject.entityProps)) {
if (!entityIsDistanceGrabbable(targetProps)) {
this.targetObject.makeDynamic();
}