Sync to Forge server repo, rev 9f74b215ab99c508b08e2cee125946167d87e2ba

ryzom/server/src/entities_game_service/common_shard_callbacks.cpp

@@ -53,7 +53,7 @@ void cbStallShard( NLNET::CMessage& msgin, const std::string &serviceName, NLNET
 	msgin.serial( filename );
 
 	nlwarning("Backup service send Stall order when trying write %s file", filename.c_str() );
-	PlayerManager.broadcastMessage( 2, 0, 5, "Technical problem occurred on the server,");
+	PlayerManager.broadcastMessage( 2, 0, 5, "Technical problem occured on the server,");
 	PlayerManager.broadcastMessage( 2, 0, 5, "All non administrator accounts are disconnected immediately.");
 	PlayerManager.broadcastMessage( 2, 0, 5, "Customer Support is already working on it.");
 	PlayerManager.broadcastMessage( 2, 0, 5, "Sorry for any inconveniences.");

ryzom/server/src/entities_game_service/phrase_manager/combat_phrase.cpp

@@ -1512,7 +1512,7 @@ bool  CCombatPhrase::update()
 
 					CCharacter *character = dynamic_cast<CCharacter *> (actor);
 					CCharacter *defender = dynamic_cast<CCharacter *> (combatDefender->getEntity());
-					if ( combatDefender->getEntity()->getId().getType() == RYZOMID::player )
+					if ( defender && defender->getId().getType() == RYZOMID::player )
 					{
 						if (character && character->hasMoved() && defender && defender->hasMoved() )
 							range = 10000;