Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
LiddulBOFH committed Aug 8, 2024
2 parents 366edd0 + 1e69570 commit e2bb9d8
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions lua/starfall/libs_sh/acffunctions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2511,7 +2511,7 @@ if SERVER then

CheckPerms(instance, This, "entities.acf")

return IsValid(This.Rotator) and This.Rotator or nil
return IsValid(This.Rotator) and wrap(This.Rotator) or nil
end

--- Returns the gyroscope linked to the turret
Expand All @@ -2527,7 +2527,7 @@ if SERVER then

CheckPerms(instance, This, "entities.acf")

return IsValid(This.Gyro) and This.Gyro or nil
return IsValid(This.Gyro) and wrap(This.Gyro) or nil
end

--- Returns the motor linked to the turret
Expand All @@ -2543,7 +2543,7 @@ if SERVER then

CheckPerms(instance, This, "entities.acf")

return IsValid(This.Motor) and This.Motor or nil
return IsValid(This.Motor) and wrap(This.Motor) or nil
end

--- Returns the turret's current loaded mass, in kg
Expand Down Expand Up @@ -2677,8 +2677,8 @@ if SERVER then
TotalMass = td.TotalMass,
LocalMassCenter = IsValid(This.Rotator) and This:WorldToLocal(This.Rotator:LocalToWorld(This.TurretData.LocalCoM)) or Vector(),

Motor = IsValid(This.Motor) and This.Motor or nil,
Gyro = IsValid(This.Gyro) and This.Gyro or nil,
Motor = IsValid(This.Motor) and wrap(This.Motor) or nil,
Gyro = IsValid(This.Gyro) and wrap(This.Gyro) or nil,
}

return Data
Expand Down

0 comments on commit e2bb9d8

Please sign in to comment.