Skip to content

Commit

Permalink
Rename DarkRP.unstuckEntity -> DarkRP.placeEntity
Browse files Browse the repository at this point in the history
  • Loading branch information
FPtje committed Jun 23, 2019
1 parent f4a170d commit 057e66d
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion entities/weapons/pocket/sv_init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ local function deserialize(ply, item)

ent:SetPos(tr.HitPos)

DarkRP.unstuckEntity(ent, tr, ply)
DarkRP.placeEntity(ent, tr, ply)

local phys = ent:GetPhysicsObject()
timer.Simple(0, function() if phys:IsValid() then phys:Wake() end end)
Expand Down
2 changes: 1 addition & 1 deletion entities/weapons/weapon_cs_base2/sv_commands.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function meta:dropDRPWeapon(weapon)
ent:SetPos(tr.HitPos)
ent:Spawn()

DarkRP.unstuckEntity(ent, tr, self)
DarkRP.placeEntity(ent, tr, self)

hook.Call("onDarkRPWeaponDropped", nil, self, ent, weapon)

Expand Down
2 changes: 1 addition & 1 deletion gamemode/modules/base/sh_createitems.lua
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ local function addEntityCommands(tblEnt)
ent:Spawn()
ent:Activate()

DarkRP.unstuckEntity(ent, tr, ply)
DarkRP.placeEntity(ent, tr, ply)

local phys = ent:GetPhysicsObject()
if phys:IsValid() then phys:Wake() end
Expand Down
8 changes: 4 additions & 4 deletions gamemode/modules/base/sv_purchasing.lua
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ local function BuyPistol(ply, args)
weapon.nodupe = true
weapon:Spawn()

DarkRP.unstuckEntity(weapon, tr, ply)
DarkRP.placeEntity(weapon, tr, ply)

if shipment.onBought then
shipment.onBought(ply, shipment, weapon)
Expand Down Expand Up @@ -189,7 +189,7 @@ local function BuyShipment(ply, args)
crate:Spawn()
crate:SetPlayer(ply)

DarkRP.unstuckEntity(crate, tr, ply)
DarkRP.placeEntity(crate, tr, ply)

local phys = crate:GetPhysicsObject()
phys:Wake()
Expand Down Expand Up @@ -320,7 +320,7 @@ local function BuyVehicle(ply, args)
ent:CPPISetOwner(ply)
ent:keysOwn(ply)

DarkRP.unstuckEntity(ent, tr, ply)
DarkRP.placeEntity(ent, tr, ply)

local angOff = found.angle or Angle(0, 0, 0)
ent:SetAngles(ent:GetAngles() + angOff)
Expand Down Expand Up @@ -420,7 +420,7 @@ local function BuyAmmo(ply, args)
ammo.amountGiven, ammo.ammoType = found.amountGiven, found.ammoType
ammo:Spawn()

DarkRP.unstuckEntity(ammo, tr, ply)
DarkRP.placeEntity(ammo, tr, ply)

hook.Call("playerBoughtAmmo", nil, ply, found, ammo, cost)

Expand Down
2 changes: 1 addition & 1 deletion gamemode/modules/base/sv_util.lua
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ function DarkRP.isEmpty(vector, ignore)
return a and b
end

function DarkRP.unstuckEntity(ent, tr, ply)
function DarkRP.placeEntity(ent, tr, ply)
if IsValid(ply) then
local ang = ply:EyeAngles()
ang.pitch = 0
Expand Down
2 changes: 1 addition & 1 deletion gamemode/modules/hungermod/sv_hungermod.lua
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ local function BuyFood(ply, args)
SpawnedFood.foodItem = v
SpawnedFood:Spawn()

DarkRP.unstuckEntity(SpawnedFood, tr, ply)
DarkRP.placeEntity(SpawnedFood, tr, ply)

hook.Call("playerBoughtFood", nil, ply, v, SpawnedFood, cost)
return ""
Expand Down

0 comments on commit 057e66d

Please sign in to comment.