Skip to content

Commit 2b36823

Browse files
Reduce entity spawn boilerplate a bit
1 parent 3208306 commit 2b36823

File tree

4 files changed

+0
-23
lines changed

4 files changed

+0
-23
lines changed

lua/entities/acf_computer/init.lua

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,13 @@ do -- Spawn and update function
207207

208208
if not IsValid(Entity) then return end
209209

210-
Entity:SetPlayer(Player)
211210
Entity:SetAngles(Angle)
212211
Entity:SetPos(Pos)
213212
Entity:Spawn()
214213

215214
Player:AddCleanup("acf_computer", Entity)
216215
Player:AddCount(Limit, Entity)
217216

218-
Entity.Owner = Player -- MUST be stored on ent for PP
219217
Entity.Weapons = {}
220218
Entity.DataStore = Entities.GetArguments("acf_computer")
221219

@@ -227,10 +225,6 @@ do -- Spawn and update function
227225

228226
hook.Run("ACF_OnSpawnEntity", "acf_computer", Entity, Data, Class, Computer)
229227

230-
WireLib.TriggerOutput(Entity, "Entity", Entity)
231-
232-
Entity:UpdateOverlay(true)
233-
234228
duplicator.ClearEntityModifier(Entity, "mass")
235229

236230
CheckLegal(Entity)

lua/entities/acf_rack/init.lua

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,15 +190,13 @@ do -- Spawning and Updating --------------------
190190

191191
if not IsValid(Rack) then return end
192192

193-
Rack:SetPlayer(Player)
194193
Rack:SetAngles(Ang)
195194
Rack:SetPos(Pos)
196195
Rack:Spawn()
197196

198197
Player:AddCleanup("acf_rack", Rack)
199198
Player:AddCount(Limit, Rack)
200199

201-
Rack.Owner = Player -- MUST be stored on ent for PP
202200
Rack.Firing = false
203201
Rack.Reloading = false
204202
Rack.Spread = 1 -- GunClass.spread
@@ -219,9 +217,6 @@ do -- Spawning and Updating --------------------
219217

220218
WireLib.TriggerOutput(Rack, "Rate of Fire", 60)
221219
WireLib.TriggerOutput(Rack, "Reload Time", 1)
222-
WireLib.TriggerOutput(Rack, "Entity", Rack)
223-
224-
Rack:UpdateOverlay(true)
225220

226221
duplicator.ClearEntityModifier(Rack, "mass")
227222

lua/entities/acf_radar/init.lua

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,15 +387,13 @@ do -- Spawn and Update functions
387387

388388
if not IsValid(Radar) then return end
389389

390-
Radar:SetPlayer(Player)
391390
Radar:SetAngles(Angle)
392391
Radar:SetPos(Pos)
393392
Radar:Spawn()
394393

395394
Player:AddCleanup("acf_radar", Radar)
396395
Player:AddCount(Limit, Radar)
397396

398-
Radar.Owner = Player -- MUST be stored on ent for PP
399397
Radar.Active = false
400398
Radar.Scanning = false
401399
Radar.TargetCount = 0
@@ -419,10 +417,6 @@ do -- Spawn and Update functions
419417

420418
hook.Run("ACF_OnSpawnEntity", "acf_radar", Radar, Data, Class, RadarData)
421419

422-
WireLib.TriggerOutput(Radar, "Entity", Radar)
423-
424-
Radar:UpdateOverlay(true)
425-
426420
duplicator.ClearEntityModifier(Radar, "mass")
427421

428422
CheckLegal(Radar)

lua/entities/acf_receiver/init.lua

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,13 @@ do -- Spawn and Update functions
186186

187187
if not IsValid(Receiver) then return end
188188

189-
Receiver:SetPlayer(Player)
190189
Receiver:SetAngles(Ang)
191190
Receiver:SetPos(Pos)
192191
Receiver:Spawn()
193192

194193
Player:AddCleanup("acf_receiver", Receiver)
195194
Player:AddCount(Limit, Receiver)
196195

197-
Receiver.Owner = Player -- MUST be stored on ent for PP
198196
Receiver.DataStore = Entities.GetArguments("acf_receiver")
199197
Receiver.Damage = 0
200198

@@ -206,10 +204,6 @@ do -- Spawn and Update functions
206204

207205
hook.Run("ACF_OnSpawnEntity", "acf_receiver", Receiver, Data, Class, ReceiverData)
208206

209-
WireLib.TriggerOutput(Receiver, "Entity", Receiver)
210-
211-
Receiver:UpdateOverlay(true)
212-
213207
duplicator.ClearEntityModifier(Receiver, "mass")
214208

215209
CheckLegal(Receiver)

0 commit comments

Comments
 (0)