Merge branch 'develop' into Small-Fixes

UOX3DevTeam · Apr 6, 2024 · 1d4cd9d · 1d4cd9d
2 parents c3fe0bf + b63eced
commit 1d4cd9d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/source/Changelog.txt b/source/Changelog.txt
@@ -4,6 +4,9 @@
 	Teleport Helper Name Correction:
 		The incorrect name in jse_fileassociations for the Teleport Helper has been fixed.
 
+30/03/2024 - Dragon Slayer/Xuri
+	Fixed a bug where crafted items were not selling properly. Now, players can 	successfully sell their crafted gear at vendors.
+
 22/03/2024 - Dragon Slayer/Xuri
 	Leading/trailing whitespace is now trimmed from account names during login.
 

diff --git a/source/UOXJSPropertyFuncs.cpp b/source/UOXJSPropertyFuncs.cpp
@@ -3317,6 +3317,7 @@ JSBool CSocketProps_getProperty( JSContext *cx, JSObject *obj, jsval id, jsval *
 				break;
 			}
 			case CSOCKP_CURRENTCHAR:
+			{
 				myChar = gPriv->CurrcharObj();
 				if( !ValidateObject( myChar ))
 				{
@@ -3327,7 +3328,8 @@ JSBool CSocketProps_getProperty( JSContext *cx, JSObject *obj, jsval id, jsval *
 					JSObject *myObj		= JSEngine->AcquireObject( IUE_CHAR, myChar, JSEngine->FindActiveRuntime( JS_GetRuntime( cx )));
 					*vp = OBJECT_TO_JSVAL( myObj );
 				}
-
+				break;
+			}
 			case CSOCKP_IDLETIMEOUT:
 				break;
 			case CSOCKP_WASIDLEWARNED:		*vp = BOOLEAN_TO_JSVAL( gPriv->WasIdleWarned() );		break;

diff --git a/source/vendor.cpp b/source/vendor.cpp
@@ -535,7 +535,7 @@ bool CPISellItem::Handle( void )
 				{
 					if( ValidateObject( k ))
 					{
-						if( k->GetId() == j->GetId() && j->GetType() == k->GetType() )
+						if(( k->GetId() == j->GetId() || k->GetSectionId() == j->GetSectionId() ) && j->GetType() == k->GetType() )
 						{
 							if( j->GetId() != 0x14f0 || ( j->GetTempVar( CITV_MOREX ) == k->GetTempVar( CITV_MOREX )))
 							{