From e2514db207a80854e60ada9d3483158b607e5b6c Mon Sep 17 00:00:00 2001
From: SticklyMan <sticklyman@ulyssesmod.net>
Date: Sat, 9 Mar 2024 18:34:23 -0700
Subject: [PATCH] Fix editing or creating adverts in XGUI causing server errors

---
 CHANGELOG.md                        | 1 +
 lua/ulx/xgui/server/sv_settings.lua | 4 ++--
 ulx.build                           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53cf91b..aa8a01b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * [FIX] On listen servers, using the slider on some gmod server settings would cause the setting to constantly jump around.
 * [FIX] XGUI: "Keep AI Ragdoll" setting replaced with "Keep Corpses", which should work now.
 * [FIX] XGUI: Sandbox "Persist" setting now supports setting the persistence file name.
+* [FIX] XGUI: Creating or editing adverts would cause server errors instead of showing the advert until mapchange.
 * [FIX] XLIB: Alpha slider bar no longer saves decimal, no longer backwards while typing in a value.
 * [CHANGE] Exposed ragdoll and unragdoll functions to the ulx table so they can be called externally. (Thanks, brandonsturgeon)
 * [CHANGE] XGUI: Update sandbox limit definitions and slider maximums, removed deprecated limits.
diff --git a/lua/ulx/xgui/server/sv_settings.lua b/lua/ulx/xgui/server/sv_settings.lua
index 3299290..ba2e1d9 100644
--- a/lua/ulx/xgui/server/sv_settings.lua
+++ b/lua/ulx/xgui/server/sv_settings.lua
@@ -107,7 +107,7 @@ function settings.init()
 	function settings.addAdvert( ply, args )
 		if ULib.ucl.query( ply, "xgui_svsettings" ) then
 			if args[3] == "<No Group>" then args[3] = nil end
-			local color = { r = tonumber( args[4] ), g = tonumber( args[5] ), b = tonumber( args[6] ), a = 255 } or nil
+			local color = Color( tonumber( args[4] ), tonumber( args[5] ), tonumber( args[6] ), 255 ) or nil
 			ulx.addAdvert( args[1], tonumber( args[2] ), args[3], color, tonumber( args[7] ) )
 			if args[8] ~= "hold" then
 				xgui.sendDataTable( {}, "adverts" )
@@ -126,7 +126,7 @@ function settings.init()
 			local advert = ulx.adverts[group][number]
 			advert.message = args[4]
 			advert.rpt = tonumber( args[5] )
-			advert.color = { a=255, r=tonumber( args[6] ), g=tonumber( args[7] ), b=tonumber( args[8] ) }
+			advert.color = Color( tonumber( args[6] ), tonumber( args[7] ), tonumber( args[8] ), 255 )
 			advert.len = tonumber( args[9] )
 			xgui.sendDataTable( {}, "adverts" )
 			settings.saveAdverts()
diff --git a/ulx.build b/ulx.build
index f0371ff..6d542ff 100644
--- a/ulx.build
+++ b/ulx.build
@@ -1 +1 @@
-1708628139
+1710034463