Reduce entity spawn boilerplate a bit

ACF-Team · Jan 23, 2025 · 2b36823 · 2b36823
1 parent 3208306
commit 2b36823
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 23 deletions.
diff --git a/lua/entities/acf_computer/init.lua b/lua/entities/acf_computer/init.lua
@@ -207,15 +207,13 @@ do -- Spawn and update function
 
 		if not IsValid(Entity) then return end
 
-		Entity:SetPlayer(Player)
 		Entity:SetAngles(Angle)
 		Entity:SetPos(Pos)
 		Entity:Spawn()
 
 		Player:AddCleanup("acf_computer", Entity)
 		Player:AddCount(Limit, Entity)
 
-		Entity.Owner     = Player -- MUST be stored on ent for PP
 		Entity.Weapons   = {}
 		Entity.DataStore = Entities.GetArguments("acf_computer")
 
@@ -227,10 +225,6 @@ do -- Spawn and update function
 
 		hook.Run("ACF_OnSpawnEntity", "acf_computer", Entity, Data, Class, Computer)
 
-		WireLib.TriggerOutput(Entity, "Entity", Entity)
-
-		Entity:UpdateOverlay(true)
-
 		duplicator.ClearEntityModifier(Entity, "mass")
 
 		CheckLegal(Entity)

diff --git a/lua/entities/acf_rack/init.lua b/lua/entities/acf_rack/init.lua
@@ -190,15 +190,13 @@ do -- Spawning and Updating --------------------
 
 		if not IsValid(Rack) then return end
 
-		Rack:SetPlayer(Player)
 		Rack:SetAngles(Ang)
 		Rack:SetPos(Pos)
 		Rack:Spawn()
 
 		Player:AddCleanup("acf_rack", Rack)
 		Player:AddCount(Limit, Rack)
 
-		Rack.Owner       = Player -- MUST be stored on ent for PP
 		Rack.Firing      = false
 		Rack.Reloading   = false
 		Rack.Spread      = 1 -- GunClass.spread
@@ -219,9 +217,6 @@ do -- Spawning and Updating --------------------
 
 		WireLib.TriggerOutput(Rack, "Rate of Fire", 60)
 		WireLib.TriggerOutput(Rack, "Reload Time", 1)
-		WireLib.TriggerOutput(Rack, "Entity", Rack)
-
-		Rack:UpdateOverlay(true)
 
 		duplicator.ClearEntityModifier(Rack, "mass")
 

diff --git a/lua/entities/acf_radar/init.lua b/lua/entities/acf_radar/init.lua
@@ -387,15 +387,13 @@ do -- Spawn and Update functions
 
 		if not IsValid(Radar) then return end
 
-		Radar:SetPlayer(Player)
 		Radar:SetAngles(Angle)
 		Radar:SetPos(Pos)
 		Radar:Spawn()
 
 		Player:AddCleanup("acf_radar", Radar)
 		Player:AddCount(Limit, Radar)
 
-		Radar.Owner       = Player -- MUST be stored on ent for PP
 		Radar.Active      = false
 		Radar.Scanning    = false
 		Radar.TargetCount = 0
@@ -419,10 +417,6 @@ do -- Spawn and Update functions
 
 		hook.Run("ACF_OnSpawnEntity", "acf_radar", Radar, Data, Class, RadarData)
 
-		WireLib.TriggerOutput(Radar, "Entity", Radar)
-
-		Radar:UpdateOverlay(true)
-
 		duplicator.ClearEntityModifier(Radar, "mass")
 
 		CheckLegal(Radar)

diff --git a/lua/entities/acf_receiver/init.lua b/lua/entities/acf_receiver/init.lua
@@ -186,15 +186,13 @@ do -- Spawn and Update functions
 
 		if not IsValid(Receiver) then return end
 
-		Receiver:SetPlayer(Player)
 		Receiver:SetAngles(Ang)
 		Receiver:SetPos(Pos)
 		Receiver:Spawn()
 
 		Player:AddCleanup("acf_receiver", Receiver)
 		Player:AddCount(Limit, Receiver)
 
-		Receiver.Owner       = Player -- MUST be stored on ent for PP
 		Receiver.DataStore   = Entities.GetArguments("acf_receiver")
 		Receiver.Damage		 = 0
 
@@ -206,10 +204,6 @@ do -- Spawn and Update functions
 
 		hook.Run("ACF_OnSpawnEntity", "acf_receiver", Receiver, Data, Class, ReceiverData)
 
-		WireLib.TriggerOutput(Receiver, "Entity", Receiver)
-
-		Receiver:UpdateOverlay(true)
-
 		duplicator.ClearEntityModifier(Receiver, "mass")
 
 		CheckLegal(Receiver)