Merge branch 'develop' into DFN-Item-Updates

DragonSlayer62 · Mar 30, 2024 · ccc85a0 · ccc85a0
2 parents 9c8b08b + 69e051c
commit ccc85a0
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 18 deletions.
diff --git a/source/CPacketReceive.cpp b/source/CPacketReceive.cpp
@@ -397,7 +397,7 @@ void CPIFirstLogin::Receive( void )
 	char temp[30];
 	// Grab our username
 	memcpy( temp, &tSock->Buffer()[1], 30 );
-	userId = temp;
+	userId = oldstrutil::trim( temp );
 
 	// Grab our password
 	memcpy( temp, &tSock->Buffer()[31], 30 );
@@ -547,7 +547,7 @@ void CPISecondLogin::Receive( void )
 
 	// Grab our username
 	memcpy( temp, &tSock->Buffer()[5], 30 );
-	sid = temp;
+	sid = oldstrutil::trim( temp );
 
 	// Grab our password
 	memcpy( temp, &tSock->Buffer()[35], 30 );

diff --git a/source/Changelog.txt b/source/Changelog.txt
@@ -1,3 +1,9 @@
+22/03/2024 - Dragon Slayer/Xuri
+	Leading/trailing whitespace is now trimmed from account names during login.
+
+21/03/2024 - Dragon Slayer/Xuri
+	Fixed an issue with onHunger and onThirst event crashing if the npc was not loaded yet.
+
 18/02/2024 - Dragon Slayer/Xuri
 	Updated set and get commands (set.js, get.js) with additional ways to set/get resistance types on objects using the syntax 'set/set [type] #. Available resistance types:
 		resistarmor, resistlight, resistwater, resistcold, resistfire, resistenergy, resistpoison

diff --git a/source/cChar.cpp b/source/cChar.cpp
@@ -474,17 +474,20 @@ SI08 CChar::GetHunger( void ) const
 }
 bool CChar::SetHunger( SI08 newValue )
 {
-	std::vector<UI16> scriptTriggers = GetScriptTriggers();
-	for( auto i : scriptTriggers )
+	if( IsValidNPC() )
 	{
-		cScript *toExecute = JSMapping->GetScript( i );
-		if( toExecute != nullptr )
+		std::vector<UI16> scriptTriggers = GetScriptTriggers();
+		for( auto i : scriptTriggers )
 		{
-			// If script returns false/0/nothing, prevent hunger from changing, and prevent
-			// other scripts with event from running
-			if( toExecute->OnHungerChange(( this ), hunger ) == 0 )
+			cScript *toExecute = JSMapping->GetScript( i );
+			if( toExecute != nullptr )
 			{
-				return false;
+				// If script returns false/0/nothing, prevent hunger from changing, and prevent
+				// other scripts with event from running
+				if( toExecute->OnHungerChange(( this ), hunger ) == 0 )
+				{
+					return false;
+				}
 			}
 		}
 	}
@@ -649,17 +652,20 @@ SI08 CChar::GetThirst( void ) const
 
 bool CChar::SetThirst( SI08 newValue )
 {
-	std::vector<UI16> scriptTriggers = GetScriptTriggers();
-	for( auto i : scriptTriggers )
+	if( IsValidNPC() )
 	{
-		cScript* toExecute = JSMapping->GetScript( i );
-		if( toExecute != nullptr )
+		std::vector<UI16> scriptTriggers = GetScriptTriggers();
+		for( auto i : scriptTriggers )
 		{
-			// If script returns false/0/nothing, prevent thirst from changing, and prevent
-			// other scripts with event from running
-			if( toExecute->OnThirstChange(( this ), thirst ) == 0 )
+			cScript* toExecute = JSMapping->GetScript( i );
+			if( toExecute != nullptr )
 			{
-				return false;
+				// If script returns false/0/nothing, prevent thirst from changing, and prevent
+				// other scripts with event from running
+				if( toExecute->OnThirstChange(( this ), thirst ) == 0 )
+				{
+					return false;
+				}
 			}
 		}
 	}