Merge branch 'wiremod:master' into master

wiremod · Oct 15, 2024 · 766c32b · 766c32b
2 parents 8cee7b2 + 235f883
commit 766c32b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/lua/entities/gmod_wire_egp/lib/egplib/objects.lua b/lua/entities/gmod_wire_egp/lib/egplib/objects.lua
@@ -85,7 +85,11 @@ function baseObj:EditObject(args)
 	end
 	for k, v in pairs(args) do
 		if self[k] ~= nil and self[k] ~= v then
-			self[k] = v
+			if CLIENT and k == "material" and isstring(v) then
+				self[k] = Material(v)
+			else
+				self[k] = v
+			end
 			ret = true
 		end
 	end

diff --git a/lua/entities/gmod_wire_egp/lib/objects/poly.lua b/lua/entities/gmod_wire_egp/lib/objects/poly.lua
@@ -53,7 +53,7 @@ Obj.Receive = function( self )
 	return tbl
 end
 Obj.DataStreamInfo = function( self )
-	return { material = self.material, r = self.r, g = self.g, b = self.b, a = self.a, filtering = self.filtering, parent = self.parent, x = self.x, y = self.y, angle = self.angle }
+	return { material = self.material, r = self.r, g = self.g, b = self.b, a = self.a, filtering = self.filtering, parent = self.parent, x = self.x, y = self.y, angle = self.angle, vertices = self.vertices }
 end
 
 function Obj:Contains(x, y)

diff --git a/lua/entities/gmod_wire_egp_hud/huddraw.lua b/lua/entities/gmod_wire_egp_hud/huddraw.lua
@@ -145,12 +145,13 @@ else -- SERVER
 
 	local function EGPHudConnect(ent, state, ply)
 		if state then
-			EGP:SendDataStream(ply, ent:EntIndex(), true)
 			if not ent.Users then ent.Users = {} end
 
 			if not ent.Users[ply] then
 				ent.Users[ply] = true
 			end
+
+			EGP:SendDataStream(ply, ent:EntIndex(), true)
 		elseif ent.Users and ent.Users[ply] then
 			ent.Users[ply] = nil