Reduce entity update boilerplate a bit

ACF-Team · Jan 16, 2025 · b18419e · b18419e
1 parent 2f6ad01
commit b18419e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 54 deletions.
diff --git a/lua/entities/acf_computer/init.lua b/lua/entities/acf_computer/init.lua
@@ -231,13 +231,7 @@ do -- Spawn and update function
 
 		Entity:UpdateOverlay(true)
 
-		do -- Mass entity mod removal
-			local EntMods = Data and Data.EntityMods
-
-			if EntMods and EntMods.mass then
-				EntMods.mass = nil
-			end
-		end
+		duplicator.ClearEntityModifier(Entity, "mass")
 
 		CheckLegal(Entity)
 
@@ -282,12 +276,6 @@ do -- Spawn and update function
 
 		hook.Run("ACF_OnUpdateEntity", "acf_computer", self, Data, Class, Computer)
 
-		self:UpdateOverlay(true)
-
-		net.Start("ACF_UpdateEntity")
-			net.WriteEntity(self)
-		net.Broadcast()
-
 		return true, "Computer updated successfully!"
 	end
 end

diff --git a/lua/entities/acf_rack/init.lua b/lua/entities/acf_rack/init.lua
@@ -223,13 +223,7 @@ do -- Spawning and Updating --------------------
 
 		Rack:UpdateOverlay(true)
 
-		do -- Mass entity mod removal
-			local EntMods = Data and Data.EntityMods
-
-			if EntMods and EntMods.mass then
-				EntMods.mass = nil
-			end
-		end
+		duplicator.ClearEntityModifier(Rack, "mass")
 
 		CheckLegal(Rack)
 
@@ -294,12 +288,6 @@ do -- Spawning and Updating --------------------
 			end
 		end
 
-		self:UpdateOverlay(true)
-
-		net.Start("ACF_UpdateEntity")
-			net.WriteEntity(self)
-		net.Broadcast()
-
 		return true, "Rack updated successfully!"
 	end
 end ---------------------------------------------

diff --git a/lua/entities/acf_radar/init.lua b/lua/entities/acf_radar/init.lua
@@ -423,13 +423,7 @@ do -- Spawn and Update functions
 
 		Radar:UpdateOverlay(true)
 
-		do -- Mass entity mod removal
-			local EntMods = Data and Data.EntityMods
-
-			if EntMods and EntMods.mass then
-				EntMods.mass = nil
-			end
-		end
+		duplicator.ClearEntityModifier(Radar, "mass")
 
 		CheckLegal(Radar)
 
@@ -476,12 +470,6 @@ do -- Spawn and Update functions
 
 		hook.Run("ACF_OnUpdateEntity", "acf_radar", self, Data, Class, Radar)
 
-		self:UpdateOverlay(true)
-
-		net.Start("ACF_UpdateEntity")
-			net.WriteEntity(self)
-		net.Broadcast()
-
 		return true, "Radar updated successfully!"
 	end
 end

diff --git a/lua/entities/acf_receiver/init.lua b/lua/entities/acf_receiver/init.lua
@@ -210,13 +210,7 @@ do -- Spawn and Update functions
 
 		Receiver:UpdateOverlay(true)
 
-		do -- Mass entity mod removal
-			local EntMods = Data and Data.EntityMods
-
-			if EntMods and EntMods.mass then
-				EntMods.mass = nil
-			end
-		end
+		duplicator.ClearEntityModifier(Receiver, "mass")
 
 		CheckLegal(Receiver)
 
@@ -240,7 +234,7 @@ do -- Spawn and Update functions
 			OldClass.OnLast(self, OldClass)
 		end
 
-		hook.Run("ACF_OnEntityLast", "acf_Receiver", self, OldClass)
+		hook.Run("ACF_OnEntityLast", "acf_receiver", self, OldClass)
 
 		ACF.SaveEntity(self)
 
@@ -252,13 +246,7 @@ do -- Spawn and Update functions
 			Class.OnUpdate(self, Data, Class, Receiver)
 		end
 
-		hook.Run("ACF_OnUpdateEntity", "acf_Receiver", self, Data, Class, Receiver)
-
-		self:UpdateOverlay(true)
-
-		net.Start("ACF_UpdateEntity")
-			net.WriteEntity(self)
-		net.Broadcast()
+		hook.Run("ACF_OnUpdateEntity", "acf_receiver", self, Data, Class, Receiver)
 
 		return true, "Receiver updated successfully!"
 	end